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.

5 files changed, 9 insertions, 24 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index fa94492055a..ecacd813eac 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/19 15:55:08 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:49 jlam Exp $
 
 DISTNAME=	aumix-2.7
 CATEGORIES=	audio
@@ -14,12 +14,7 @@ COMMENT=	Set mix levels
 
 BUILD_USES_MSGFMT=	yes
 
-#USE_CURSES=		yes
-#USE_LIBINTL=		yes
-
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-own-labels
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index ab061ae97a0..2a327a2c41d 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/06/26 16:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/29 04:54:49 jlam Exp $
 
 DISTNAME=		esound-0.2.22
 CATEGORIES=		audio
@@ -13,7 +13,6 @@ USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 REPLACE_BUILDLINK=	esd-config
 
 .include "../../audio/libaudiofile/buildlink.mk"
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index fe98f68d7db..499f26dd6b8 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/06/19 07:08:06 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/06/29 04:54:49 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
 DISTNAME=		gqmpeg-0.8.3
@@ -14,24 +14,19 @@ BUILD_USES_MSGFMT=	yes
 
 DEPENDS+=		mpg123-0.59r:../../audio/mpg123
 
-#USE_LIBINTL=		YES
+USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
-
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--enable-japanese
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
-USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
-
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-
 # in case gnome isn't installed, we need to create the directories
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Multimedia
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index e3f8283792a..1775d7ea58a 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/26 16:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/29 04:54:49 jlam Exp $
 
 DISTNAME=		libmikmod-3.1.9
 CATEGORIES=		audio
@@ -14,7 +14,6 @@ GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 
 USE_BUILDLINK_ONLY=	# defined
-USE_CONFIG_WRAPPER=	# defined
 REPLACE_BUILDLINK=	libmikmod-config
 
 CONFIGURE_ARGS+=	--disable-threads
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 66cf4bb1fef..dc35414e9cc 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/06/19 16:04:18 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/06/29 04:54:50 jlam Exp $
 #
 
 DISTNAME=	mikmod-3.1.6-a
@@ -12,10 +12,7 @@ COMMENT=	MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-#USE_CURSES=		yes
-
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
 
 .include "../../audio/libmikmod/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"