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, 27 insertions, 17 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 6f457d95a22..ca329684ebc 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2007/07/04 20:54:54 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2007/09/07 22:12:20 jlam Exp $
 
 DISTNAME=		inn-2.4.3
 PKGREVISION=		1
@@ -14,7 +14,7 @@ COMMENT=		The public release of InterNet News (INN)
 CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 
 .include "Makefile.common"
-BUILD_DEFS+=		USE_INET6
+
 BUILD_DEFS+=		INN_DATA_DIR
 FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR:Q}
 
@@ -82,10 +82,6 @@ RCD_SCRIPTS=		innd
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--with-sendmail=/usr/lib/sendmail
 .else
diff --git a/news/inn/options.mk b/news/inn/options.mk
index 9f00299ce9d..490cfc89150 100644
--- a/news/inn/options.mk
+++ b/news/inn/options.mk
@@ -1,12 +1,19 @@
-# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:01 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2007/09/07 22:12:20 jlam Exp $
 
-PKG_OPTIONS_VAR= PKG_OPTIONS.inn
-PKG_SUPPORTED_OPTIONS= python
-PKG_SUGGESTED_OPTIONS=
+PKG_OPTIONS_VAR=	PKG_OPTIONS.inn
+PKG_SUPPORTED_OPTIONS=	inet6 python
+PKG_SUGGESTED_OPTIONS=	# empty
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### IPv6 support
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+###
 ### Python support for INN
 ###
 .if !empty(PKG_OPTIONS:Mpython)
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 2808908e099..f1ddfec6ee9 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/02/15 14:44:49 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/07 22:12:21 jlam Exp $
 
 DISTNAME=	knews-1.0b.1
 PKGNAME=	knews-1.0
@@ -14,10 +14,15 @@ CONFLICTS=	knews-1.0b0
 
 USE_IMAKE=	YES
 
-BUILD_DEFS+=	KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE USE_INET6
+BUILD_DEFS+=	KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.knews
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
 # Set KNEWS_DOMAIN_NAME to a string appended to the "From:" header or
 # KNEWS_DOMAIN_FILE to a file from which the domain name will be read.
 post-extract:
@@ -37,7 +42,7 @@ post-patch:
 	${ECHO} >>${WRKSRC}/configure.h \
 	"#define DOMAIN_NAME \"${KNEWS_DOMAIN_NAME}\""
 .endif
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.if !empty(PKG_OPTIONS:Minet6)
 	${ECHO} >>${WRKSRC}/configure.h "#define USE_INET6 YES"
 .endif
 
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 6299703ca26..39f7fb9b031 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/07 22:12:21 jlam Exp $
 
 DISTNAME=		leafnode-1.11.3.rel
 PKGNAME=		${DISTNAME:S/.rel//}
@@ -32,7 +32,6 @@ PKG_SHELL.${LEAFNODE_USER}=	${SH}
 
 PKG_GROUPS_VARS+=	LEAFNODE_GROUP
 PKG_USERS_VARS+=	LEAFNODE_USER
-BUILD_DEFS+=		USE_INET6
 
 FILES_SUBST+=		LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q}
 FILES_SUBST+=		LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR:Q}
@@ -48,9 +47,12 @@ CONFIGURE_ARGS+=	--with-user=${LEAFNODE_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${LEAFNODE_GROUP:Q}
 USE_TOOLS+=		gmake
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.leafnode
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--with-ipv6
 .else
 CONFIGURE_ARGS+=	--without-ipv6