libnatpmp: bump version, recipe cleanup, patchset cleanup (#1776)

net-libs/libnatpmp/libnatpmp-20150609.recipe

@@ -0,0 +1,60 @@
+SUMMARY="NAT-PMP client library"
+DESCRIPTION="libnatpmp is a portable client library implementing the protocol \
+NAT-PMP. It is based on non blocking sockets and all call of the API are \
+asynchronous."
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+COPYRIGHT="2007-2011 Thomas Bernard"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="http://miniupnp.free.fr/files/libnatpmp-$portVersion.tar.gz"
+CHECKSUM_SHA256="e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0"
+SOURCE_FILENAME="libnatpmp-$portVersion.tar.gz"
+PATCHES="libnatpmp-$portVersion.patchset"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PROVIDES="
+	libnatpmp$secondaryArchSuffix = $portVersion
+	lib:libnatpmp$secondaryArchSuffix = 1
+	cmd:natpmpc
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libnatpmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libnatpmp$secondaryArchSuffix = 1
+	"
+REQUIRES_devel="
+	libnatpmp$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install INSTALLPREFIX=$prefix
+
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
+
+	prepareInstalledDevelLibs libnatpmp
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}

net-libs/libnatpmp/patches/libnatpmp-20150609.patchset

@@ -0,0 +1,50 @@
+From 27c33d9ffa8503a44504bcb03d1d26b35cbd84b4 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 5 Sep 2014 15:37:36 +0000
+Subject: Haiku patch
+
+
+diff --git a/Makefile b/Makefile
+index b67b3e8..181a9ef 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,6 +55,9 @@ else
+   SONAMEFLAGS=-Wl,-soname,$(JNISHAREDLIB)
+ endif
+ endif
++ifeq ($(OS), Haiku)
++LDFLAGS += -lnetwork
++endif
+ 
+ HEADERS = natpmp.h
+ 
+-- 
+2.14.2
+
+
+From 9e5a4dc47ad1e39958e874da94e5fa8fc5744a0f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 2 Dec 2015 19:53:48 +0000
+Subject: gcc2 build fix
+
+
+diff --git a/testgetgateway.c b/testgetgateway.c
+index 24cbe7d..5a8dbb1 100644
+--- a/testgetgateway.c
++++ b/testgetgateway.c
+@@ -37,10 +37,10 @@ POSSIBILITY OF SUCH DAMAGE.
+ 
+ int main(int argc, char * * argv)
+ {
+-	(void)argc;
+-	(void)argv;
+ 	struct in_addr gatewayaddr;
+ 	int r;
++	(void)argc;
++	(void)argv;
+ #ifdef WIN32
+ 	uint32_t temp = 0;
+ 	r = getdefaultgateway(&temp);
+-- 
+2.14.2
+