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.

56 files changed, 246 insertions, 245 deletions

diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index c92dcd35c97..cbe78d2b1e8 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	tremor-tools-1.0.0.8
@@ -10,8 +10,7 @@ MAINTAINER=	chris@NetBSD.org
 HOMEPAGE=	http://www.vorbis.com/
 COMMENT=	Ogg Vorbis encoder and player
 
-# list it into IPv6-ready packages
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 CONFLICTS=	vorbis-[0-9]*
 
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 570914c1bf8..2641e33f307 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2007/06/08 17:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=	vorbis-tools-1.1.1
 PKGREVISION=	5
@@ -11,8 +11,7 @@ COMMENT=	Ogg Vorbis encoder and player
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# list it into IPv6-ready packages
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 CONFLICTS=	vorbis-[0-9]*
 
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
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 40f21dbfb2e..fe49f75d60a 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/06/05 05:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/07 22:12:11 jlam Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.11
@@ -15,14 +15,15 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 
-BUILD_DEFS+=		USE_INET6
 MAKE_FLAGS+=		gamesdir=${PREFIX}/bin
 MAKE_FLAGS+=		schemadir=${PREFIX}/share/gconf/schemas
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gtetrinet
+PKG_SUPPORTED_OPTIONS=	inet6
 
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index de57cb5e46c..d45967ece7b 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/02/20 12:40:14 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -19,17 +19,13 @@ post-extract:
 	cd ${WRKSRC}; ${RM} config.cache
 
 USE_TOOLS+=	gmake
+USE_FEATURES=	inet6
 GNU_CONFIGURE=	yes
 
-# This pkg can be built on USE_INET6 platform only
-BUILD_DEFS+=	USE_INET6
 .include "../../mk/bsd.prefs.mk"
-.if !(defined(USE_INET6) && ${USE_INET6} == "YES")
-PKG_FAIL_REASON+=	"${PKGNAME} requires IPv6 support"
-.endif
 
 # "bindir" setting is very non-standard for GNU autoconf
-CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin
+CONFIGURE_ARGS+=	--disable-asmopt --bindir=/bin
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index a31ff9dbadb..cda9ae63c17 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/06/30 19:16:26 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		7
@@ -23,10 +23,14 @@ SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	libs/audio/targets/snd_oss.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
-BUILD_DEFS+=		USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.quakeforge
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.include "../../mk/bsd.prefs.mk"
-.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
 .endif
 
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index ea939821820..ce6b7b5840d 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/07/04 20:54:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/09/07 22:12:12 jlam Exp $
 #
 # Canna common makefile.
 #
@@ -27,16 +27,6 @@ CANNA_MODE=	0755
 PKG_GROUPS_VARS+=	CANNA_GROUP
 PKG_USERS_VARS+=	CANNA_USER
 
-# XXX IPv6 support.  To be done.
-#BUILD_DEFS+=	USE_INET6
-#.include "../../mk/bsd.prefs.mk"
-#.if 0	# defined(USE_INET6) && ${USE_INET6} == "YES"
-#INET6=		-DINET6
-#.else
-#INET6=		# empty
-#.endif
-#MAKE_ENV+=	INET6=${INET6}
-
 CANNA_ENV=	CANNA_USER=${CANNA_USER}				\
 		CANNA_GROUP=${CANNA_GROUP}				\
 		CANNA_SPOOL=${CANNA_SPOOL}				\
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 00d0e3e9950..3dbade08e4b 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
 COMMENT=	Terminal based SKK-like Kana-to-Kanji FrontEnd Processor
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 WRKSRC=		${WRKDIR}/skkfep
 NO_CONFIGURE=	yes
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index fc48d93210d..6a9c45d8fac 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=	skkinput-2.06.3
 PKGREVISION=	2
@@ -9,7 +9,7 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://skkinput2.sourceforge.jp/
 COMMENT=	X11 frontend for SKK
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 USE_IMAKE=	YES
 
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index a9af7020a5f..90d63379a25 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/05 07:09:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=	skk9.6
 PKGNAME=	skkserv-3.9.4
@@ -16,7 +16,7 @@ COMMENT=	Dictionary server for Simple Kana-Kanji conversion programs
 
 WRKSRC=			${WRKDIR}/skk-9.6
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 DIST_SUBDIR=	skk
 
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index d4f78cdf8ff..913a1b1c30b 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.25 2007/05/05 21:45:12 adrianp Exp $
+# $NetBSD: Makefile.php,v 1.26 2007/09/07 22:12:13 jlam Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -6,8 +6,6 @@
 DISTINFO_FILE=	${.CURDIR}/../../lang/php5/distinfo
 PATCHDIR=	${.CURDIR}/../../lang/php5/patches
 
