From 01b416b8957e91c09a5635c805d763d5b74e4b31 Mon Sep 17 00:00:00 2001 From: jlam 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. --- audio/csound-bath/Makefile | 4 +--- audio/gdcd/Makefile | 3 +-- audio/gnome-media/Makefile | 4 ++-- audio/gqmpeg/Makefile | 4 ++-- audio/mikmod/Makefile | 4 +--- audio/mpg123/Makefile | 4 ++-- audio/rosegarden/Makefile | 4 ++-- audio/rplay/Makefile | 3 +-- audio/xmms-crossfade/Makefile | 3 +-- audio/xmms/Makefile | 3 +-- 10 files changed, 14 insertions(+), 22 deletions(-) (limited to 'audio') diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile index bac45aaf7b3..8e169dd6919 100644 --- a/audio/csound-bath/Makefile +++ b/audio/csound-bath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:17 jlam Exp $ # DISTNAME= Csound4.12 @@ -16,8 +16,6 @@ NO_SRC_ON_CDROM= "no for-fee-redistribution" NO_BIN_ON_CDROM= ${NO_SRC_ON_CDROM} DIST_SUBDIR= csound -MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" CONFLICTS= csound-4* #pre-build: diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index 10014edc095..c13370292c6 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/05/14 17:09:14 rh Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:17 jlam Exp $ # DISTNAME= gdcd-0.2.1 @@ -15,7 +15,6 @@ DEPENDS+= libcdaudio>0.99.4:../../audio/libcdaudio USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" # for pth and libcdaudio CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index bb8f65d48c2..569fb95a52d 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:41 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:18 jlam Exp $ DISTNAME= gnome-media-1.2.0 CATEGORIES= audio gnome @@ -15,6 +15,6 @@ USE_LIBTOOL= YES USE_X11BASE= YES CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.pkg.mk" diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index b0938e508d5..ab91c953946 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/03/27 03:19:46 hubertf Exp $ +# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:18 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp DISTNAME= gqmpeg-0.8.3 @@ -22,7 +22,7 @@ USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --enable-japanese -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" PKGLOCALEDIR="${PKGLOCALEDIR}" +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index deae0eea25a..be33ec67e90 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/02/16 13:30:47 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/11 06:34:18 jlam Exp $ # DISTNAME= mikmod-3.1.6-a @@ -19,6 +19,4 @@ REPLACE_NCURSES= ${WRKSRC}/configure CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" - .include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 6ec2935ea10..c8399a9e28d 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/02/16 13:30:47 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:18 jlam Exp $ # DISTNAME= mpg123-0.59r @@ -39,7 +39,7 @@ ALL_TARGET= solaris-gcc .endif .if defined(USE_INET6) && ${USE_INET6} == "YES" -MAKE_ENV+= CPPFLAGS="-DINET6" +CPPFLAGS+= -DINET6 .endif MAKE_FLAGS+= PREFIX="${PREFIX}" diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index 9d67c3174b4..e12a3ab0fae 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/05/31 16:46:24 agc Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:19 jlam Exp $ DISTNAME= rosegarden-2.1pl2 PKGNAME= rosegarden-2.1p2 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.bath.ac.uk/~masjpf/rose.html COMMENT= notation editor & midi sequencer -CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include +CPPFLAGS+= -I${PREFIX}/include GNU_CONFIGURE= YES USE_GMAKE= yes diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index d24a31f46ab..d3654a1f7c2 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/05/22 04:33:12 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:19 jlam Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -19,7 +19,6 @@ DEPENDS+= rx-1.5:../../devel/rx USE_LIBTOOL= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= RPLAY_TARGET=generic # XXX generic, or oss, or sun? -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include # for gsm.h and rxposix.h diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile index bb04860ff1b..cb0609e0573 100644 --- a/audio/xmms-crossfade/Makefile +++ b/audio/xmms-crossfade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:19 jlam Exp $ # DISTNAME= xmms-crossfade-0.2.7 @@ -20,6 +20,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig LDFLAGS+= -lossaudio CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index 7714a2715cd..0468d449e7e 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/05/20 20:52:24 rh Exp $ +# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:19 jlam Exp $ # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp DISTNAME= xmms-1.2.4 @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= XML_CONFIG="${LOCALBASE}/bin/xml-config" CONFIGURE_ARGS+=--without-gnome LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig -- cgit v1.2.3