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.

6 files changed, 7 insertions, 12 deletions

diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index de605d3ff20..f3d0c566351 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/15 21:21:45 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:39 jlam Exp $
 
 DISTNAME=	a60-0.20a
 CATEGORIES=	lang
@@ -10,7 +10,6 @@ COMMENT=	Algol 60 interpreter
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+= 	-Dunix
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 INFO_FILES=	RRA60.info a60.info
 
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index eabb83b2260..22132e06595 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/07 21:33:24 rh Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:39 jlam Exp $
 #
 
 DISTNAME=	gb-0.0.18
@@ -17,6 +17,6 @@ USE_LIBTOOL=	YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index c8fe282f41b..c263fedd4c1 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/22 09:32:24 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:39 jlam Exp $
 #
 
 DISTNAME=		kaffe-1.0.6
@@ -23,7 +23,6 @@ ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		--prefix=${PREFIX}/kaffe
 CONFIGURE_ARGS+=	--with-rtlibraries="${LOCALBASE}/lib ${X11BASE}/lib"
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 CPPFLAGS+=		-Dunix -I${LOCALBASE}/include -I${X11BASE}/include
 
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index e17829fc2ca..be81bcf7ae1 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/11 02:05:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/06/11 06:34:39 jlam Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -20,7 +20,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-gmp
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 PLIST_SUBST+=		REP_VERS=${REP_VERS}
 
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 037aab9d58b..b8315b6e005 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/16 02:27:52 fredb Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:40 jlam Exp $
 #
 
 DISTNAME=	Squeak-3.0pre2
@@ -22,7 +22,6 @@ USE_LIBTOOL=	yes
 USE_X11=	yes
 
 CPPFLAGS+=	-DNETBSD_OSS_HACK
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 DIST_SUBDIR=	squeak
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/Squeak-3.0/build
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index a9221b29856..7f2d52909c0 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/22 01:21:16 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:40 jlam Exp $
 
 DISTNAME=		pl-lite-4.0.5
 PKGNAME=		swi-prolog-4.0.5
@@ -26,7 +26,6 @@ CPPFLAGS+=		-D__unix__=1
 READLINE_PREFIX_DEFAULT=${LOCALBASE}
 EVAL_PREFIX+=		READLINE_PREFIX=readline
 CPPFLAGS+=		-I${READLINE_PREFIX}/include
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 PLIST_SUBST+=		SWIPL=${SWIPL}
 PLIST_SUBST+=		SWILIBDIR=${DISTNAME:S,pl-lite,'${SWIPL}',}