[pkgsrc/trunk]: pkgsrc/net/vsftpd Require "inet6" option instead of using dep...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/15e0f483de9a
branches:  trunk
changeset: 523214:15e0f483de9a
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Jan 03 15:54:56 2007 +0000

description:
Require "inet6" option instead of using deprecated USE_INET6; also don't
set that in PKG_SUGGESTED_OPTIONS (it's up to bsd.pkg.mk to do that).

diffstat:

 net/vsftpd/Makefile   |  6 +-----
 net/vsftpd/options.mk |  8 +++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 37a96fe67ec5 -r 15e0f483de9a net/vsftpd/Makefile
--- a/net/vsftpd/Makefile       Wed Jan 03 15:51:24 2007 +0000
+++ b/net/vsftpd/Makefile       Wed Jan 03 15:54:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/05 15:20:28 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/03 15:54:56 tv Exp $
 #
 
 DISTNAME=      vsftpd-2.0.4
@@ -40,10 +40,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if empty(USE_INET6:M[Yy][Ee][Ss])
-PKG_FAIL_REASON+=      "${PKGNAME} requires a IPv6-enabled userland to compile."
-.endif
-
 LIBS.SunOS=    -lsocket -lnsl -lrt -lsendfile
 
 .include "options.mk"
diff -r 37a96fe67ec5 -r 15e0f483de9a net/vsftpd/options.mk
--- a/net/vsftpd/options.mk     Wed Jan 03 15:51:24 2007 +0000
+++ b/net/vsftpd/options.mk     Wed Jan 03 15:54:56 2007 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.3 2006/05/16 21:08:50 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2007/01/03 15:54:56 tv Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.vsftpd
-PKG_SUPPORTED_OPTIONS= inet6 pam ssl tcpwrappers
-PKG_SUGGESTED_OPTIONS= inet6 pam tcpwrappers
+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"