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.

8 files changed, 23 insertions, 30 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 0e040a0e1fd..7ff956481d3 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2007/08/28 23:57:06 jnemeth Exp $
+# $NetBSD: Makefile,v 1.117 2007/09/07 22:12:23 jlam Exp $
 
 .include "Makefile.common"
 
@@ -11,7 +11,7 @@ COMMENT=	Apache HTTP (Web) server, version 2
 
 CONFLICTS=	apache-*ssl-[0-9]* apache6-[0-9]*
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 BUILD_DEFS+=	VARBASE
 
 USE_TOOLS+=		perl perl:run pkg-config
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index e57ad70f320..1e509baaa74 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/08/28 23:56:26 jnemeth Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/07 22:12:24 jlam Exp $
 
 .include "Makefile.common"
 
@@ -11,7 +11,7 @@ COMMENT=	Apache HTTP (Web) server, version 2
 
 CONFLICTS=	apache-{,*ssl}-[0-9]* apache6-[0-9]*
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 BUILD_DEFS+=	VARBASE
 
 USE_TOOLS+=		perl perl:run pkg-config
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index a3be0305729..9554f0d4bbb 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/05/24 14:00:38 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/07 22:12:24 jlam Exp $
 #
 
 DISTNAME=	bozohttpd-20060517
@@ -10,23 +10,13 @@ MAINTAINER=	mrg@eterna.com.au
 HOMEPAGE=	http://www.eterna.com.au/bozohttpd/
 COMMENT=	Bozotic HTTP server; small and secure
 
-BUILD_DEFS+=	USE_INET6
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
 MAKE_ENV+=	MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bozohttpd
-PKG_SUPPORTED_OPTIONS=	bozohttpd-do-htpasswd
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CPPFLAGS+=	-DINET6
-.endif
-CPPFLAGS+=	-Wno-error
-MAKE_ENV+=	BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR}
+PKG_SUPPORTED_OPTIONS=	bozohttpd-do-htpasswd inet6
 
 .include "../../mk/bsd.options.mk"
 
@@ -34,6 +24,13 @@ MAKE_ENV+=	BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR}
 CPPFLAGS+=	-DDO_HTPASSWD
 .endif
 
+.if !empty(PKG_OPTIONS:Minet6)
+CPPFLAGS+=	-DINET6
+.endif
+
+CPPFLAGS+=	-Wno-error
+MAKE_ENV+=	BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR}
+
 INSTALLATION_DIRS=	libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/curl/Makefile b/www/curl/Makefile
index cdadd49a8bb..4e0bd3e104e 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2007/07/19 21:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2007/09/07 22:12:24 jlam Exp $
 
 DISTNAME=	curl-7.16.4
 CATEGORIES=	www
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # list it into IPv6-ready packages
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index bad6405f383..6018d202ce3 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:26 jlam Exp $
 #
 
 DISTNAME=	lhs-0.1
@@ -13,7 +13,7 @@ COMMENT=	Lightweight HTTP Server, IPv6-aware and SSL-enabled
 WRKSRC=		${WRKDIR}/lhs
 GNU_CONFIGURE=	yes
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 MAKE_ENV+=	OPENSSL_ROOT=${BUILDLINK_PREFIX.openssl}
 MAKE_ENV+=	DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 35f5103400f..5b886284eea 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.37 2007/05/05 21:35:05 adrianp Exp $
+# $NetBSD: Makefile.php,v 1.38 2007/09/07 22:12:26 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -6,8 +6,6 @@
 DISTINFO_FILE=		${.CURDIR}/../../www/php4/distinfo
 PATCHDIR=		${.CURDIR}/../../www/php4/patches
 
-BUILD_DEFS+=		USE_INET6
-
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index d628877847b..32a37efbb23 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/06/14 11:50:51 obache Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/07 22:12:26 jlam Exp $
 
 DISTNAME=	thttpd-2.25b
 PKGREVISION=	5
@@ -19,8 +19,8 @@ SITES.${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
 
 GNU_CONFIGURE=	yes
 
-# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-BUILD_DEFS+=	USE_INET6
+# Note: this pkg auto-detects IPv6.
+BUILD_DEFS+=	IPV6_READY
 # thttpd syslogs at level LOG_DAEMON by default
 # change this to your preferred syslog level
 THTTPD_LOG_FACILITY?=	LOG_DAEMON
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 1b3d7c403ee..ba461b12c72 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/06/05 05:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/07 22:12:27 jlam Exp $
 
 DISTNAME=	thy-0.9.4
 PKGREVISION=	4
@@ -9,9 +9,7 @@ MAINTAINER=	algernon@bonehunter.rulez.org
 HOMEPAGE=	http://bonehunter.rulez.org/software/thy/
 COMMENT=	Tiny and fast HTTP daemon
 
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 USE_TOOLS+=		bison gmake lex
 GNU_CONFIGURE=		yes