-BUILD_DEFS+=		USE_INET6
-
 USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index c67949b44a3..69d3d4a974e 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/12/01 10:40:48 martin Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:13 jlam Exp $
 #
 
 PKGNAME=	mini_sendmail-1.3.6
 PKGREVISION=	2
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 .include "Makefile.common"
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 3c9ccb805f0..510085591f7 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/07 22:12:13 jlam Exp $
 
 DISTNAME=	nail-11.25
 CATEGORIES=	mail
@@ -9,15 +9,14 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://nail.sourceforge.net/
 COMMENT=	BSD mail utility with MIME extensions
 
-BUILD_DEFS+=	USE_INET6
-
 MAKE_ENV+=	"SYSCONFDIR=${PKG_SYSCONFDIR}"
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.nail
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
 
-# IPv6 support
-#
-.if ${USE_INET6} == "YES"
+.if !empty(PKG_OPTIONS:Minet6)
 MAKE_ENV+=	"IPv6=-DHAVE_IPv6_FUNCS"
 .endif
 
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 2150b87cbd8..933f1075b81 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:44 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/07 22:12:13 jlam Exp $
 
 DISTNAME=	smtpfeed-1.18
 PKGREVISION=	1
@@ -16,10 +16,10 @@ COMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
 # require sendmail from pkgsrc.
 #DEPENDS+=	sendmail>=8.9.3:../../mail/sendmail
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX:Q}/libexec
 # configure tries to be clever, so force our setting
-CONFIGURE_ENV+=	my_cv_path_lib_exec=${PREFIX:Q}/libexec
+CONFIGURE_ENV+=		my_cv_path_lib_exec=${PREFIX:Q}/libexec
 # use bind8?
 #CONFIGURE_ARGS+=	--with-bind8
 
@@ -27,16 +27,17 @@ DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 	ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
 	RELEASE.NOTE SIGNAL SIGNAL.j TODO
 
-BUILD_DEFS+=	USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.smtpfeed
+PKG_SUPPORTED_OPTIONS=	inet6
 
-INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 share/doc/smtpfeed
-
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+=--enable-ipv6
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 share/doc/smtpfeed
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8
 	for i in ${DOCS}; do \
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 98b5f5ece2e..010358d241e 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/11 18:43:29 minskim Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/07 22:12:14 jlam Exp $
 #
 
 DISTNAME=	sdr-3.0
@@ -13,13 +13,15 @@ COMMENT=	MBone Session Directory
 WRKSRC=		${WRKDIR}/sdr/${SYSDIR}
 CRYPTO=		yes
 USE_TOOLS+=	gmake
+HAS_CONFIGURE=	yes
 
-BUILD_DEFS+=		USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sdr
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CONFIGURE_ARGS+= --enable-ipv6
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 .if exists(/usr/include/sys/inttypes.h)
@@ -40,11 +42,12 @@ post-patch:
 	${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/../src/sdr.tcl.in >	\
 		${WRKSRC}/../src/sdr.tcl
 
-do-configure:
-	cd ${WRKSRC} ; ${SH} ./configure
 .if ${OPSYS} == "SunOS"
+post-configure:
 	# Untested for sdr 3.0 !!!
-	${CAT} ${WRKSRC}/sdr/solaris/Makefile.solaris ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/solaris/Makefile
+	${CAT}	${WRKSRC}/sdr/solaris/Makefile.solaris			\
+		${WRKSRC}/sdr/src/Makefile.template			\
+		> ${WRKSRC}/sdr/solaris/Makefile
 .endif
 
 do-install:
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}" \
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 0f7d36d2560..f032cece1aa 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2007/08/08 18:32:46 reed Exp $
+# $NetBSD: Makefile,v 1.94 2007/09/07 22:12:16 jlam Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P1/pl1/}
@@ -14,12 +14,11 @@ BIND_VERSION=	9.4.1-P1
 
 # IPv6 ready, automatically detected
 .include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=	USE_INET6
-# No need to set USE_INET6, will auto-detect.
+BUILD_DEFS+=	IPV6_READY
 
 BUILD_DEFS+=	BIND_DIR VARBASE
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libtool=yes \
@@ -46,10 +45,10 @@ FILES_SUBST+=	BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q}
 MESSAGE_SUBST+=	BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 
 # include/isc/ipv6.h is installed on non-ipv6 platforms
-.if defined(USE_INET6) && (${USE_INET6} == "YES")
-PLIST_SUBST+=	IPV6H="@comment "
-.else
+.if !empty(MISSING_FEATURES:Minet6)
 PLIST_SUBST+=	IPV6H=
