diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
| commit | c4e71c5e7a56600bcceba68cbed656ef7246e444 (patch) | |
| tree | 6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /mail | |
| parent | a057ade2a392070aecc8ee511ae1cab01869b513 (diff) | |
| download | pkgsrc-c4e71c5e7a56600bcceba68cbed656ef7246e444.tar.gz | |
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.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/balsa/Makefile | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 3 | ||||
| -rw-r--r-- | mail/mutt-devel/Makefile | 5 | ||||
| -rw-r--r-- | mail/mutt/Makefile | 5 | ||||
| -rw-r--r-- | mail/xbuffy/Makefile | 3 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 3099ee2b551..60b606b155a 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/17 18:24:39 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:40 jlam Exp $ # DISTNAME= balsa-1.0.0 @@ -20,6 +20,6 @@ USE_X11BASE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig CONFIGURE_ARGS+=--disable-more-warnings -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 775dec7c4b0..1968bdba539 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/06/04 20:49:31 jtb Exp $ +# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:40 jlam Exp $ DISTNAME= cyrus-imapd-1.6.24 PKGNAME= ${DISTNAME}nb1 @@ -54,7 +54,6 @@ CONFIGURE_ARGS+= --with-auth=unix CONFIGURE_ARGS+= --without-krb .endif -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= LIBS="${LIBS}" LIBS+= `sasl-config --libs` diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index d36b822769f..34c4d5dffcc 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/04 18:58:33 tron Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:41 jlam Exp $ DISTNAME= mutt-1.3.18i CATEGORIES= mail @@ -14,7 +14,8 @@ BUILD_DEPENDS+= automake-1.4:../../devel/automake DEPENDS+= libiconv>=1.5:../../converters/libiconv USE_LIBINTL= YES -MAKE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl +CPPFLAGS+= -I${LOCALBASE}/include +MAKE_ENV+= LIBS=-lintl CONFIGURE_ENV+= LIBS=-lintl GNU_CONFIGURE= YES USE_GMAKE= YES diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 33dae6daf03..9ae0541cc97 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2001/03/27 03:20:04 hubertf Exp $ +# $NetBSD: Makefile,v 1.70 2001/06/11 06:34:41 jlam Exp $ DISTNAME= mutt-1.2.5i CATEGORIES= mail @@ -16,7 +16,8 @@ BUILD_DEPENDS+= automake-1.4:../../devel/automake BUILD_USES_MSGFMT= yes USE_LIBINTL= YES -MAKE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl +CPPFLAGS+= -I${LOCALBASE}/include +MAKE_ENV+= LIBS=-lintl CONFIGURE_ENV+= LIBS=-lintl GNU_CONFIGURE= YES USE_GMAKE= YES diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile index 336aed01a21..0c9ec54c555 100644 --- a/mail/xbuffy/Makefile +++ b/mail/xbuffy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:09 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:41 jlam Exp $ # DISTNAME= xbuffy-3.4 @@ -10,7 +10,6 @@ COMMENT= replacement for xbiff that handles multiple mail files GNU_CONFIGURE= YES USE_X11BASE= YES -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${X11BASE}/include CPPFLAGS+= -Wall |