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, 14 insertions, 31 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 714e6c72c22..a58643d8a31 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.266 2007/09/07 21:55:44 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.267 2007/09/07 22:12:14 jlam Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -456,18 +456,17 @@ PKG_INSTALLATION_TYPE?=	${PKG_INSTALLATION_TYPES:M${_pref_}:S/^/_pkginsttype_/1:
 PKG_INSTALLATION_TYPE?=	none
 
 # if the system is IPv6-ready, compile with IPv6 support turned on.
-.if defined(USE_INET6)
-.  if empty(USE_INET6:M[Yy][Ee][Ss])
-USE_INET6=		NO
-.  else
-USE_INET6=		YES
-.  endif
-.elif empty(_OPSYS_HAS_INET6:M[nN][oO])
-USE_INET6=		YES
+.if empty(_OPSYS_HAS_INET6:M[nN][oO])
+IPV6_READY=		YES
 .else
-USE_INET6=		NO
+IPV6_READY=		NO
 .endif
 
+# XXX
+# XXX Retain the following until USE_INET6 has been purged from pkgsrc-wip.
+# XXX
+USE_INET6=		${IPV6_READY}
+
 LOCALBASE?=		/usr/pkg
 X11_TYPE?=		native
 .if !empty(X11_TYPE:Mnative)
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 1afbdfdd7ab..a7c818af974 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.159 2007/08/17 20:27:31 joerg Exp $
+# $NetBSD: mk.conf,v 1.160 2007/09/07 22:12:14 jlam Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1645,22 +1645,6 @@ SILC_CLIENT_WITH_PERL?=	YES
 # Possible: sparcv7, sparcv8 or sparcv9.
 # Default: sparcv7
 
-#SPOP3D_ENABLE_APOP= yes
-# Enable APOP support in the mail/solid-pop3d package.
-# Possible: undefined, defined
-# Default: undefined
-
-#SPOP3D_ENABLE_STANDALONE= yes
-# Build mail/solid-pop3d to run standalone instead of via inetd.
-# Possible: undefined, defined
-# Default: undefined
-
-#SPOP3D_ENABLE_ALIASES= yes
-# Build mail/solid-pop3d with support for user names mapping and non-IP
-# based virtuals.
-# Possible: undefined, defined
-# Default: undefined
-
 #SQUID_CONFIGURE_ARGS=
 # Used in squid package to set build configuration options.
 # Possible: see "configure --help"
diff --git a/mk/misc/toplevel.mk b/mk/misc/toplevel.mk
index 489f9083e23..bfddf5968a3 100644
--- a/mk/misc/toplevel.mk
+++ b/mk/misc/toplevel.mk
@@ -1,4 +1,4 @@
-# $NetBSD: toplevel.mk,v 1.2 2007/01/07 00:57:36 rillig Exp $
+# $NetBSD: toplevel.mk,v 1.3 2007/09/07 22:12:15 jlam Exp $
 #
 # This file contains the make targets that can be used from the
 # top-level Makefile. They are in this separate file to keep the
@@ -156,7 +156,7 @@ readme-ipv6:
 	fi
 
 README-IPv6.html:
-	@${GREP} -l -e '^BUILD_DEFS.*=.*USE_INET6' -e '^PKG_SUPPORTED_OPTIONS.*=.*inet6' \
+	@${GREP} -l -e '^BUILD_DEFS.*=.*IPV6_READY' -e '^PKG_SUPPORTED_OPTIONS.*=.*inet6' -e '^USE_FEATURES.*=.*inet6' \
 		 */*/Makefile */*/options.mk \
 	 | ${SED} -e s,Makefile,, -e s,options.mk,, >$@.pkgs
 	@${FGREP} -f $@.pkgs README-all.html | ${SORT} -t/ +1 >$@.trs
diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme
index caf4d4b83e7..cb823b4adbb 100755
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.17 2007/08/02 22:42:05 adrianp Exp $
+# $NetBSD: mkreadme,v 1.18 2007/09/07 22:12:16 jlam Exp $
 #
 # Script for README.html generation
 #
@@ -471,7 +471,7 @@ echo " "
 cd ${PKGSRCDIR}
 ipv6=${TMPDIR}/ipv6pkgs
 ipv6_entries=${TMPDIR}/ipv6_entries
-${GREP} -l -e '^BUILD_DEFS.*=.*USE_INET6' -e '^PKG_SUPPORTED_OPTIONS.*=.*inet6' */*/Makefile */*/options.mk | ${SED} -e 's;Makefile;;g' -e 's;options.mk;;g' > $ipv6
+${GREP} -l -e '^BUILD_DEFS.*=.*IPV6_READY' -e '^PKG_SUPPORTED_OPTIONS.*=.*inet6' -e '^USE_FEATURES.*=.*inet6' */*/Makefile */*/options.mk | ${SED} -e 's;Makefile;;g' -e 's;options.mk;;g' > $ipv6
 ${FGREP} -f $ipv6 README-all.html | sort -t/ +1 > $ipv6_entries
 ${SED} \
     -e "/%%TRS%%/r${ipv6_entries}" \