miniupnpc: corrected some packaging issues

[Stefan Hertenberger <stefan@hertenberger.bayern>]

Module Name:	pkgsrc-wip
Committed By:	Stefan Hertenberger <stefan@hertenberger.bayern>
Pushed By:	erde74
Date:		Sat Sep 3 09:08:42 2016 +0200
Changeset:	851f0def95389304a5deac2228b3b61d2ba56886

Modified Files:
	miniupnpc/PLIST
	miniupnpc/buildlink3.mk
	miniupnpc/distinfo
Added Files:
	miniupnpc/patches/patch-Makefile
	miniupnpc/patches/patch-minissdpc-c
Removed Files:
	miniupnpc/patches/patch-aa
	miniupnpc/patches/patch-ab

Log Message:
miniupnpc: corrected some packaging issues

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=851f0def95389304a5deac2228b3b61d2ba56886

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 miniupnpc/PLIST                     | 16 ++++++++++++++++
 miniupnpc/buildlink3.mk             |  1 +
 miniupnpc/distinfo                  |  4 ++--
 miniupnpc/patches/patch-Makefile    | 32 ++++++++++++++++++++++++++++++++
 miniupnpc/patches/patch-aa          | 24 ------------------------
 miniupnpc/patches/patch-ab          | 12 ------------
 miniupnpc/patches/patch-minissdpc-c | 16 ++++++++++++++++
 7 files changed, 67 insertions(+), 38 deletions(-)

diffs:
diff --git a/miniupnpc/PLIST b/miniupnpc/PLIST
index 48d96a5..bb8a431 100644
--- a/miniupnpc/PLIST
+++ b/miniupnpc/PLIST
@@ -1 +1,17 @@
 @comment $NetBSD$
+bin/external-ip
+bin/upnpc
+include/miniupnpc/igd_desc_parse.h
+include/miniupnpc/miniupnpc.h
+include/miniupnpc/miniupnpc_declspec.h
+include/miniupnpc/miniupnpctypes.h
+include/miniupnpc/miniwget.h
+include/miniupnpc/portlistingparse.h
+include/miniupnpc/upnpcommands.h
+include/miniupnpc/upnpdev.h
+include/miniupnpc/upnperrors.h
+include/miniupnpc/upnpreplyparse.h
+lib/libminiupnpc.a
+lib/libminiupnpc.so
+lib/libminiupnpc.so.16
+man/man3/miniupnpc.3
diff --git a/miniupnpc/buildlink3.mk b/miniupnpc/buildlink3.mk
index de99456..d83b947 100644
--- a/miniupnpc/buildlink3.mk
+++ b/miniupnpc/buildlink3.mk
@@ -1,3 +1,4 @@
+# $NetBSD$
 # $NetBSD buildlink3.mk, v 1.0 2016/09/02 21:46:00 erde74 Exp$
 
 BUILDLINK_TREE+=	miniupnpc
diff --git a/miniupnpc/distinfo b/miniupnpc/distinfo
index 271affb..a08590c 100644
--- a/miniupnpc/distinfo
+++ b/miniupnpc/distinfo
@@ -4,5 +4,5 @@ SHA1 (miniupnpc-2.0.tar.gz) = 21181b364be330436922459c1f81ee641ac182a6
 RMD160 (miniupnpc-2.0.tar.gz) = b3038dc6a78be0bc161dc226f79fd0fd8b66fdb3
 SHA512 (miniupnpc-2.0.tar.gz) = e8bca24265086518fa3bdc25fc31371ddf878adaa2bd6a80b30f33a3e5adb831220e906302832f2250e489a73ecd7e6c9a6bfcb1c70258a90e4c4712196275de
 Size (miniupnpc-2.0.tar.gz) = 85287 bytes
