CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so

adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.

7 files changed, 12 insertions, 15 deletions

diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index e11a57f3cb0..ab13f349643 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/16 21:00:26 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:20 jlam Exp $
 #
 
 DISTNAME=	fugu-1.0
@@ -13,7 +13,7 @@ DEPENDS+=	rsaref-2.0p3:../../security/rsaref/
 DEPENDS+=	py-Pmw>=0.8.5:../../x11/py-Pmw/
 
 GNU_CONFIGURE= 	YES
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref"
+LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index d11725ab0db..6bd9fc4cf3a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/05 22:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:21 jlam Exp $
 #
 
 DISTNAME=	gaim-0.11.0pre11
@@ -18,6 +18,6 @@ USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 
 # for pthread.h
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index bf457ce6da2..926ed9d44ea 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:51:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:21 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -40,7 +40,7 @@ INSTALL_FILE=	${WRKDIR}/INSTALL
 GNU_CONFIGURE= 	YES
 USE_LIBTOOL=	YES
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include/rsaref -I${LOCALBASE}/include/w3c-libwww"
+CPPFLAGS+=	-I${LOCALBASE}/include/rsaref -I${LOCALBASE}/include/w3c-libwww
 
 GALE_USER=	gale
 GALE_GROUP=	gale
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 7da0f187183..b9bf9f4fd5b 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/26 21:21:18 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
 
 DISTNAME=	gnomeicu-0.96
 CATEGORIES=	chat gnome
@@ -18,7 +18,6 @@ USE_X11BASE=	YES
 USE_GMAKE=	YES
 USE_LIBINTL=	YES
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-liconv
 
diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile
index 95580c56492..3d2526f64f7 100644
--- a/chat/kicq/Makefile
+++ b/chat/kicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:21 jlam Exp $
 
 DISTNAME=		kicq-1.0.0
 CATEGORIES=		chat kde
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--datadir=${KDEBASEDIR}/share/kde \
 			--with-icq-includes=${LOCALBASE}/include \
 			--with-icq-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=		KDEDIR=${KDEBASEDIR} \
-			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
 			all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
 
diff --git a/chat/kxicq/Makefile b/chat/kxicq/Makefile
index 8c601c1f42f..e7ebc533192 100644
--- a/chat/kxicq/Makefile
+++ b/chat/kxicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
 
 DISTNAME=		kxicq-03132000
 CATEGORIES=		chat kde
@@ -21,7 +21,6 @@ EVAL_PREFIX+=		QT1DIR=qt1 KDEBASEDIR=kdebase
 CONFIGURE_ARGS+=	--datadir=${KDEBASEDIR}/share/kde \
 			--with-qt-dir=${QT1DIR}/qt1
 CONFIGURE_ENV+=		KDEDIR=${KDEBASEDIR} \
-			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
 			all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
 
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 70f7d2b69bf..84a5b288144 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/23 19:17:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:22 jlam Exp $
 
 DISTNAME=	xchat-1.6.2
 CATEGORIES=	chat x11 gnome
@@ -16,7 +16,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/stamp-h.in