+.else
+PLIST_SUBST+=	IPV6H="@comment "
 .endif
 
 PLIST_SRC=	${WRKDIR}/PLIST
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index 47c3da480b8..4feadcd7d05 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/07 22:12:17 jlam Exp $
 #
 
 DISTNAME=	cftp-0.12
@@ -13,7 +13,7 @@ COMMENT=	Comfortable FTP, a full screen ftp client
 GNU_CONFIGURE=	YES
 INFO_FILES=	# PLIST
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cftp
diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile
index a32bfbd609e..e07c047426d 100644
--- a/net/hf6to4/Makefile
+++ b/net/hf6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:17 jlam Exp $
 #
 
 DISTNAME=		hf6to4-1.3
@@ -15,7 +15,11 @@ WRKSRC=			${WRKDIR}
 
 NOT_FOR_PLATFORM+=	Interix-*-* # no IPv6 support or ifconfig command
 
-# This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
+# This package does not set or evaluate IPV6_READY, but it should still
+# be listed in README-IPv6.html.
+#
+BUILD_DEFS+=	IPV6_READY
+
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index c84ed8af641..33069ab4922 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/08/28 22:02:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/07 22:12:17 jlam Exp $
 #
 
 DISTNAME=	ipv6calc-0.61.0
@@ -9,8 +9,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.deepspace6.net/projects/ipv6calc.html
 COMMENT=	Manipulates IPv6 addresses
 
-# This package does not set or evaluate USE_INET6, but it should still
+# This package does not set or evaluate IPV6_READY, but it should still
 # be listed in README-IPv6.html. Leave this comment here to make it so!
+#
+BUILD_DEFS+=	IPV6_READY
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 83489cd305c..10c2e90a6c1 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/03/24 19:21:29 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/07 22:12:18 jlam Exp $
 
 DISTNAME=	irrd2.2.8
 PKGNAME=	irrd-2.2.8
@@ -20,15 +20,23 @@ USE_TOOLS+=		automake flex perl:run
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
-#PTHREAD_AUTO_VARS=	yes
-#PTHREAD_OPTS+=		require
+PKG_OPTIONS_VAR=	PKG_OPTIONS.irrd
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-thread
 
-BUILD_DEFS+=		USE_INET6
+#PTHREAD_AUTO_VARS=	yes
+#PTHREAD_OPTS+=		require
+#.include "../../mk/pthread.buildlink3.mk"
 
-#CPPFLAGS+=		-I${LOCALBASE}/include
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
 
 REPLACE_PERL+=		programs/irrdcacher/irrdcacher
 REPLACE_PERL+=		programs/irrdcacher/ripe2rpsl
@@ -44,14 +52,4 @@ post-install:
 	${INSTALL_SCRIPT} irrdcacher ${PREFIX}/sbin && \
 	${INSTALL_SCRIPT} ripe2rpsl ${PREFIX}/sbin
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-# default
-# CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-#.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 3ad816f5b57..81465267f6f 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/02 10:52:23 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/07 22:12:18 jlam Exp $
 #
 
 DISTNAME=	libdnet-1.12
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libdnet
 PKG_SUPPORTED_OPTIONS=	libdnetcheck
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 2e6958457b3..cb70f32c50d 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 21:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/07 22:12:18 jlam Exp $
 
 DISTNAME=	mDNSResponder-108
 PKGREVISION=	1
