[pkgsrc/trunk]: pkgsrc/net/miniupnpd Changes 1.8.20140127:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f5a794b920b
branches:  trunk
changeset: 629887:1f5a794b920b
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jan 30 15:07:57 2014 +0000

description:
Changes 1.8.20140127:
* Attempt to compile with OS X/pf
* Make all manufacturer info configurable thanks to Leo Moll
  Merge PCP support (see https://github.com/miniupnp/miniupnp)

diffstat:

 net/miniupnpd/Makefile   |  8 +++-----
 net/miniupnpd/distinfo   |  8 ++++----
 net/miniupnpd/options.mk |  9 +++++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diffs (71 lines):

diff -r f82fb27255bc -r 1f5a794b920b net/miniupnpd/Makefile
--- a/net/miniupnpd/Makefile    Thu Jan 30 14:41:28 2014 +0000
+++ b/net/miniupnpd/Makefile    Thu Jan 30 15:07:57 2014 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/10/21 10:06:57 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/30 15:07:57 adam Exp $
 
-DISTNAME=      miniupnpd-1.8.20130730
+DISTNAME=      miniupnpd-1.8.20140127
 CATEGORIES=    net
 MASTER_SITES=  http://miniupnp.free.fr/files/download.php?file=
 
@@ -9,15 +9,13 @@
 COMMENT=       UPnP IGD service with NAT-PMP support
 LICENSE=       modified-bsd
 
-MAKE_JOBS_SAFE=        no
-
 EGDIR=         ${PREFIX}/share/examples/miniupnpd
 CONF_FILES=    ${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-CFLAGS+=       -DDEFAULT_CONFIG=\"${PKG_SYSCONFDIR:Q}/miniupnpd.conf\"
+CFLAGS+=       -DDEFAULT_CONFIG=\"${PKG_SYSCONFDIR}/miniupnpd.conf\"
 
 INSTALL_MAKE_FLAGS+=   INSTALLETCDIR=${EGDIR}
 INSTALL_MAKE_FLAGS+=   INSTALLMANDIR=${PREFIX}/${PKGMANDIR}/man1
diff -r f82fb27255bc -r 1f5a794b920b net/miniupnpd/distinfo
--- a/net/miniupnpd/distinfo    Thu Jan 30 14:41:28 2014 +0000
+++ b/net/miniupnpd/distinfo    Thu Jan 30 15:07:57 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/10/21 10:06:57 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2014/01/30 15:07:57 adam Exp $
 
-SHA1 (miniupnpd-1.8.20130730.tar.gz) = 32eed969a6c653d6d5ccd236ee50275c933d020e
-RMD160 (miniupnpd-1.8.20130730.tar.gz) = 1d7488a2567c1eb72393c61be462f893b5519285
-Size (miniupnpd-1.8.20130730.tar.gz) = 149904 bytes
+SHA1 (miniupnpd-1.8.20140127.tar.gz) = 02bb6b8c7a514c3bfb8e94acbcbc285225378079
+RMD160 (miniupnpd-1.8.20140127.tar.gz) = 58900eada5c4bb8a06f4598264d51fb18497528d
+Size (miniupnpd-1.8.20140127.tar.gz) = 170467 bytes
 SHA1 (patch-Makefile) = 622cfcaf46259dec41cf5bb9d11e6b5a2fa2830d
 SHA1 (patch-bsd_getroute.c) = 0649c6e3febc2bac008f4325f71c64c99200c216
 SHA1 (patch-bsd_ifacewatcher.c) = 3a9fdf12e721c1452bc34bf2a4938ae5d492a0f0
diff -r f82fb27255bc -r 1f5a794b920b net/miniupnpd/options.mk
--- a/net/miniupnpd/options.mk  Thu Jan 30 14:41:28 2014 +0000
+++ b/net/miniupnpd/options.mk  Thu Jan 30 15:07:57 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2009/06/04 07:54:26 hasso Exp $
+# $NetBSD: options.mk,v 1.5 2014/01/30 15:07:57 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.miniupnpd
 PKG_OPTIONS_REQUIRED_GROUPS=   miniupnpd-fw
-PKG_OPTIONS_GROUP.miniupnpd-fw=        pf ipfilter
+PKG_OPTIONS_GROUP.miniupnpd-fw=        ipfilter ipfw pf
 
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=                ipfilter
@@ -21,6 +21,11 @@
 FILES_SUBST+=  FWNAME=ipfilter
 .endif
 
+.if !empty(PKG_OPTIONS:Mipfw)
+MAKE_ENV+=     FWNAME=ipfw
+FILES_SUBST+=  FWNAME=ipfw
+.endif
+
 .if !empty(PKG_OPTIONS:Mpf)
 MAKE_ENV+=     FWNAME=pf
 FILES_SUBST+=  FWNAME=pf