-SHA1 (patch-aa) = dec3ce8eb1183064c393e9aeb8690f37f8baa9f0
-SHA1 (patch-ab) = 884068fbed0d7f435cc906d0b0a27f665ef51b7c
+SHA1 (patch-Makefile) = a27b7e907833dccbefcffe8043e64d3fcbd1bf42
+SHA1 (patch-minissdpc-c) = 5c395e69df9d68987b485230ad258cfdd17961e3
diff --git a/miniupnpc/patches/patch-Makefile b/miniupnpc/patches/patch-Makefile
new file mode 100644
index 0000000..efba3b1
--- /dev/null
+++ b/miniupnpc/patches/patch-Makefile
@@ -0,0 +1,32 @@
+$NetBSD$
+
+CFLAGS: add -D_NETBSD for OS = NetBSD
+modified install path
+
+
+--- Makefile.orig	2016-02-09 10:38:56.000000000 +0100
++++ Makefile	2016-09-03 09:01:55.488729754 +0200
+@@ -38,6 +38,9 @@
+ CFLAGS += -DMINIUPNPC_GET_SRC_ADDR
+ CFLAGS += -D_BSD_SOURCE
+ CFLAGS += -D_DEFAULT_SOURCE
++ifeq ($(OS), NetBSD)
++CFLAGS += -D_NETBSD_SOURCE
++endif
+ ifneq ($(OS), FreeBSD)
+ ifneq ($(OS), Darwin)
+ #CFLAGS += -D_POSIX_C_SOURCE=200112L
+@@ -136,11 +139,11 @@
+ 
+ LIBDIR ?= lib
+ # install directories
+-INSTALLPREFIX ?= $(PREFIX)/usr
++INSTALLPREFIX ?= $(PREFIX)
+ INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
+ INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
+ INSTALLDIRBIN = $(INSTALLPREFIX)/bin
+-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
++INSTALLDIRMAN = $(INSTALLPREFIX)/man
+ 
+ FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
+ ifneq ($(OS), AmigaOS)
diff --git a/miniupnpc/patches/patch-aa b/miniupnpc/patches/patch-aa
deleted file mode 100644
index c528da3..0000000
--- a/miniupnpc/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2016-09-02 21:28:01.797166785 +0200
-+++ Makefile	2016-09-02 21:31:44.033654151 +0200
-@@ -36,8 +36,11 @@
- CFLAGS += -fno-common
- CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
- CFLAGS += -DMINIUPNPC_GET_SRC_ADDR
--CFLAGS += -D_BSD_SOURCE
-+CFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=1
- CFLAGS += -D_DEFAULT_SOURCE
-+ifeq ($(OS), NetBSD)
-+CFLAGS += -D_NETBSD_SOURCE
-+endif
- ifneq ($(OS), FreeBSD)
- ifneq ($(OS), Darwin)
- #CFLAGS += -D_POSIX_C_SOURCE=200112L
-@@ -136,7 +139,7 @@
- 
- LIBDIR ?= lib
- # install directories
--INSTALLPREFIX ?= $(PREFIX)/usr
-+INSTALLPREFIX ?= $(PREFIX)
- INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
- INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
diff --git a/miniupnpc/patches/patch-ab b/miniupnpc/patches/patch-ab
deleted file mode 100644
index 8575b71..0000000
--- a/miniupnpc/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- minissdpc.c.orig	2016-09-02 21:23:33.298069375 +0200
-+++ minissdpc.c	2016-09-02 21:29:22.527967038 +0200
-@@ -11,6 +11,9 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#if defined (__NetBSD__)
-+#include <net/if.h>
-+#endif
- #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
- #ifdef _WIN32
- #include <winsock2.h>
diff --git a/miniupnpc/patches/patch-minissdpc-c b/miniupnpc/patches/patch-minissdpc-c
new file mode 100644
index 0000000..42e5404
--- /dev/null
+++ b/miniupnpc/patches/patch-minissdpc-c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+on NetBSD include net/if.h
+
+--- minissdpc.c.orig	2016-09-02 21:23:33.298069375 +0200
++++ minissdpc.c	2016-09-02 21:29:22.527967038 +0200
+@@ -11,6 +11,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#if defined (__NetBSD__)
++#include <net/if.h>
++#endif
+ #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
+ #ifdef _WIN32
+ #include <winsock2.h>