Convert packages that test and use USE_INET6 to use the options framework

and to support the "inet6" option instead.

Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files.  Replace:

	BUILD_DEFS+=	USE_INET6
with
	BUILD_DEFS+=	IPV6_READY

and teach the README-generation tools to look for that instead.

This nukes USE_INET6 from pkgsrc proper.  We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.

5 files changed, 17 insertions, 13 deletions

diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 4400982d4cb..c1d9798b511 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/07/04 20:54:57 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/07 22:12:22 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -35,7 +35,7 @@ CRYPTO=			yes
 KERBEROS=		yes
 
 # retain the following line, for IPv6-ready pkgsrc webpage
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 #BUILD_DEFS+=		KERBEROS
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 48724a8b728..cbb99861f32 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.182 2007/09/07 10:41:11 taca Exp $
+# $NetBSD: Makefile,v 1.183 2007/09/07 22:12:21 jlam Exp $
 
 DISTNAME=		openssh-4.7p1
 PKGNAME=		openssh-4.7.1
@@ -28,7 +28,7 @@ USE_TOOLS+=		perl
 CRYPTO=			yes
 
 # retain the following line, for IPv6-ready pkgsrc webpage
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 
 PKG_GROUPS_VARS+=	OPENSSH_GROUP
 PKG_USERS_VARS+=	OPENSSH_USER
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 8fdeaa0e319..0c1cb97bb04 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/21 13:18:45 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/07 22:12:22 jlam Exp $
 #
 
 DISTNAME=	putty-0.59
@@ -15,13 +15,16 @@ BUILD_DIRS=	${WRKSRC}/unix
 MAKE_FILE=	Makefile.gtk
 MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.putty
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
 
 .if empty(OPSYS:MLinux)
 CFLAGS+=	-DHAVE_NO_SETRESUID
 .endif
 
-.if !empty(USE_INET6:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Minet6)
 CFLAGS+=	-DIPV6
 .endif
 
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 618ccc7cc5c..108ff59dfad 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/08/09 20:15:38 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/07 22:12:22 jlam Exp $
 
 DISTNAME=	ssh-3.2.9.1
 PKGNAME=	${DISTNAME:C/ssh-/ssh2-/}
@@ -17,7 +17,7 @@ CONFLICTS+=		openssh+gssapi-[0-9]* ssh2-nox11-[0-9]*
 
 GNU_CONFIGURE=		YES
 
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 
 CRYPTO=			YES
 PKG_SYSCONFSUBDIR=	ssh2
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index 6ffdbc34dd4..37dcef91f9d 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:09 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/07 22:12:22 jlam Exp $
 
 DISTNAME=	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -14,9 +14,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=	yes
 
-BUILD_DEFS+=		USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tcp_wrappers
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
 BUILD_TARGET.${OPSYS}?=	generic		# good luck!
 BUILD_TARGET.Darwin=	netbsd
@@ -29,7 +30,7 @@ BUILD_TARGET.SunOS=	sunos5
 BUILD_TARGET.IRIX=	${LOWER_OPSYS:C|\..*||}
 BUILD_TARGET=		${BUILD_TARGET.${OPSYS}}
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+.if !empty(PKG_OPTIONS:Minet6)
 .  if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
 MAKE_ENV+=	IPV6="-DHAVE_IPV6 -DUSE_GETHOSTBYNAME2"
 .  elif ${OPSYS} != "Linux"