@@ -58,8 +58,12 @@ MAKE_ENV+=	EXTRA_LIBS=-Wl,-R${BUILDLINK_PREFIX.librfuncs:Q}/lib\ ${BUILDLINK_LDF
 MAKE_ENV+=	EXTRA_LIBS=
 .endif
 
-BUILD_DEFS+=	USE_INET6
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mDNSResponder
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 MAKE_ENV+=	HAVE_IPV6=1
 .endif
 
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index a951c606d9a..e91efeaf5ec 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/08/11 23:48:40 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/07 22:12:18 jlam Exp $
 
 DISTNAME=	nsd-3.0.5
 CATEGORIES=	net
@@ -10,10 +10,12 @@ COMMENT=	Authoritative-only DNS server
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEFS+=	USE_INET6 VARBASE
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.nsd
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
 
 GNU_CONFIGURE=	yes
 
@@ -22,7 +24,9 @@ PKG_SYSCONFSUBDIR=	nsd
 CONFIGURE_ARGS+=--with-configdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=--enable-bind8-stats
 CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-.if !defined(USE_INET6)
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=--enable-ipv6
+.else
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index 19a121a7333..961b16bcbc6 100644
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/07 22:12:18 jlam Exp $
 
 DISTNAME=	oidentd-2.0.7
 PKGREVISION=	4
@@ -14,10 +14,14 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 RCD_SCRIPTS=		oidentd
 OSVERSION_SPECIFIC=	YES
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.oidentd
+PKG_SUPPORTED_OPTIONS=	inet6
 
-BUILD_DEFS+=	USE_INET6
-.if defined(USE_INET6) && ${USE_INET6} != "YES"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 276e041d8e4..af0dac41b17 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/11/05 17:31:10 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/07 22:12:19 jlam Exp $
 #
 
 DISTNAME=		Socket6-0.19
@@ -16,8 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Socket6/.packlist
 
-# supports IPv6 (actually, af independent)
-BUILD_DEFS+=		USE_INET6
+# supports IPv6 (actually, AF-independent)
+BUILD_DEFS+=		IPV6_READY
 
 MAKE_ENV+=		CCFLAGS="${CFLAGS} ${CPPFLAGS}"
 
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index 51df32a0621..1fcf9fd4c03 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:05 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/07 22:12:19 jlam Exp $
 
 DISTNAME=		pchar-1.5
 CATEGORIES=		net
@@ -11,17 +11,17 @@ COMMENT=		Tool for measuring Internet path characteristics
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
-BUILD_DEFS+=		USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pchar
+PKG_SUPPORTED_OPTIONS=	inet6
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.include "../../net/net-snmp/buildlink3.mk"
-
+.  include "../../net/net-snmp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-snmp=${BUILDLINK_PREFIX.net-snmp}
 LIBS+=			-lsnmp -lcrypto -ldes
 .endif
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index 51fcb9ef32c..8e68e069bda 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:19 jlam Exp $
 #
 
 DISTNAME=	ripe-whois-3.1.1v6
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/whois-3.1.1v6
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	perl
 MAKE_ENV+=	PERL5=${PERL5:Q}
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=	IPV6_READY
 
 ASCII_DOC=		ripe-223.txt
 PS_DOC=			ripe-223.ps
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 8883d076200..29d8fd6cb21 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/07 22:12:20 jlam Exp $
 
 DISTNAME=	trafshow-5.2.1
 PKGREVISION=	1
@@ -13,11 +13,12 @@ COMMENT=	Full screen visualization of the network traffic
 BUILD_TARGET=	trafshow
 GNU_CONFIGURE=	yes
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.trafshow
+PKG_SUPPORTED_OPTIONS=	inet6
 
-BUILD_DEFS+=	USE_INET6
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
+.if !empty(PKG_OPTIONS:Minet6)
 CPPFLAGS+=	-DINET6
 .endif
 
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 3700bc47ea2..0e69ca66ada 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/08/06 14:54:04 tron Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/07 22:12:20 jlam Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
@@ -23,7 +23,7 @@ CRYPTO=			yes
 NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
 USE_TOOLS+=		perl:run
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 
 BUILD_TARGET=		World
 
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
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"
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index b83699a4e34..6cb63f69185 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/06/08 12:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/07 22:12:23 jlam Exp $
 #
 
 .include "../../sysutils/cfengine2/Makefile.common"
@@ -9,7 +9,7 @@ PKGREVISION=	1
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
-BUILD_DEFS+=		USE_INET6
+BUILD_DEFS+=		IPV6_READY
 
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
diff --git a/sysutils/free/Makefile b/sysutils/free/Makefile
index 122f0e909c7..f9e2db89370 100644
--- a/sysutils/free/Makefile
+++ b/sysutils/free/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/07 22:12:23 jlam Exp $
 #
 
 DISTNAME=		free-1.0
@@ -10,8 +10,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Displays memory usage
 
 
-# This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
-WRKSRC=			${WRKDIR}
+BUILD_DEFS+=	IPV6_READY
+
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index cb9a8d0d063..c4259ddac90 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:12 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/07 22:12:23 jlam Exp $
 
 DISTNAME=	socket-1.1
 CATEGORIES=	sysutils net
@@ -9,13 +9,15 @@ COMMENT=	Create tcp socket and connect to stdin/out
 
 MAKE_ENV+=	INSTALLBASE=${PREFIX:Q}
 
-BUILD_DEFS+=	USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.socket
+PKG_SUPPORTED_OPTIONS=	inet6
 
-# to get USE_INET6
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
+###
+### IPv6 support
+###
+.if !empty(PKG_OPTIONS:Minet6)
 MAKE_ENV+=	SWITCHES="-DUSE_INET6 -DHAVE_SYS_PARAM_H -Wall"
 .else
 MAKE_ENV+=	SWITCHES="-DHAVE_SYS_PARAM_H -Wall"
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