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, 8 insertions, 16 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index bd9690ba2c7..b8243688bde 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/29 04:54:51 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.0
@@ -15,12 +15,10 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 BUILDLINK_DEPENDS.pth=	pth>=1.4.0
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 REPLACE_BUILDLINK=	sdl-config
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-#USE_MESA=		YES
 USE_X11=		YES
 
 USE_LIBTOOL=		YES
diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile
index 32cdf96a6ac..a1dde358d96 100644
--- a/devel/SDL_ttf/Makefile
+++ b/devel/SDL_ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/26 21:42:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/29 04:54:51 jlam Exp $
 #
 
 DISTNAME=	SDL_ttf-2.0.3
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.libsdl.org/projects/SDL_ttf/
 COMMENT=	use TrueType fonts in your SDL applications
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 11c361ff03e..269489687e2 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/25 21:36:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:51 jlam Exp $
 
 DISTNAME=		gcvs-1.0a7
 CATEGORIES=		devel
@@ -11,7 +11,6 @@ COMMENT=		GTK interface for CVS
 CONFLICTS=		cvs-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 1401fa7a5e6..2ac4a12913f 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/06/26 14:01:53 zuntum Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/29 04:54:51 jlam Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -11,14 +11,13 @@ HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 COMMENT=	Graphical front end to GNU make
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 BUILD_USES_MSGFMT=	YES
 
 USE_GMAKE=	yes
-USE_LIBINTL=	yes
 USE_X11=	yes
 
 GNU_CONFIGURE=	yes
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 3b941fe56cb..0a767e922d2 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/28 06:09:24 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:51 jlam Exp $
 #
 
 DISTNAME=	pilrc-2.8p4
@@ -21,9 +21,7 @@ COMMENT=	generate resources for PalmOS applications from textual description
 #EXTRACT_CMD=	unzip -aq ${DOWNLOADED_DISTFILE}
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
-
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 
 DOCDIR=		${PREFIX}/share/doc/html/pilrc
 
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index 5be47617551..0bc87532cb0 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/28 21:48:15 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:52 jlam Exp $
 #
 
 DISTNAME=	smpeg-0.4.3
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
 REPLACE_BUILDLINK=	smpeg-config
 
 CPPFLAGS+=		-Dunix=1