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, 11 insertions, 19 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index d35f2ce4f97..092094fa97b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/05/22 09:32:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:41 jlam Exp $
 #
 
 DISTNAME=		R-1.1.1
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+=	--without-blas_risc
 CONFIGURE_ARGS+=	--without-dxml
 CONFIGURE_ARGS+=	--without-libmoto
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 CONFIGURE_ENV+=		MAKE="${MAKE_PROGRAM}"
 
diff --git a/math/aribas/Makefile b/math/aribas/Makefile
index b0d5fb15644..47e6ef6358f 100644
--- a/math/aribas/Makefile
+++ b/math/aribas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:20 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:42 jlam Exp $
 
 DISTNAME=	aribas-1.20
 CATEGORIES=	math
@@ -10,7 +10,7 @@ COMMENT=	Multi-precision floating point and big integer arithmetic calculator
 
 WRKSRC=		${WRKDIR}/aribas/src
 
-MAKE_ENV+=	CPPFLAGS="-DUNiX -DPROTO"
+CPPFLAGS+=	-DUNiX -DPROTO
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aribas ${PREFIX}/bin
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 630925b3fab..0b779e9b08b 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:42 jlam Exp $
 #
 
 DISTNAME=	calc-2.11.4t2
@@ -12,7 +12,4 @@ HOMEPAGE=	http://www.isthe.com/chongo/tech/comp/calc/
 COMMENT=	C arbitrary precision calculator
 
 .include "../../devel/readline/buildlink.mk"
-
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 1ab6787b1a5..0965c7c0b93 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:22:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:42 jlam Exp $
 #
 
 DISTNAME=	geg-1.0.1
@@ -13,6 +13,4 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3ae25918236..bf41454fb58 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/03/27 03:20:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:43 jlam Exp $
 #
 
 DISTNAME=		gnumeric-0.64
@@ -24,7 +24,7 @@ USE_PERL5=		YES
 LDFLAGS+=      		-L${LOCALBASE}/lib
 LDFLAGS+=      		-Wl,-R${LOCALBASE}/lib
 LDFLAGS+=      		-lunicode
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS=		--without-bonobo
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index b09ef9f0124..b9dd94ace7e 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/19 03:56:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:43 jlam Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.16
@@ -24,7 +24,7 @@ USE_FORTRAN=		yes
 USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 CONFIGURE_ENV+=		FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
-CONFIGURE_ENV+=		CPPFLAGS=-I${WRKDIR}/include
+CPPFLAGS+=		-I${WRKDIR}/include
 LDFLAGS+=		-Wl,-R${PREFIX}/lib -L${PREFIX}/lib
 
 INFO_FILES=	liboctave.info octave.info
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index aac5eaa5aca..c5004325109 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:43 jlam Exp $
 #
 
 DISTNAME=	pspp-0.3.0
@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
 USE_GTEXINFO=	yes
 USE_LIBINTL=	yes
 CPPFLAGS+=	-Dunix=1
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 MAKE_ENV+=	pkgsysconfdir="${PREFIX}/etc/pspp"
 
 pre-configure:
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index c33ed69ed1e..73e30095282 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/28 23:59:22 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:43 jlam Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.11.7
@@ -14,7 +14,6 @@ WRKSRC=			${WRKDIR}/${PKGNAME}/src
 DIST_SUBDIR=		${PKGNAME}
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Df2cFortran -Dunix
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_PERL5=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/UDUNITS/.packlist