Remove explicit settings of FOO_CONFIG=${BUILDLINK_CONFIG_WRAPPER.foo} in

MAKE_ENV as they are now added by the buildlink files themselves.

10 files changed, 11 insertions, 29 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index db2294ae8f6..088a9bcb076 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/03 17:08:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/17 21:16:45 jlam Exp $
 #
 
 DISTNAME=	easytag-0.15
@@ -17,7 +17,6 @@ USE_X11BASE=	yes
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 
-MAKE_ENV+=	GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
 MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index f4a71475cad..513fe752675 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/16 04:30:11 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/17 21:16:47 jlam Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -15,8 +15,5 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
-MAKE_ENV+=	XMMS_CONFIG=${BUILDLINK_CONFIG_WRAPPER.xmms}
-
 .include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 9887c3b8c3c..38be48c30eb 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/16 04:40:28 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -13,8 +13,6 @@ COMMENT=	XMMS plugin for dual scope
 USE_BUILDLINK_ONLY=	YES
 USE_X11=	yes
 USE_LIBTOOL=	yes
-MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
-MAKE_ENV+=	XMMS_CONFIG=${BUILDLINK_CONFIG_WRAPPER.xmms}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index eea5e98ed89..b278390a591 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/16 04:59:59 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -13,8 +13,6 @@ COMMENT=	XMMS plugin for dual spectogram
 USE_BUILDLINK_ONLY=	YES
 USE_X11=	yes
 USE_LIBTOOL=	yes
-MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
-MAKE_ENV+=	XMMS_CONFIG=${BUILDLINK_CONFIG_WRAPPER.xmms}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile
index cf8fe1ad998..8e08b32ca29 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/16 03:34:22 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/17 21:16:49 jlam Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -12,7 +12,6 @@ COMMENT=	XMMS plugin for dual spectral analyzer
 
 USE_X11=	yes
 USE_LIBTOOL=	yes
-MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index 7e4fdffff61..2e9188a7acc 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/30 11:58:46 zuntum Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/17 21:16:50 jlam Exp $
 
 DISTNAME=	chemtool-1.3
 CATEGORIES=	biology
@@ -10,7 +10,6 @@ COMMENT=	Program for drawing organic molecules
 
 USE_BUILDLINK_ONLY=	YES
 MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=	GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 3690675279c..831bb21906a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/08/10 04:50:08 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/08/17 21:16:50 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -37,8 +37,6 @@ XLDFLAGS=	${LDFLAGS} -liconv
 
 MAKE_ENV+=	OS_CFLAGS="${OS_CFLAGS}"
 MAKE_ENV+=	XLDFLAGS="${XLDFLAGS}"
-MAKE_ENV+=	GLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.glib}"
-MAKE_ENV+=	GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
 
 MAKE_FLAGS+=	ABI_BUILD_VERSION="${ABIWORD_VERS}"
 MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 847c80e6190..750fd56be69 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/26 12:37:16 zuntum Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/17 21:16:50 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME:S,manedit-,manedit,}
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 
 USE_BUILDLINK_ONLY=	YES
 
-MAKE_ENV+=	CPP="${CXX}" GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
+MAKE_ENV+=	CPP="${CXX}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 999e28a73e8..952a4987ed7 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/26 13:46:39 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/17 21:16:51 jlam Exp $
 #
 
 DISTNAME=	ketm-0.0.4
@@ -15,8 +15,6 @@ ALL_TARGET=	ketm
 USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
 
-MAKE_ENV+=		SDL_CONFIG=${BUILDLINK_CONFIG_WRAPPER.SDL}
-
 post-patch:
 	cd ${WRKSRC} &&							\
 	for f in *.c; do						\
diff --git a/graphics/apla/Makefile b/graphics/apla/Makefile
index e430e118b08..1b2ee61c11e 100644
--- a/graphics/apla/Makefile
+++ b/graphics/apla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/26 15:13:04 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/17 21:16:52 jlam Exp $
 #
 
 DISTNAME=	apla-1.0.3
@@ -10,10 +10,6 @@ COMMENT=	replacement for aviplay player
 
 USE_BUILDLINK_ONLY=	YES
 
-MAKE_ENV+=	SDL_CONFIG="${BUILDLINK_CONFIG_WRAPPER.SDL}"
-MAKE_ENV+=	AVIFILE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.avifile-devel}"
-MAKE_ENV+=	FREETYPE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.freetype2}"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/apla ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/apla.1 ${PREFIX}/man/man1