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.

4 files changed, 19 insertions, 17 deletions

diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile
index 3ed244c6072..f87f4186cbe 100644
--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/30 10:06:36 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=	cgiirc-0.5.9
 PKGREVISION=	1
@@ -12,16 +12,17 @@ COMMENT=	Access IRC from a web browser
 USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 
-BUILD_DEFS+=	USE_INET6
-
 CONF_FILES=	${PREFIX}/share/examples/cgiirc/cgiirc.conf \
 			${PKG_SYSCONFDIR}/cgiirc.conf
 CONF_FILES+=	${PREFIX}/share/examples/cgiirc/cgiirc.config \
 			${CGIIRC}/cgiirc.config
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cgiirc
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Minet6)
 DEPENDS+=	p5-INET6-[0-9]*:../../net/p5-INET6
 .endif
 
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 921cbfbdb64..620e3767621 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/05/22 16:47:04 lkundrak Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=	eggdrop1.6.17
 PKGNAME=	eggdrop-1.6.17
@@ -12,13 +12,15 @@ HOMEPAGE=	http://www.eggheads.org/
 COMMENT=	IRC robot with TCL scripting and multi-channel ability
 
 GNU_CONFIGURE=		yes
-BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.eggdrop
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 PLIST_SUBST+=		NOIPV6="@comment "
 .else
@@ -82,7 +84,7 @@ do-install-modules:
 		compress.so console.so ctcp.so filesys.so irc.so notes.so \
 		seen.so server.so share.so transfer.so uptime.so wire.so \
 		${PREFIX}/lib/eggdrop
-.if !defined(USE_INET6) || empty(USE_INET6:M[Yy][Ee][Ss])
+.if empty(PKG_OPTIONS:Minet6)
 	cd ${WRKSRC} && ${INSTALL_DATA} dns.so ${PREFIX}/lib/eggdrop
 .endif
 	cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 7c605e8d919..8945bac3e0b 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2007/06/26 09:03:50 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -25,9 +25,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-default-server=${DEFAULT_IRC_SERVER:Q}
 .endif
 
-# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-# (Leave the line in to still get it into the README-IPv6.html!)
-BUILD_DEFS+=		USE_INET6
+# This pkg auto-detects IPv6.
+BUILD_DEFS+=		IPV6_READY
 
 .include "options.mk"
 
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index b8928a002ba..65ca8706339 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=	sirc-2.211
 PKGREVISION=	2
@@ -16,8 +16,8 @@ DEPENDS+=	p5-Socket6>=0.07:../../net/p5-Socket6
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-# supports IPv6 (actually, af independent)
-BUILD_DEFS+=	USE_INET6
+# supports IPv6 (actually, AF-independent)
+BUILD_DEFS+=	IPV6_READY
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_TOOLS+=	perl:run