From 2f517bc25c1dfd477877da169af65a161a689211 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 7 Sep 2007 22:12:10 +0000
Subject: 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.
---
 games/gtetrinet/Makefile  | 11 ++++++-----
 games/quake6/Makefile     | 10 +++-------
 games/quakeforge/Makefile | 12 ++++++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'games')

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
 
-- 
cgit v1.2.3