* Change version to 1.2.0.20081009

* Fix default config file path to honour PKG_SYSCONFDIR
* Add rc.d script

7 files changed, 56 insertions, 8 deletions

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index b1b798e6572..b6a10848992 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
 #
 
 DISTNAME=	miniupnpd-20081009
+PKGNAME=	${DISTNAME:S/miniupnpd-/&1.2.0./}
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/download.php?file=
 
@@ -18,5 +19,8 @@ CONF_FILES=	${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf
 .include "options.mk"
 
 MAKE_ENV+=	${BSD_MAKE_ENV}
+MAKE_ENV+=	PKG_CFLAGS="-DPKG_DEFAULT_CONFIG=\\\"${PKG_SYSCONFDIR:Q}/miniupnpd.conf\\\""
+
+RCD_SCRIPTS=	miniupnpd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/miniupnpd/PLIST b/net/miniupnpd/PLIST
index 138f3f3c8d3..eb4dc65cadb 100644
--- a/net/miniupnpd/PLIST
+++ b/net/miniupnpd/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
 sbin/miniupnpd
 share/examples/miniupnpd/miniupnpd.conf
+share/examples/rc.d/miniupnpd
 @dirrm share/examples/miniupnpd
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
index 5684f15801a..2aeff1ae906 100644
--- a/net/miniupnpd/distinfo
+++ b/net/miniupnpd/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/01/06 23:39:53 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
+SHA1 (patch-ab) = fa9c272f80629da6ed50a6acaca7e0dd92283f9e
+SHA1 (patch-ac) = b92d83113f55b1e1b5f9c88f52bebba45f7d746f
diff --git a/net/miniupnpd/files/miniupnpd.sh b/net/miniupnpd/files/miniupnpd.sh
new file mode 100644
index 00000000000..014dfba5d8e
--- /dev/null
+++ b/net/miniupnpd/files/miniupnpd.sh
@@ -0,0 +1,16 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: miniupnpd.sh,v 1.1 2009/01/06 23:39:53 jmcneill Exp $
+#
+# PROVIDE: miniupnpd
+# REQUIRE: DAEMON @FWNAME@
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="miniupnpd"
+rcvar=$name
+command="@PREFIX@/sbin/miniupnpd"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/miniupnpd/options.mk b/net/miniupnpd/options.mk
index 2a08afec1f2..99ff224fbf9 100644
--- a/net/miniupnpd/options.mk
+++ b/net/miniupnpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+# $NetBSD: options.mk,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.miniupnpd
 PKG_OPTIONS_REQUIRED_GROUPS=	miniupnpd-fw
@@ -14,6 +14,10 @@ PKG_SUGGESTED_OPTIONS+=		ipfilter
 
 .if !empty(PKG_OPTIONS:Mipfilter)
 MAKE_ENV+=	FWNAME=ipf
-.else
+FILES_SUBST+=	FWNAME=ipfilter
+.endif
+
+.if !empty(PKG_OPTIONS:Mpf)
 MAKE_ENV+=	FWNAME=pf
+FILES_SUBST+=	FWNAME=pf
 .endif
diff --git a/net/miniupnpd/patches/patch-ab b/net/miniupnpd/patches/patch-ab
index 9f9508ca661..bf12ae94a82 100644
--- a/net/miniupnpd/patches/patch-ab
+++ b/net/miniupnpd/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
 
 --- Makefile.orig	2008-10-09 08:50:46.000000000 -0400
-+++ Makefile
++++ Makefile	2009-01-06 18:32:05.000000000 -0500
+@@ -5,7 +5,7 @@
+ # This Makefile should work for *BSD and SunOS/Solaris
+ # Linux users, please use Makefile.linux
+ #CFLAGS = -Wall -Os
+-CFLAGS = -Wall -O -g -DDEBUG
++CFLAGS = -Wall -O -g -DDEBUG $(PKG_CFLAGS)
+ CC = gcc
+ RM = rm -f
+ MV = mv
 @@ -83,8 +83,8 @@ LIBS += -lsocket -lnsl -lkstat -lresolv
  
  # set PREFIX variable to install in the wanted place
diff --git a/net/miniupnpd/patches/patch-ac b/net/miniupnpd/patches/patch-ac
new file mode 100644
index 00000000000..85027a6d1ca
--- /dev/null
+++ b/net/miniupnpd/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/01/06 23:39:53 jmcneill Exp $
+
+--- miniupnpd.c.orig	2009-01-06 18:28:56.000000000 -0500
++++ miniupnpd.c	2009-01-06 18:29:19.000000000 -0500
+@@ -344,7 +344,7 @@ init(int argc, char * * argv, struct run
+ 	struct sigaction sa;
+ 	/*const char * logfilename = 0;*/
+ 	const char * presurl = 0;
+-	const char * optionsfile = "/etc/miniupnpd.conf";
++	const char * optionsfile = PKG_DEFAULT_CONFIG;
+ 
+ 	/* first check if "-f" option is used */
+ 	for(i=2; i<argc; i++)