diff options
| author | agc <agc@pkgsrc.org> | 2001-06-17 22:02:20 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-06-17 22:02:20 +0000 |
| commit | c6951a7f406087c78c95f65a7d8342e5ca74c7f1 (patch) | |
| tree | 086720371e073bb9710d8f50ceda589392100e5c /devel/bmake | |
| parent | fcbfeadbcb9a944a6013c49eb94ff82febaa480e (diff) | |
| download | pkgsrc-c6951a7f406087c78c95f65a7d8342e5ca74c7f1.tar.gz | |
Update package to version 3.1.10, sync-ing with NetBSD-current in one fell
swoop.
Changes since previous version:
Tue Jun 12 16:48:57 2001 Simon J. Gerraty <sjg@zen.quick.com.au>
* var.c (Var_Set): Add 4th (flags) arg so VarLoopExpand can tell
us not to export the iterator variable when using VAR_CMD context.
Sun Jun 10 21:55:21 2001 Simon J. Gerraty <sjg@zen.quick.com.au>
* job.c (Job_CatchChildren): don't call Job_CatchOutput() here,
its the wrong "fix".
Sat Jun 9 00:11:24 2001 Simon J. Gerraty <sjg@zen.quick.com.au>
* Redesigned export of VAR_CMD's via MAKEFLAGS.
We now simply append the variable names to .MAKEOVERRIDES, and
handle duplicate suppression and quoting in ExportMAKEFLAGS using:
${.MAKEOVERRIDES:O:u:@v@$v=${$v:Q}@}
Apart from fixing quoting bugs in previous version, this allows us
to export vars to the environment by simply doing:
.MAKEOVERRIDES+= PATH
Merged again with NetBSD make, but the above is the only change.
* configure.in: added
--disable-pwd-override disable $PWD overriding getcwd()
--disable-check-make-chdir disable make trying to guess
when it should automatically cd ${.CURDIR}
* Merge with NetBSD make, changes include:
parse.c (ParseDoDependency): Spot that the syntax error is
caused by an unresolved cvs/rcs conflict and say so.
var.c: most of Var* functions now take a ctxt as 1st arg.
now does variable substituion on rhs of sysv style modifiers.
* var.c (Var_Set): exporting of command line variables (VAR_CMD)
is now done here. We append the name='value' to .MAKEOVERRIDES
rather than directly into MAKEFLAGS as this allows a Makefile to
use .MAKEOVERRIDES= to disable this behaviour. GNU make uses a
very similar mechanism. Note that in adding name='value' to
.MAKEOVERRIDES we do the moral equivalent of:
.MAKEOVERRIDES:= ${.MAKEOVERRIDES:Nname=*} name='val'
Diffstat (limited to 'devel/bmake')
| -rw-r--r-- | devel/bmake/Makefile | 4 | ||||
| -rw-r--r-- | devel/bmake/distinfo | 8 | ||||
| -rw-r--r-- | devel/bmake/patches/patch-aa | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index 5f36027a78b..b85433ab9b9 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/05/25 12:41:14 agc Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/17 22:02:20 agc Exp $ # -DISTNAME= bmake-3.1.6 +DISTNAME= bmake-3.1.10 CATEGORIES= devel MASTER_SITES= ftp://ftp.netbsd.org/pub/incoming/sjg/ diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo index fe4ea7c0a8a..2d3f00cdbb5 100644 --- a/devel/bmake/distinfo +++ b/devel/bmake/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/25 12:41:14 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/06/17 22:02:21 agc Exp $ -SHA1 (bmake-3.1.6.tar.gz) = b52b7738c93d95c4f6704218aebac0c0b51b7426 -Size (bmake-3.1.6.tar.gz) = 292095 bytes -SHA1 (patch-aa) = 7e439ec6836c5cd36daa46411ef1764cdbee3890 +SHA1 (bmake-3.1.10.tar.gz) = 53bab64bf90ab522d3f9a5f843ea870e75bad21d +Size (bmake-3.1.10.tar.gz) = 298238 bytes +SHA1 (patch-aa) = d1a2e3c5638dcf657fb91019764987e3160a2a23 diff --git a/devel/bmake/patches/patch-aa b/devel/bmake/patches/patch-aa index 7b8bf96d9c6..638b13291bc 100644 --- a/devel/bmake/patches/patch-aa +++ b/devel/bmake/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/25 12:41:14 agc Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/17 22:02:21 agc Exp $ Correct a spelling mistake ---- Makefile.in 2001/05/25 12:05:40 1.1 -+++ Makefile.in 2001/05/25 12:05:52 -@@ -71,7 +71,7 @@ +--- Makefile.in.orig Wed Jun 13 00:51:12 2001 ++++ Makefile.in Sun Jun 17 22:56:14 2001 +@@ -65,7 +65,7 @@ ${MAN}: make.1 - @echo making ${MAN} + @echo making ${PROG}.1 @sed -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh HISTORY/,$$d' ${srcdir}/make.1 > $@ -- @(echo ".Sh HISTORY"; echo ".Nm"; echo "is derrived from NetBSD's"; echo ".Xr make 1 .") >> $@ -+ @(echo ".Sh HISTORY"; echo ".Nm"; echo "is derived from NetBSD's"; echo ".Xr make 1 .") >> $@ +- @(echo ".Sh HISTORY"; echo ".Nm"; echo "is derrived from NetBSD's"; echo ".Xr make 1 ."; echo It uses autoconf to facilitate portability to other platforms.) >> $@ ++ @(echo ".Sh HISTORY"; echo ".Nm"; echo "is derived from NetBSD's"; echo ".Xr make 1 ."; echo It uses autoconf to facilitate portability to other platforms.) >> $@ .endif |