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.

8 files changed, 9 insertions, 16 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 28382297626..a7d76ab56f3 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:32 jlam Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -21,6 +21,5 @@ CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=	GTK_CONFIG="${GTKDIR}/bin/gtk-config"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 37ee00937e1..ff59033a17d 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:33 jlam Exp $
 
 DISTNAME=		clanbomber-1.01
 PKGNAME=		${DISTNAME}nb1
@@ -17,7 +17,6 @@ USE_GMAKE=		yes
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${X11BASE}/include
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}"
 
 # needs a valid X display to compile its datafiles
 .ifndef DISPLAY
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 8a628b6042b..6c7501c2d64 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2001/05/02 16:34:58 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/06/11 06:34:33 jlam Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
 FC_VERS=		1.11.4
@@ -16,7 +16,6 @@ DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_LIBINTL=		# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 65d5912b116..bfa0f0665a1 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 15:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:33 jlam Exp $
 
 DISTNAME=		Pacman-0.3-CVS-00-11-17
 PKGNAME=		Pacman-0.3
@@ -18,7 +18,6 @@ USE_GMAKE=		yes
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${X11BASE}/include
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}"
 
 # needs a valid X display to compile its datafiles
 .ifndef DISPLAY
diff --git a/games/plib/Makefile b/games/plib/Makefile
index 541a3ded161..055678bfe65 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:33 jlam Exp $
 #
 
 DISTNAME=	plib-1.2.0
@@ -12,7 +12,6 @@ COMMENT=	libraries for writing portable games/realtime interactive apps
 USE_X11=	YES
 USE_MESA=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-Dunix=1 -I${X11PREFIX}/include -I${X11BASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 4db480d4d9a..51f4aee7f16 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/09 20:27:10 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:34 jlam Exp $
 
 DISTNAME=		xboard-4.2.3
 CATEGORIES=		games
@@ -19,7 +19,6 @@ INFO_FILES=		xboard.info
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-xpm
 CONFIGURE_ARGS+=	--enable-zippy		# interface to ICS
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${X11PREFIX}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index b71dfddaf0d..658a2f52e5e 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/26 14:45:09 bad Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/11 06:34:34 jlam Exp $
 #
 
 DISTNAME=		xgalaga-2.0.34
@@ -15,7 +15,7 @@ HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${X11PREFIX}/share/xgalaga
 CONFIGURE_ARGS+=	--exec-prefix=${X11PREFIX}/bin
 CFLAGS+=		-I${X11PREFIX}/include
-CONFIGURE_ENV+=		CPPFLAGS="${CFLAGS}"
+CPPFLAGS+=		${CFLAGS}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${X11PREFIX}/share/xgalaga/README
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 3fc24692a8b..68a4da786e8 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:34 jlam Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -25,7 +25,6 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 CPPFLAGS+=		-I${X11BASE}/include