[pkgsrc/trunk]: pkgsrc/net/miniupnpd NetBSD GENERIC has IPFilter enabled and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec5d6e3978c6
branches:  trunk
changeset: 392264:ec5d6e3978c6
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Wed Apr 29 12:34:42 2009 +0000

description:
NetBSD GENERIC has IPFilter enabled and pf disabled by default. Therefore,
on NetBSD at least, we shouldn't default to pf.
Bump PKGREVISION

diffstat:

 net/miniupnpd/Makefile   |   3 ++-
 net/miniupnpd/options.mk |  10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r cd13115c3d44 -r ec5d6e3978c6 net/miniupnpd/Makefile
--- a/net/miniupnpd/Makefile    Wed Apr 29 11:22:20 2009 +0000
+++ b/net/miniupnpd/Makefile    Wed Apr 29 12:34:42 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/29 12:34:42 sborrill Exp $
 #
 
 DISTNAME=      miniupnpd-20081009
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/miniupnpd-/&1.2.0./}
 CATEGORIES=    net
 MASTER_SITES=  http://miniupnp.free.fr/files/download.php?file=
diff -r cd13115c3d44 -r ec5d6e3978c6 net/miniupnpd/options.mk
--- a/net/miniupnpd/options.mk  Wed Apr 29 11:22:20 2009 +0000
+++ b/net/miniupnpd/options.mk  Wed Apr 29 12:34:42 2009 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.2 2009/01/06 23:39:53 jmcneill Exp $
+# $NetBSD: options.mk,v 1.3 2009/04/29 12:34:42 sborrill 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)
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=                ipfilter
+.else
+.  if exists(/usr/include/net/pfvar.h)
 PKG_SUGGESTED_OPTIONS+=                pf
-.else
+.  else
 PKG_SUGGESTED_OPTIONS+=                ipfilter
+.  endif
 .endif
 
 .include "../../mk/bsd.options.mk"