Mon Jul 3 11:53:57 2017 UTC ()
add support for PKGMANDIR and fix build on SunOS


(wiedi)
diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/Makefile
diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/distinfo
diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/Makefile 2016/12/01 22:28:29 1.1
+++ pkgsrc/net/miniupnpc/Makefile 2017/07/03 11:53:57 1.2
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1# $NetBSD: Makefile,v 1.1 2016/12/01 22:28:29 adam Exp $ 1# $NetBSD: Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
2 2
3DISTNAME= miniupnpc-2.0 3DISTNAME= miniupnpc-2.0
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://miniupnp.free.fr/files/download.php?file= 6MASTER_SITES= http://miniupnp.free.fr/files/download.php?file=
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://miniupnp.free.fr/ 9HOMEPAGE= http://miniupnp.free.fr/
9COMMENT= Client and library for UPnP IGD services 10COMMENT= Client and library for UPnP IGD services
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12USE_TOOLS+= gmake 13USE_TOOLS+= gmake
 14USE_LANGUAGES= c99
 15
 16CPPFLAGS.SunOS+= -D__EXTENSIONS__
13 17
14.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/distinfo 2016/12/01 22:28:29 1.1
+++ pkgsrc/net/miniupnpc/distinfo 2017/07/03 11:53:57 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1 2016/12/01 22:28:29 adam Exp $ 1$NetBSD: distinfo,v 1.2 2017/07/03 11:53:57 wiedi Exp $
2 2
3SHA1 (miniupnpc-2.0.tar.gz) = 21181b364be330436922459c1f81ee641ac182a6 3SHA1 (miniupnpc-2.0.tar.gz) = 21181b364be330436922459c1f81ee641ac182a6
4RMD160 (miniupnpc-2.0.tar.gz) = b3038dc6a78be0bc161dc226f79fd0fd8b66fdb3 4RMD160 (miniupnpc-2.0.tar.gz) = b3038dc6a78be0bc161dc226f79fd0fd8b66fdb3
5SHA512 (miniupnpc-2.0.tar.gz) = e8bca24265086518fa3bdc25fc31371ddf878adaa2bd6a80b30f33a3e5adb831220e906302832f2250e489a73ecd7e6c9a6bfcb1c70258a90e4c4712196275de 5SHA512 (miniupnpc-2.0.tar.gz) = e8bca24265086518fa3bdc25fc31371ddf878adaa2bd6a80b30f33a3e5adb831220e906302832f2250e489a73ecd7e6c9a6bfcb1c70258a90e4c4712196275de
6Size (miniupnpc-2.0.tar.gz) = 85287 bytes 6Size (miniupnpc-2.0.tar.gz) = 85287 bytes
7SHA1 (patch-Makefile) = 7eb888a6a1ee6005506aae69a6c6e7194e5b6ba7 7SHA1 (patch-Makefile) = ace02ccf33a24b709d1d54869a340c84d393eb0b
 8SHA1 (patch-minissdpc.c) = 74cf11e4e84e9e7e47418a657922e2b58d2ad27f
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/patches/patch-Makefile 2016/12/01 22:28:29 1.1
+++ pkgsrc/net/miniupnpc/patches/patch-Makefile 2017/07/03 11:53:57 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.1 2016/12/01 22:28:29 adam Exp $ 1$NetBSD: patch-Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
2 2
3Do not pick pkgsrc libtool on Darwin. 3Do not pick pkgsrc libtool on Darwin.
4NetBSD needs _NETBSD_SOURCE to be defined. 4NetBSD needs _NETBSD_SOURCE to be defined.
5Use correct installation dirs. 5Use correct installation dirs.
6 6
7--- Makefile.orig 2016-02-09 09:38:56.000000000 +0000 7--- Makefile.orig 2016-02-09 09:38:56.000000000 +0000
8+++ Makefile 8+++ Makefile
9@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION) 9@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION)
10  10
11 ifeq ($(OS), Darwin) 11 ifeq ($(OS), Darwin)
12 JARSUFFIX=mac 12 JARSUFFIX=mac
13-LIBTOOL ?= $(shell which libtool) 13-LIBTOOL ?= $(shell which libtool)
14+LIBTOOL ?= /usr/bin/libtool 14+LIBTOOL ?= /usr/bin/libtool
@@ -25,17 +25,17 @@ Use correct installation dirs. @@ -25,17 +25,17 @@ Use correct installation dirs.
25 ifneq ($(OS), FreeBSD) 25 ifneq ($(OS), FreeBSD)
26 ifneq ($(OS), Darwin) 26 ifneq ($(OS), Darwin)
27 #CFLAGS += -D_POSIX_C_SOURCE=200112L 27 #CFLAGS += -D_POSIX_C_SOURCE=200112L
28@@ -136,11 +139,11 @@ endif 28@@ -136,11 +139,11 @@ endif
29  29
30 LIBDIR ?= lib 30 LIBDIR ?= lib
31 # install directories 31 # install directories
32-INSTALLPREFIX ?= $(PREFIX)/usr 32-INSTALLPREFIX ?= $(PREFIX)/usr
33+INSTALLPREFIX ?= $(PREFIX) 33+INSTALLPREFIX ?= $(PREFIX)
34 INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc 34 INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
35 INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) 35 INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
36 INSTALLDIRBIN = $(INSTALLPREFIX)/bin 36 INSTALLDIRBIN = $(INSTALLPREFIX)/bin
37-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man 37-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
38+INSTALLDIRMAN = $(INSTALLPREFIX)/man 38+INSTALLDIRMAN = $(INSTALLPREFIX)/$(PKGMANDIR)
39  39
40 FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) 40 FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
41 ifneq ($(OS), AmigaOS) 41 ifneq ($(OS), AmigaOS)
File Added: pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
$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>