From c4e71c5e7a56600bcceba68cbed656ef7246e444 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 11 Jun 2001 06:34:17 +0000
Subject: 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.

---
 textproc/catdoc/Makefile  | 3 +--
 textproc/icu/Makefile     | 4 +---
 textproc/libxml/Makefile  | 3 +--
 textproc/urlview/Makefile | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'textproc')

diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 60a2e1b1389..1d5ed9cf5a6 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/08 16:12:07 agc Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/11 06:34:52 jlam Exp $
 #
 
 DISTNAME=	catdoc-0.91.4
@@ -17,6 +17,5 @@ USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
 CPPFLAGS+=	-Dunix -D__unix
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index c16407cbf00..81e4ad663dd 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/22 08:18:40 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:52 jlam Exp $
 #
 
 DISTNAME=	icu-1.7
@@ -21,8 +21,6 @@ CONFIGURE_ARGS+= --disable-threads
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-
 pre-configure:
 	${CHMOD} u+rx ${WRKSRC}/configure
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index da85dc4c7d6..bf4095f5503 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:52 jlam Exp $
 #
 
 DISTNAME=		libxml-1.8.13
@@ -11,7 +11,6 @@ HOMEPAGE=		http://xmlsoft.org/
 COMMENT=		XML parser, mainly used by the GNOME project
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 1ee236b4f51..1abe905f95c 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:52 jlam Exp $
 
 DISTNAME=	urlview-0.9
 CATEGORIES=	textproc
@@ -16,7 +16,6 @@ DEPENDS+=	ncurses>=5.0:../../devel/ncurses
 #REPLACE_NCURSES=	${WRKSRC}/configure ${WRKSRC}/enter.h ${WRKSRC}/urlview.c
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3