CVS commit: pkgsrc/net/miniupnpc

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Mon Jul  3 11:53:57 UTC 2017

Modified Files:
        pkgsrc/net/miniupnpc: Makefile distinfo
        pkgsrc/net/miniupnpc/patches: patch-Makefile
Added Files:
        pkgsrc/net/miniupnpc/patches: patch-minissdpc.c

Log Message:
add support for PKGMANDIR and fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/miniupnpc/Makefile \
    pkgsrc/net/miniupnpc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c

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

Modified files:

Index: pkgsrc/net/miniupnpc/Makefile
diff -u pkgsrc/net/miniupnpc/Makefile:1.1 pkgsrc/net/miniupnpc/Makefile:1.2
--- pkgsrc/net/miniupnpc/Makefile:1.1   Thu Dec  1 22:28:29 2016
+++ pkgsrc/net/miniupnpc/Makefile       Mon Jul  3 11:53:57 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/12/01 22:28:29 adam Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
 
 DISTNAME=      miniupnpc-2.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://miniupnp.free.fr/files/download.php?file=
 
@@ -10,5 +11,8 @@ COMMENT=      Client and library for UPnP IGD
 LICENSE=       modified-bsd
 
 USE_TOOLS+=    gmake
+USE_LANGUAGES= c99
+
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/miniupnpc/distinfo
diff -u pkgsrc/net/miniupnpc/distinfo:1.1 pkgsrc/net/miniupnpc/distinfo:1.2
--- pkgsrc/net/miniupnpc/distinfo:1.1   Thu Dec  1 22:28:29 2016
+++ pkgsrc/net/miniupnpc/distinfo       Mon Jul  3 11:53:57 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/12/01 22:28:29 adam Exp $
+$NetBSD: distinfo,v 1.2 2017/07/03 11:53:57 wiedi Exp $
 
 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-Makefile) = 7eb888a6a1ee6005506aae69a6c6e7194e5b6ba7
+SHA1 (patch-Makefile) = ace02ccf33a24b709d1d54869a340c84d393eb0b
+SHA1 (patch-minissdpc.c) = 74cf11e4e84e9e7e47418a657922e2b58d2ad27f

Index: pkgsrc/net/miniupnpc/patches/patch-Makefile
diff -u pkgsrc/net/miniupnpc/patches/patch-Makefile:1.1 pkgsrc/net/miniupnpc/patches/patch-Makefile:1.2
--- pkgsrc/net/miniupnpc/patches/patch-Makefile:1.1     Thu Dec  1 22:28:29 2016
+++ pkgsrc/net/miniupnpc/patches/patch-Makefile Mon Jul  3 11:53:57 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2016/12/01 22:28:29 adam Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
 
 Do not pick pkgsrc libtool on Darwin.
 NetBSD needs _NETBSD_SOURCE to be defined.
@@ -35,7 +35,7 @@ Use correct installation dirs.
  INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin
 -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
-+INSTALLDIRMAN = $(INSTALLPREFIX)/man
++INSTALLDIRMAN = $(INSTALLPREFIX)/$(PKGMANDIR)
  
  FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
  ifneq ($(OS), AmigaOS)

Added files:

Index: pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
diff -u /dev/null pkgsrc/net/miniupnpc/patches/patch-minissdpc.c:1.1
--- /dev/null   Mon Jul  3 11:53:57 2017
+++ pkgsrc/net/miniupnpc/patches/patch-minissdpc.c      Mon Jul  3 11:53:57 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-minissdpc.c,v 1.1 2017/07/03 11:53:57 wiedi Exp $
+
+need sockio.h for SIOCGIFADDR on SunOS
+--- minissdpc.c.orig   2016-01-19 10:26:58.000000000 +0000
++++ minissdpc.c
+@@ -11,6 +11,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#if defined(__sun)
++#include <sys/sockio.h> 
++#endif
+ #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
+ #ifdef _WIN32
+ #include <winsock2.h>