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.

7 files changed, 19 insertions, 30 deletions

diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 4f74ee05ce4..cfe08f7e048 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/26 21:22:20 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $
 #
 
 DISTNAME=	avifile-0.6.20010618
@@ -27,7 +27,6 @@ WRKSRC=		${WRKDIR}/avifile-0.6
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index 3bb80459edd..b17f422835f 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/26 08:53:32 zuntum Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:54 jlam Exp $
 
 DISTNAME=	avifile-0.53.5
 CATEGORIES=	graphics
@@ -15,7 +15,6 @@ DEPENDS=	win32-codecs>=010122:../../graphics/win32-codecs
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile
index a909ede72a4..3f72147ed03 100644
--- a/graphics/dumpmpeg/Makefile
+++ b/graphics/dumpmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/28 22:05:27 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:54 jlam Exp $
 #
 
 DISTNAME=	dumpmpeg-0.6
@@ -10,7 +10,6 @@ HOMEPAGE=	http://sourceforge.net/projects/dumpmpeg
 COMMENT=	Splits mpeg stream into single images
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 GNU_CONFIGURE=		YES
 
 .include "../../devel/smpeg/buildlink.mk"
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 2259105aeb8..d38a085de66 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/26 22:02:26 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $
 #
 
 DISTNAME=	freetype-2.0.3
@@ -16,7 +16,6 @@ HOMEPAGE=	http://www.freetype.org/
 COMMENT=	font rendering engine and library API
 
 USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
 REPLACE_BUILDLINK=	freetype-config
 CHECK_FREETYPE2=	YES
 USE_GMAKE=		YES
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index d4ff6f647fc..9649ec891bc 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2001/06/18 21:40:25 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2001/06/29 04:54:54 jlam Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.10.1
@@ -17,14 +17,8 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-USE_CONFIG_WRAPPER=	# defined
 USE_BUILDLINK_ONLY=	# defined
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-
 M4=			${LOCALBASE}/bin/gm4
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
@@ -35,3 +29,8 @@ pre-configure:
 	cd ${WRKSRC} && \
 	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoconf && \
 	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/automake
+
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 53ac6fc75a1..be8b2771467 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/29 04:54:55 jlam Exp $
 #
 
 DISTNAME=	gqview-0.10.1
@@ -11,9 +11,7 @@ COMMENT=	another gtk-based graphic file viewer
 
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
 
-#USE_LIBINTL=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_GNOME_CONFIG=no
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 7e0da066eeb..6c7c0a2ad89 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2001/06/19 04:32:29 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2001/06/29 04:54:55 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.8.1
@@ -20,17 +20,6 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
 
 USE_BUILDLINK_ONLY=	yes
-USE_CONFIG_WRAPPER=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/netpbm/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -52,4 +41,11 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \
 		${LOCALBASE}/share/aclocal/imlib.m4
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/libungif/buildlink.mk"
+.include "../../graphics/netpbm/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"