Import miniupnpd version 20081009.

The MiniUPnP project offers software which supports the UPnP Internet Gateway
Device (IGD) specifications. Recently, NAT-PMP support was added to
MiniUPnPd. For client side NAT-PMP support, use libnatpmp.

UPnP and NAT-PMP are used to improve internet connectivity for devices behind
a NAT router. Any peer to peer network application such as games, IM, etc.
can benefit from a NAT router supporting UPnP and/or NAT-PMP.

The latest generation Microsoft XBOX 360 and Sony Playstation 3 game machines
use UPnP commands to enable the online play with the XBOX Live service and
the Playstation Network. It has been reported that miniupnpd is correctly
working with the two consoles.

7 files changed, 120 insertions, 0 deletions

diff --git a/net/miniupnpd/DESCR b/net/miniupnpd/DESCR
new file mode 100644
index 00000000000..69ae314734a
--- /dev/null
+++ b/net/miniupnpd/DESCR
@@ -0,0 +1,12 @@
+The MiniUPnP project offers software which supports the UPnP Internet Gateway
+Device (IGD) specifications. Recently, NAT-PMP support was added to
+MiniUPnPd. For client side NAT-PMP support, use libnatpmp.
+
+UPnP and NAT-PMP are used to improve internet connectivity for devices behind
+a NAT router. Any peer to peer network application such as games, IM, etc.
+can benefit from a NAT router supporting UPnP and/or NAT-PMP.
+
+The latest generation Microsoft XBOX 360 and Sony Playstation 3 game machines
+use UPnP commands to enable the online play with the XBOX Live service and
+the Playstation Network. It has been reported that miniupnpd is correctly
+working with the two consoles.
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
new file mode 100644
index 00000000000..b1b798e6572
--- /dev/null
+++ b/net/miniupnpd/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+#
+
+DISTNAME=	miniupnpd-20081009
+CATEGORIES=	net
+MASTER_SITES=	http://miniupnp.free.fr/files/download.php?file=
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://miniupnp.free.fr/
+COMMENT=	UPnP IGD service with NAT-PMP support
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+EGDIR=		${PREFIX}/share/examples/miniupnpd
+CONF_FILES=	${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+MAKE_ENV+=	${BSD_MAKE_ENV}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/miniupnpd/PLIST b/net/miniupnpd/PLIST
new file mode 100644
index 00000000000..138f3f3c8d3
--- /dev/null
+++ b/net/miniupnpd/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+sbin/miniupnpd
+share/examples/miniupnpd/miniupnpd.conf
+@dirrm share/examples/miniupnpd
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
new file mode 100644
index 00000000000..5684f15801a
--- /dev/null
+++ b/net/miniupnpd/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+
+SHA1 (miniupnpd-20081009.tar.gz) = 9006d433053c237ccb6628e1856b7cd99a79d989
+RMD160 (miniupnpd-20081009.tar.gz) = 16c36151d7f7058c2579dbba33e92b417304453c
+Size (miniupnpd-20081009.tar.gz) = 81732 bytes
+SHA1 (patch-aa) = 9c65d3459f2435c9318ed163cc2b664ca2f49475
+SHA1 (patch-ab) = 04891a14d14efa55b6c10fccabbc4e83a6b8773b
diff --git a/net/miniupnpd/options.mk b/net/miniupnpd/options.mk
new file mode 100644
index 00000000000..2a08afec1f2
--- /dev/null
+++ b/net/miniupnpd/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.miniupnpd
+PKG_OPTIONS_REQUIRED_GROUPS=	miniupnpd-fw
+PKG_OPTIONS_GROUP.miniupnpd-fw=	pf ipfilter
+
+.if exists(/usr/include/net/pfvar.h)
+PKG_SUGGESTED_OPTIONS+=		pf
+.else
+PKG_SUGGESTED_OPTIONS+=		ipfilter
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mipfilter)
+MAKE_ENV+=	FWNAME=ipf
+.else
+MAKE_ENV+=	FWNAME=pf
+.endif
diff --git a/net/miniupnpd/patches/patch-aa b/net/miniupnpd/patches/patch-aa
new file mode 100644
index 00000000000..35306c040c5
--- /dev/null
+++ b/net/miniupnpd/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+
+--- genconfig.sh.orig	2008-10-01 08:49:26.000000000 -0400
++++ genconfig.sh
+@@ -96,12 +96,18 @@ case $OS_NAME in
+ 		;;
+ 	NetBSD)
+ 		OS_URL=http://www.netbsd.org/
+-		if [ -f /usr/include/net/pfvar.h ] ; then
+-			echo "#define USE_PF 1" >> ${CONFIGFILE}
+-			FW=pf
++		FWNAME_UPPER="$(echo $FWNAME | tr '[a-z]' '[A-Z]')"
++		if [ ! "x$FWNAME" = "x" ]; then
++			FW=${FWNAME}
++			echo "#define USE_${FWNAME_UPPER} 1" >> ${CONFIGFILE}
+ 		else
+-			echo "#define USE_IPF 1" >> ${CONFIGFILE}
+-			FW=ipf
++			if [ -f /usr/include/net/pfvar.h ] ; then
++				echo "#define USE_PF 1" >> ${CONFIGFILE}
++				FW=pf
++			else
++				echo "#define USE_IPF 1" >> ${CONFIGFILE}
++				FW=ipf
++			fi
+ 		fi
+ 		;;
+ 	SunOS)
diff --git a/net/miniupnpd/patches/patch-ab b/net/miniupnpd/patches/patch-ab
new file mode 100644
index 00000000000..9f9508ca661
--- /dev/null
+++ b/net/miniupnpd/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+
+--- Makefile.orig	2008-10-09 08:50:46.000000000 -0400
++++ Makefile
+@@ -83,8 +83,8 @@ LIBS += -lsocket -lnsl -lkstat -lresolv
+ 
+ # set PREFIX variable to install in the wanted place
+ 
+-INSTALLBINDIR = $(PREFIX)/sbin
+-INSTALLETCDIR = $(PREFIX)/etc
++INSTALLBINDIR = $(DESTDIR)$(PREFIX)/sbin
++INSTALLETCDIR = $(DESTDIR)$(PREFIX)/share/examples/miniupnpd
+ 
+ all:	$(EXECUTABLES)
+ 
+@@ -97,8 +97,10 @@ clean:
+ 
+ install:	miniupnpd genuuid
+ 	strip miniupnpd
+-	$(INSTALL) -m 555 miniupnpd $(INSTALLBINDIR)
+-	$(INSTALL) miniupnpd.conf $(INSTALLETCDIR)
++	$(BSD_INSTALL_PROGRAM_DIR) $(INSTALLBINDIR)
++	$(BSD_INSTALL_DATA_DIR) $(INSTALLETCDIR)
++	$(BSD_INSTALL_PROGRAM) miniupnpd $(INSTALLBINDIR)
++	$(BSD_INSTALL) -m 644 miniupnpd.conf $(INSTALLETCDIR)
+ 
+ # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
+ # the uuid-1.5.0 package