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.

20 files changed, 34 insertions, 42 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 2b540fa853a..e68e0e68df0 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/04/19 13:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:25 jlam Exp $
 #
 
 DISTNAME=	GConf-1.0.0
@@ -19,7 +19,7 @@ USE_LIBINTL=	YES
 USE_LIBTOOL=	YES
 
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include"
+CPPFLAGS+=	-I${X11PREFIX}/include
 PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
 
 post-install:
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 879487e7b07..0735aea8635 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/06 12:48:56 rh Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:25 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.0
@@ -38,9 +38,9 @@ CONFIGURE_ARGS+=	--disable-nas
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--disable-pthread-sem
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1"
 CONFIGURE_ENV+=		NASMFLAGS="${NASMFLAGS}"
 MAKE_ENV+=		NASMFLAGS="${NASMFLAGS}"
+CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 LDFLAGS+=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 #CC=			${LOCALBASE}/pthreads/bin/pgcc
 
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 0aa62da77eb..6948638d408 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:25 jlam Exp $
 
 DISTNAME=		bison-1.28
 CATEGORIES=		devel
@@ -13,7 +13,6 @@ BUILD_USES_MSGFMT=	yes
 USE_LIBINTL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 CPPFLAGS+=		-Dunix		# for $TMPDIR parsing
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 415be5dfd83..4a66e7118db 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/22 05:53:21 rh Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:26 jlam Exp $
 #
 
 DISTNAME=		bonobo-1.0.4
@@ -21,9 +21,9 @@ USE_X11BASE=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		X11BASE="${X11BASE}"
+CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 976414f4e73..93eec495281 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/17 08:38:42 abs Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:26 jlam Exp $
 #
 
 DISTNAME=		latestCDK
@@ -17,7 +17,6 @@ BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses.h
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 ALL_TARGET=		default
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 5ecd717b4f1..562828f982b 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/02/26 20:19:43 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/06/11 06:34:26 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -15,8 +15,8 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LIBINTL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 INFO_FILES=		gettext.info
 
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 47e13c9dcc5..a47d5e29a26 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/04/27 11:46:34 tron Exp $
+# $NetBSD: Makefile,v 1.31 2001/06/11 06:34:27 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 INFO_FILES=		glib.info
 
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index a48372d86b5..fce31aa65c4 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:27 jlam Exp $
 #
 
 DISTNAME=	isect-1.0
@@ -16,7 +16,6 @@ USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 
 CPPFLAGS+=	-I${LOCALBASE}/include	# for w3c-libwww/WWWlib.h
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 DOCDIR=		${PREFIX}/share/doc/isect
 EGDIR=		${PREFIX}/share/examples/isect
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 56d8a2d7558..fabb4d67726 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/04/02 20:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2001/06/11 06:34:28 jlam Exp $
 #
 
 DISTNAME=	libglade-0.16
@@ -20,7 +20,7 @@ USE_LIBTOOL=	YES
 USE_X11BASE=	YES
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index c6ec753b622..96d23cdb733 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2001/04/30 04:16:08 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2001/06/11 06:34:28 jlam Exp $
 
 DISTNAME=		libgtop-1.0.12
 CATEGORIES=		devel gnome
@@ -49,6 +49,5 @@ CONFIGURE_ARGS+=	--with-libgtop-guile --with-catgets
 CONFIGURE_ENV+=		AWK="${AWK}"
 CONFIGURE_ENV+=		LN_S="${LN} -s"
 CONFIGURE_ENV+=		PERL="${PERL5}"
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index ad06ecebae3..bc592751423 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:28 jlam Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.mars.org/home/rob/proj/hfs/
 COMMENT=	library for accessing HFS (Apple Macintosh) volumes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I./
+CPPFLAGS=	-I.
 
 USE_LIBTOOL=	yes
 
diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index a1a6e320332..c4f52f42a3a 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:28 jlam Exp $
 #
 
 DISTNAME=	libsmi-0.1.6
@@ -23,7 +23,6 @@ CONFIGURE_ARGS+=--with-smipath="${MIBDIR}:${PREFIX}/share/snmp/mibs:${PREFIX}/li
 .include "../../mk/bsd.prefs.mk"
 .if ${OS_VERSION:M1.4} || ${OS_VERSION:M1.3} || ${OS_VERSION:M1.2}
 CPPFLAGS+=	-Dstrtoll=strtoq -Dstrtoull=strtouq
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 0d6a03f02dc..5acca49872a 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/02 20:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/06/11 06:34:28 jlam Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -18,6 +18,6 @@ USE_LIBINTL=	yes
 USE_X11=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 407de104249..51379fac7fc 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:29 jlam Exp $
 #
 
 DISTNAME=	netcdf-3.4
@@ -15,6 +15,6 @@ COMMENT=	Library for array-oriented data access
 USE_FORTRAN=	# defined
 USE_LIBTOOL=	# defined
 GNU_CONFIGURE=	# defined
-CONFIGURE_ENV+=	CPPFLAGS="-Df2cFortran -Dunix"
+CPPFLAGS+=	-Df2cFortran -Dunix
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 286bcc5d11e..a45a7f5fad0 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/06 21:55:39 rh Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:29 jlam Exp $
 #
 
 DISTNAME=		oaf-0.6.5
@@ -17,6 +17,6 @@ USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include -I${LOCALBASE}/include"
+CPPFLAGS+=		-I${X11PREFIX}/include -I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index abdd8c72f93..54a7b534ada 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:29 jlam Exp $
 #
 
 DISTNAME=	rpc2-1.10
@@ -23,6 +23,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
 
 CONFIGURE_ENV+=	ac_cv_search_tgetent="-ltermcap"
 CONFIGURE_ENV+=	PERL=${PERL5}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index a9780996ae8..07bd39b09eb 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/12 06:36:42 tron Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:29 jlam Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=--datadir=${LOCALBASE}/share/sdcc
 # by default on some, not on others
 CPPFLAGS+=	-fdollars-in-identifiers
 CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index a399101fbd8..d02e29a074c 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/08 01:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:30 jlam Exp $
 
 DISTNAME=	STLport-4.0
 PKGNAME=	stlport-4.0
@@ -19,7 +19,6 @@ NO_CONFIGURE=	# defined
 
 MAKE_ENV+=	CC="--tag CC ${GCC_BINDIR}/cc"
 MAKE_ENV+=	CXX="--tag CXX ${GCC_BINDIR}/c++"
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
 
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 2c572f72a21..1f3fb9c4ff7 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/05/17 08:38:44 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:30 jlam Exp $
 #
 
 DISTNAME=		tvision-0.7
@@ -14,6 +14,6 @@ GNU_CONFIGURE=		YES
 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/devel/xdelta/Makefile b/devel/xdelta/Makefile
index a698bb541dc..fa7516a5984 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/02/16 14:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:30 jlam Exp $
 #
 
 DISTNAME=		xdelta-0.22
@@ -15,7 +15,7 @@ DEPENDS+=		gdbm>=1.7.3:../../databases/gdbm
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
-LDFLAGS+=		"-L${LOCALBASE}/lib"
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"