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, 8 insertions, 12 deletions

diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 0541c8b74a9..c66f0a5b05e 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:17:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:23 jlam Exp $
 #
 
 DISTNAME=	gq-0.3.0
@@ -15,6 +15,6 @@ DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index 57ea565f810..6a04302ca69 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/14 15:04:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:24 jlam Exp $
 #
 
 DISTNAME=	gtranscript-0.0.1
@@ -23,7 +23,6 @@ DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include		# pgsql/*.h
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 96223c22380..6dc7ab51a58 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2001/05/02 08:22:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/06/11 06:34:24 jlam Exp $
 
 DISTNAME=		mysql-3.23.35
 CATEGORIES=		databases
@@ -16,7 +16,6 @@ EXTRACT_USING_PAX=	# defined
 MYSQL_DATADIR?=		/var/mysql
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--with-libwrap
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index d5c2d1d8c76..8d6f5fab6ec 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/05/14 16:15:52 kleink Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/11 06:34:24 jlam Exp $
 #
 
 DISTNAME=	openldap-1.2.12
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --enable-wrappers
 
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	db-2.7.7:../../databases/db
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include/db2"
+CPPFLAGS+=	-I${LOCALBASE}/include/db2
 CONFIGURE_ENV+=	LIBS="-ldb2 -lpthread -lrt"
 .endif
 
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index feb35a49a81..4ff1c136145 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2001/06/11 02:05:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2001/06/11 06:34:24 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -75,7 +75,6 @@ CONFIGURE_ARGS+=	--enable-syslog
 CONFIGURE_ARGS+=	--with-CXX
 CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 MAKE_ENV+=		CUSTOM_COPT="${CFLAGS}"
 
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 9ff9ae98d9e..c0d251131a2 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/06 01:09:34 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:24 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.0.28
@@ -24,7 +24,6 @@ GNU_CONFIGURE=	# defined
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS= --enable-shared
 
 MAKE_ENV+=	X11BASE=${X11BASE} X11PREFIX=${X11PREFIX}