diff options
author | schmonz <schmonz> | 2004-07-07 19:40:04 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2004-07-07 19:40:04 +0000 |
commit | c2c830e1871c6f4bcbb16e56e7c16c6ada7477fd (patch) | |
tree | 9c651495f8f2d17de9e6fd27c4d702e029fc2fd0 /devel | |
parent | 6b9d7c0542a220d5576bf0c124529c049413df3e (diff) | |
download | pkgsrc-c2c830e1871c6f4bcbb16e56e7c16c6ada7477fd.tar.gz |
Update to 2.5. Selections from the changelog:
* The 'return' statement now actually returns, and there are now
break & continue statements for for & while loops.
* MkDir now grists directories with 'dir', so that directory targets
can be distinguished from other targets.
* SubDir now allows multiple overlapping roots (top level directories):
the first SubDir of a new root uses the CWD of jam to set that
root; subsquent SubDirs use the current SUBDIR to set the new
root. New FSubDirPath to compute a path (given SubDir arguments)
and SubRules to include another root's Jamrules. Jamrules only
included if present; no error issued if no Jamrules file.
* $(RMDIR) has been defined for NT and defaulted to $(RM) everwhere
else. Not much tested. For Michael Champigny.
* GenFile actions (on UNIX) now put . in the PATH for the execution
of the command, so that (at least) when jam builds itself .
does not need to be in the global path. It is the rare case
where a target bound in the current directory can't be used
directly, so we fudge it by setting PATH.
* The whole /MR of Jam's name has been dropped. It was intended
to avoid trademark infringement of JYACC's JAM, but as far as
we can tell (a) it wasn't enough to avoid infringement and (b)
the trademark has lapsed anyhow.
* If header dependencies cause an object to be recompiled and the
source file is a temporary, the temporary is now reconstructed.
Previously, headers weren't considered when deciding when to
reconstruct a temporary.
* -d has been reworked to make it easier to display more useful
tracing information separate from the debugging gunk:
-da - show all actions (formerly -d2)
-dc - show 'causes' for rebuilding (new output)
-dd - show dependencies (new output)
-dm - show make graph (aka -d3)
-dx - show executable text (formerly -d2)
-dd is new, and more display options are anticipated.
-n now implies -dax.
The message "...using xxx..." now only shows up with -da.
* Several bug and portability fixes.
pkgsrc changes:
* Use the .zip distfile instead of the .tar to save space.
* Iterate with ${f} rather than ${file} to placate pkglint.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/jam/DESCR | 2 | ||||
-rw-r--r-- | devel/jam/Makefile | 18 | ||||
-rw-r--r-- | devel/jam/distinfo | 7 | ||||
-rw-r--r-- | devel/jam/patches/patch-aa | 13 |
4 files changed, 13 insertions, 27 deletions
diff --git a/devel/jam/DESCR b/devel/jam/DESCR index 34614c3899a..f480c510674 100644 --- a/devel/jam/DESCR +++ b/devel/jam/DESCR @@ -1,4 +1,4 @@ -Jam/MR is a build utility like make(1). It has its own expressive +Jam is a build utility like make(1). It has its own expressive language which allows for portable Jamfiles capable of building large projects with multiple concurrent processes (although by default it uses a single process). diff --git a/devel/jam/Makefile b/devel/jam/Makefile index 551d6029a69..f24baf15989 100644 --- a/devel/jam/Makefile +++ b/devel/jam/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:31:09 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/07/07 19:40:04 schmonz Exp $ # -DISTNAME= jam-2.4 +DISTNAME= jam-2.5 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/pub/jam/ -EXTRACT_SUFX= .tar +EXTRACT_SUFX= .zip MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://www.perforce.com/jam/jam.html @@ -16,18 +16,18 @@ DOCDIR= share/doc/${PKGBASE} HTMLDIR= share/doc/html/${PKGBASE} do-install: - @for file in jam mkjambase; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/bin.*/$${file} ${PREFIX}/bin; \ + @for f in jam mkjambase; do \ + ${INSTALL_PROGRAM} ${WRKSRC}/bin.*/$${f} ${PREFIX}/bin; \ done ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} - @for file in Porting README RELNOTES; do \ - ${INSTALL_DATA} ${WRKSRC}/$${file} ${PREFIX}/${DOCDIR}; \ + @for f in Porting README RELNOTES; do \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \ done ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR} - @for file in *.html; do \ - ${INSTALL_DATA} ${WRKSRC}/$${file} ${PREFIX}/${HTMLDIR}; \ + @for f in *.html; do \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${HTMLDIR}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/devel/jam/distinfo b/devel/jam/distinfo index a05fdda035b..1d0872338a7 100644 --- a/devel/jam/distinfo +++ b/devel/jam/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/05/12 15:58:14 schmonz Exp $ +$NetBSD: distinfo,v 1.3 2004/07/07 19:40:04 schmonz Exp $ -SHA1 (jam-2.4.tar) = b30d24130ce86cd5713be940fc95d313cc4ca51a -Size (jam-2.4.tar) = 583680 bytes -SHA1 (patch-aa) = 593cfe30545bd5eeee674e8b1a7fbc596110d6b0 +SHA1 (jam-2.5.zip) = 89f0eeb52b8566e3cf065f40124fa08d7cb5ac33 +Size (jam-2.5.zip) = 193624 bytes diff --git a/devel/jam/patches/patch-aa b/devel/jam/patches/patch-aa deleted file mode 100644 index 1e21d40cab3..00000000000 --- a/devel/jam/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/20 20:04:06 schmonz Exp $ - ---- Makefile.orig Thu Jan 4 02:53:08 2001 -+++ Makefile -@@ -54,7 +54,7 @@ - rules.c scan.c search.c timestamp.c variable.c - - all: jam0 -- jam0 -+ ./jam0 - - jam0: - $(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS) |