Use USE_FEATURES=inet6 for requirement of IPv6 support, instead of unusual usage

of PKG_OPTIONS.

10 files changed, 22 insertions, 56 deletions

diff --git a/net/dnstracer/Makefile b/net/dnstracer/Makefile
index ce971579400..6c8bd20cb05 100644
--- a/net/dnstracer/Makefile
+++ b/net/dnstracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/15 08:34:00 obache Exp $
 
 DISTNAME=		dnstracer-1.7
 CATEGORIES=		net
@@ -12,10 +12,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_FEATURES+=		inet6
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.dnstracer
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/fping6/Makefile b/net/fping6/Makefile
index d2d00503eda..82db5dbf971 100644
--- a/net/fping6/Makefile
+++ b/net/fping6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/02/10 17:33:52 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/15 08:34:00 obache Exp $
 
 DISTNAME=	fping-2.4b2_to-ipv6
 PKGNAME=	fping6-2.4b2
@@ -12,15 +12,11 @@ COMMENT=	Quickly ping many hosts w/o flooding the network
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
+USE_FEATURES+=	inet6
 
 SPECIAL_PERMS+=		sbin/fping6 ${SETUID_ROOT_PERMS}
 
 post-patch:
 	@${MV} ${WRKSRC}/fping.8 ${WRKSRC}/fping6.8
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.fping6
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gethost/Makefile b/net/gethost/Makefile
index a6ab2121073..292973252ae 100644
--- a/net/gethost/Makefile
+++ b/net/gethost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:30 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/15 08:34:00 obache Exp $
 
 DISTNAME=	gethost-0.03
 CATEGORIES=	net
@@ -11,6 +11,8 @@ COMMENT=	Hostname and IP resolver for testing /etc/hosts and nsswitch.conf
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_FEATURES+=		inet6
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 BUILD_TARGET=	gethost
 
@@ -23,9 +25,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gethost ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gethost.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.gethost
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mping/Makefile b/net/mping/Makefile
index ffd02b82805..ff7e591851d 100644
--- a/net/mping/Makefile
+++ b/net/mping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/03/21 16:01:26 darcy Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/15 08:34:00 obache Exp $
 
 DISTNAME=	mping-2.01
 CATEGORIES=	net
@@ -11,15 +11,12 @@ COMMENT=	Mping network statistics collector
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
+USE_FEATURES+=		inet6
+
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mping ${DESTDIR}${PREFIX}/sbin/mping
 	${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.mping
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netcat6/Makefile b/net/netcat6/Makefile
index 266225f96af..a068981b716 100644
--- a/net/netcat6/Makefile
+++ b/net/netcat6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/01/04 12:50:13 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/15 08:34:00 obache Exp $
 
 DISTNAME=		nc6-1.0
 PKGNAME=		${DISTNAME:S/nc/netcat/}
@@ -20,8 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-stack-guess
 
 USE_PKGLOCALEDIR=	yes
-
-.include "options.mk"
+USE_FEATURES+=		inet6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netcat6/options.mk b/net/netcat6/options.mk
deleted file mode 100644
index c90716bc1b9..00000000000
--- a/net/netcat6/options.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/11/28 16:28:55 tv Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.netcat6
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index 2cd467b259b..fd8b21bd895 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/08/22 21:10:16 markd Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/15 08:34:00 obache Exp $
 #
 
 DISTNAME=	scamper-cvs-20100517
@@ -12,6 +12,8 @@ COMMENT=	Dual-stack traceroute software
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_FEATURES+=	inet6
+
 INSTALLATION_DIRS=bin
 
 MAKE_FLAGS+=	WITH_DEBUG=yes	# recommended by the the software developer
@@ -19,9 +21,4 @@ MAKE_FLAGS+=	WITH_DEBUG=yes	# recommended by the the software developer
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scamper ${DESTDIR}${PREFIX}/bin
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.scamper
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/totd/Makefile b/net/totd/Makefile
index 2d0328693c1..e9995f9722e 100644
--- a/net/totd/Makefile
+++ b/net/totd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/27 17:33:43 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2011/04/15 08:34:00 obache Exp $
 #
 
 DISTNAME=	totd-1.5.1
@@ -12,11 +12,9 @@ COMMENT=	DNS proxy that supports IPv6 <==> IPv4 record translation
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_FEATURES+=	inet6
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.totd
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 BUILDLINK_TRANSFORM+=		rm:-Werror
 
@@ -28,5 +26,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/totd.conf.sample \
 		${DESTDIR}${PREFIX}/share/examples/totd/totd.conf.sample
 
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 02d3cb2d24d..78eceeb3d27 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/11/08 17:10:55 abs Exp $
+# $NetBSD: Makefile,v 1.33 2011/04/15 08:34:01 obache Exp $
 #
 
 DISTNAME=	vsftpd-2.3.2
@@ -14,6 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKG_SYSCONFSUBDIR=	vsftpd
 
+USE_FEATURES+=		inet6
+
 BUILD_TARGET=	vsftpd
 RCD_SCRIPTS=	vsftpd
 
diff --git a/net/vsftpd/options.mk b/net/vsftpd/options.mk
index fc57694260c..73de749441a 100644
--- a/net/vsftpd/options.mk
+++ b/net/vsftpd/options.mk
@@ -1,19 +1,11 @@
-# $NetBSD: options.mk,v 1.6 2008/09/22 11:02:21 abs Exp $
+# $NetBSD: options.mk,v 1.7 2011/04/15 08:34:01 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vsftpd
 PKG_SUPPORTED_OPTIONS=	pam ssl tcpwrappers
 PKG_SUGGESTED_OPTIONS=	pam tcpwrappers
-PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
-PKG_OPTIONS_GROUP.inet6=	inet6
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-BROKEN=		Needs ipv6 option enabled.
-.endif
-
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"
 LIBS+=		-L${PAMBASE}