diff options
author | jlam <jlam> | 2006-07-21 14:27:56 +0000 |
---|---|---|
committer | jlam <jlam> | 2006-07-21 14:27:56 +0000 |
commit | c304f3ed550dc23579dcb615d7d969fb4f5ce67f (patch) | |
tree | 7caa897b86d23c2822e6d9c8f6d7d3dfeb078d5e | |
parent | cf44c92a8fd3163b85eec8edcce80a86357533fd (diff) | |
download | pkgsrc-c304f3ed550dc23579dcb615d7d969fb4f5ce67f.tar.gz |
"BUILD_ENV" was misnamed. It's actually the environment that is passed
to all internal recursive make processes. As such, rename it to
"PKGSRC_MAKE_ENV".
XXX Note, some of the usage of this variable in package Makefiles seems
XXX incorrect. They probably want "MAKE_ENV", which is the environment
XXX passed to the make process when running "make" within ${WRKSRC}.
-rw-r--r-- | devel/elib/Makefile.common | 6 | ||||
-rw-r--r-- | devel/monotone-viz/Makefile | 4 | ||||
-rw-r--r-- | devel/semantic/Makefile | 4 | ||||
-rw-r--r-- | editors/jde/Makefile | 6 | ||||
-rw-r--r-- | editors/speedbar/Makefile | 4 | ||||
-rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
-rw-r--r-- | graphics/TiffIO/Makefile | 4 | ||||
-rw-r--r-- | lang/libtcl-nothread/buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/bsd.pkg.barrier.mk | 4 | ||||
-rw-r--r-- | mk/build/bsd.build-vars.mk | 4 | ||||
-rw-r--r-- | mk/compiler/ccache.mk | 6 | ||||
-rw-r--r-- | mk/compiler/distcc.mk | 8 | ||||
-rw-r--r-- | mk/compiler/f2c.mk | 4 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-ffmpeg/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 4 | ||||
-rw-r--r-- | net/netbsd-tap/options.mk | 4 | ||||
-rw-r--r-- | x11/xephem/Makefile | 8 | ||||
-rw-r--r-- | x11/xhangglider/Makefile | 6 |
18 files changed, 44 insertions, 44 deletions
diff --git a/devel/elib/Makefile.common b/devel/elib/Makefile.common index 76d96bb5805..c2cce4886a6 100644 --- a/devel/elib/Makefile.common +++ b/devel/elib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2006/05/26 19:33:36 joerg Exp $ +# $NetBSD: Makefile.common,v 1.2 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= elib-1.0 @@ -10,8 +10,8 @@ COMMENT= Library of utility functions for Emacs .include "../../mk/emacs.mk" -BUILD_ENV+= EMACS=${EMACS_FLAVOR:Q} -MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q} +PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q} +MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q} NO_CONFIGURE= yes USE_TOOLS+= gmake makeinfo diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile index 3fdec860f1e..917bdd67129 100644 --- a/devel/monotone-viz/Makefile +++ b/devel/monotone-viz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:21 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= monotone-viz-0.14 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-local-lablgtk --with-shared-sqlite USE_TOOLS+= gmake pkg-config BUILD_TARGET= monotone-viz -BUILD_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} +PKGSRC_MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} INSTALLATION_DIRS= bin do-install: diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index 7a98e935ac8..745eddceea2 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/06/17 19:27:04 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= semantic-1.4.4 @@ -15,7 +15,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio .include "../../mk/emacs.mk" -BUILD_ENV+= EMACS=${EMACS_FLAVOR} +PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR} NO_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/editors/jde/Makefile b/editors/jde/Makefile index a116072c753..d555e2a242b 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/10 23:58:47 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= jde-2.3.2 @@ -27,8 +27,8 @@ EMACS_VERSIONS_ACCEPTED=emacs21 # XXX Won't compile with emacs20... PKG_DEFAULT_JVM= sun-jdk14 -BUILD_ENV+= EMACS=${EMACS} -MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} +PKGSRC_MAKE_ENV+= EMACS=${EMACS} +MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} NO_CONFIGURE= yes diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 702db399faa..25f45b68433 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/20 04:59:08 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= speedbar-0.14beta4 @@ -13,7 +13,7 @@ COMMENT= Directory and code browser for emacs .include "../../mk/emacs.mk" -BUILD_ENV+= EMACS=${EMACS} +PKGSRC_MAKE_ENV+= EMACS=${EMACS} NO_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 5b1e640c355..a110687bacc 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/07/06 12:27:43 markd Exp $ +# $NetBSD: Makefile,v 1.49 2006/07/21 14:27:56 jlam Exp $ PKGNAME= MesaLib-${MESA_VERSION} PKGREVISION= 2 @@ -23,7 +23,7 @@ PTHREAD_STUBLIB= "-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpthstub" .else PTHREAD_STUBLIB= # provided by libc .endif -BUILD_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB} +PKGSRC_MAKE_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB} pre-build: cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile index 7dc28ce1ded..8bd87912a28 100644 --- a/graphics/TiffIO/Makefile +++ b/graphics/TiffIO/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= TiffIO-120e @@ -15,7 +15,7 @@ COMMENT= Tiff support for QT image loader USE_TOOLS+= gmake USE_LANGUAGES= c c++ -BUILD_ENV+= QTDIR=${QTDIR:Q} +PKGSRC_MAKE_ENV+= QTDIR=${QTDIR:Q} .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1 diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk index 1557c1c5baf..ed866198c0a 100644 --- a/lang/libtcl-nothread/buildlink3.mk +++ b/lang/libtcl-nothread/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCLNT_BUILDLINK3_MK:= ${TCLNT_BUILDLINK3_MK}+ @@ -25,7 +25,7 @@ BUILDLINK_TRANSFORM+= l:tcl:tcl84-nothread BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84-nothread TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh -BUILD_ENV+= _TCL_NOTHREAD=yes +PKGSRC_MAKE_ENV+= _TCL_NOTHREAD=yes .endif # TCLNT_BUILDLINK3_MK diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index adde2cf3844..71df9548278 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.8 2006/07/21 14:27:56 jlam Exp $ _COOKIE.barrier= ${WRKDIR}/.barrier_cookie @@ -56,7 +56,7 @@ barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier} . if defined(PKG_VERBOSE) @${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} . if defined(PKG_VERBOSE) @${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif diff --git a/mk/build/bsd.build-vars.mk b/mk/build/bsd.build-vars.mk index 5b70338890b..af23a9f8be5 100644 --- a/mk/build/bsd.build-vars.mk +++ b/mk/build/bsd.build-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build-vars.mk,v 1.1 2006/07/05 06:09:15 jlam Exp $ +# $NetBSD: bsd.build-vars.mk,v 1.2 2006/07/21 14:27:56 jlam Exp $ # # BUILD_DIRS is the list of directories in which to perform the build # process. If the directories are relative paths, then they @@ -44,4 +44,4 @@ MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}} # Add these bits to the environment used when invoking the recursive make # processes for build-related phases. # -BUILD_ENV+= PATH=${PATH:Q} +PKGSRC_MAKE_ENV+= PATH=${PATH:Q} diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index 2bd70bd6f22..1487f60fee3 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.26 2005/01/24 18:20:57 tv Exp $ +# $NetBSD: ccache.mk,v 1.27 2006/07/21 14:27:56 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -98,10 +98,10 @@ BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache # Override the compiler-specific hash with the version string for the # compiler. # -BUILD_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q} +PKGSRC_MAKE_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q} . if defined(CCACHE_DIR) && !empty(CCACHE_DIR) -BUILD_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} +PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} . endif # Create symlinks for the compiler into ${WRKDIR}. diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index 1bdd6b7436a..3ef33edfb14 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: distcc.mk,v 1.27 2005/01/24 18:20:57 tv Exp $ +# $NetBSD: distcc.mk,v 1.28 2006/07/21 14:27:56 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -96,13 +96,13 @@ PREPEND_PATH+= ${_DISTCC_DIR}/bin BUILD_DEPENDS+= distcc-[0-9]*:../../devel/distcc . if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS) -BUILD_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q} +PKGSRC_MAKE_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q} . endif . if defined(DISTCC_SSH) && !empty(DISTCC_SSH) -BUILD_ENV+= DISTCC_SSH=${DISTCC_SSH:Q} +PKGSRC_MAKE_ENV+= DISTCC_SSH=${DISTCC_SSH:Q} . endif . if defined(DISTCC_VERBOSE) && !empty(DISTCC_VERBOSE) -BUILD_ENV+= DISTCC_VERBOSE=${DISTCC_VERBOSE:Q} +PKGSRC_MAKE_ENV+= DISTCC_VERBOSE=${DISTCC_VERBOSE:Q} . endif # Create symlinks for the compiler into ${WRKDIR}. diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index 18e22f59ddc..05fef1ccc4b 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.5 2005/03/24 17:46:01 tv Exp $ +# $NetBSD: f2c.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ PREPEND_PATH+= ${_F2C_DIR}/bin . include "../../lang/f2c/buildlink3.mk" . if defined(F2C_DIR) && !empty(F2C_DIR) -BUILD_ENV+= F2C_DIR=${F2C_DIR:Q} +PKGSRC_MAKE_ENV+= F2C_DIR=${F2C_DIR:Q} . endif # Create symlinks for the compiler into ${WRKDIR}. diff --git a/multimedia/gst-plugins0.10-ffmpeg/Makefile b/multimedia/gst-plugins0.10-ffmpeg/Makefile index 4e22c8a21d3..692991ff3f8 100644 --- a/multimedia/gst-plugins0.10-ffmpeg/Makefile +++ b/multimedia/gst-plugins0.10-ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/07/13 14:19:04 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= gst-ffmpeg-0.10.1 @@ -14,7 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes OVERRIDE_DIRDEPTH= 3 USE_TOOLS+= pkg-config gmake perl -BUILD_ENV+= PERL=${PERL5} +PKGSRC_MAKE_ENV+= PERL=${PERL5} .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index a972fd2530f..7ef18cc1032 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2006/04/13 18:23:36 jlam Exp $ +# $NetBSD: Makefile.common,v 1.34 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= xine-lib-${XINE_LIB_VER}a @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest CONFIGURE_ENV+= have_libpng="yes" CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" -BUILD_ENV+= "mkdir_p"="mkdir -p" +PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" .include "../../mk/bsd.prefs.mk" diff --git a/net/netbsd-tap/options.mk b/net/netbsd-tap/options.mk index 021c7896cce..7e22fe759ae 100644 --- a/net/netbsd-tap/options.mk +++ b/net/netbsd-tap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: options.mk,v 1.4 2006/07/21 14:27:56 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.netbsd-tap PKG_SUPPORTED_OPTIONS= bpf @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= bpf .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mbpf) -BUILD_ENV+= USE_BPF=YES +PKGSRC_MAKE_ENV+= USE_BPF=YES .endif TAP_KERNEL_ENV?= # empty diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile index cfaf1be9610..533c1c4f752 100644 --- a/x11/xephem/Makefile +++ b/x11/xephem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2006/07/02 10:45:30 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2006/07/21 14:27:56 jlam Exp $ DISTNAME= xephem-3.7.1 PKGREVISION= 1 @@ -32,9 +32,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem USE_TOOLS+= gmake perl:run REPLACE_PERL+= auxil/*.pl -LIBS.SunOS+= -lnsl -lsocket -X11_LDFLAGS+= ${LIBS} -BUILD_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} +LIBS.SunOS+= -lnsl -lsocket +X11_LDFLAGS+= ${LIBS} +PKGSRC_MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} REPLACE_INTERPRETER+= perl REPLACE.perl.old= .*/bin/perl diff --git a/x11/xhangglider/Makefile b/x11/xhangglider/Makefile index 5729666ff97..d6cba51fcee 100644 --- a/x11/xhangglider/Makefile +++ b/x11/xhangglider/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:13 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/07/21 14:27:56 jlam Exp $ # DISTNAME= xhangglider-0.94.0 @@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.netfort.gr.jp/~take/linux/xhang-en.html COMMENT= Hanggliders fly in the background of the X screen -USE_IMAKE= yes -BUILD_ENV+= PREFIX=${PREFIX} +USE_IMAKE= yes +PKGSRC_MAKE_ENV+= PREFIX=${PREFIX} post-extract: ${RM} ${WRKSRC}/Makefile |