USE_CONFIG_WRAPPER is automatically set if USE_BUILDLINK_ONLY is defined,

so remove it from package Makefiles.  Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.

6 files changed, 7 insertions, 15 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 78ce3063f3f..430d3a30286 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/06/28 22:22:32 zuntum Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/29 04:54:52 jlam Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -9,7 +9,6 @@ HOMEPAGE=	http://soback.kornet21.net/~artist/baduk/baduki.html
 COMMENT=	Go playing program based on xamigo
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 BUILD_USES_MSGFMT=	YES
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 75ee3f77d40..46bf25bcf7a 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/20 08:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:53 jlam Exp $
 
 DISTNAME=		dopewars-1.5.0
 CATEGORIES=		games
@@ -12,9 +12,6 @@ HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 COMMENT=		Make a fortune dealing drugs on the streets of New York
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
-
-#USE_LIBINTL=		YES
 USE_GMAKE=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/games/fire/Makefile b/games/fire/Makefile
index 2069de944b7..b47023d2589 100644
--- a/games/fire/Makefile
+++ b/games/fire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/26 10:08:31 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $
 #
 
 DISTNAME=	fire-1.0
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.libsdl.org/projects/fire/index.html
 COMMENT=	organic fireworks demo
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index 844066317b8..c8f9ee94ebd 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/21 05:06:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/29 04:54:53 jlam Exp $
 
 .include "../../games/freeciv-share/Makefile.common"
 
@@ -10,7 +10,6 @@ DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
 
 USE_X11=		# defined
 USE_BUILDLINK_ONLY=	# defined
-USE_CONFIG_WRAPPER=	# defined
 
 CONFIGURE_ARGS+=	--disable-server
 CONFIGURE_ARGS+=	--disable-make-data
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 806db02c7b5..39e9a370126 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/26 10:15:26 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/29 04:54:53 jlam Exp $
 #
 
 DISTNAME=	lbreakout-001018
@@ -10,10 +10,9 @@ HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	breakout-style arcade game
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=--disable-sound
+CONFIGURE_ARGS+=	--disable-sound
 
 .include "../../devel/SDL/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index db9100e389c..a96d949f7ee 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/26 10:15:25 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $
 #
 
 DISTNAME=	newvox-1.0
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.libsdl.org/projects/newvox/index.html
 COMMENT=	voxel-style landscape rendering fly-by
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 GNU_CONFIGURE=		YES
 USE_X11=		YES