pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/bmake Update bmake to 20080215. I'll take care o...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e6989213e17d
branches: trunk
changeset: 539621:e6989213e17d
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Mar 09 19:54:28 2008 +0000
description:
Update bmake to 20080215. I'll take care of pkgsrc maintainership.
Changes include many bugfixes and performance speed ups. See
ChangeLog for details.
diffstat:
devel/bmake/Makefile | 8 +-
devel/bmake/files/ChangeLog | 127 +
devel/bmake/files/Makefile.in | 52 +-
devel/bmake/files/PSD.doc/Makefile | 2 +-
devel/bmake/files/PSD.doc/tutorial.ms | 2 +-
devel/bmake/files/aclocal.m4 | 19 +-
devel/bmake/files/arch.c | 6 +-
devel/bmake/files/bmake.1 | 167 +-
devel/bmake/files/boot-strap | 65 +-
devel/bmake/files/buf.c | 6 +-
devel/bmake/files/buf.h | 2 +-
devel/bmake/files/compat.c | 88 +-
devel/bmake/files/cond.c | 387 +-
devel/bmake/files/config.h.in | 31 +-
devel/bmake/files/configure | 6622 ++++++++++++---------------
devel/bmake/files/configure.in | 54 +-
devel/bmake/files/dir.c | 6 +-
devel/bmake/files/dir.h | 2 +-
devel/bmake/files/for.c | 6 +-
devel/bmake/files/getenv.c | 2 +-
devel/bmake/files/getopt.c | 2 +-
devel/bmake/files/hash.c | 6 +-
devel/bmake/files/hash.h | 2 +-
devel/bmake/files/install-sh | 2 +-
devel/bmake/files/job.c | 2201 ++------
devel/bmake/files/job.h | 113 +-
devel/bmake/files/lst.h | 2 +-
devel/bmake/files/lst.lib/Makefile | 2 +-
devel/bmake/files/lst.lib/lstAppend.c | 6 +-
devel/bmake/files/lst.lib/lstAtEnd.c | 6 +-
devel/bmake/files/lst.lib/lstAtFront.c | 6 +-
devel/bmake/files/lst.lib/lstClose.c | 6 +-
devel/bmake/files/lst.lib/lstConcat.c | 6 +-
devel/bmake/files/lst.lib/lstDatum.c | 6 +-
devel/bmake/files/lst.lib/lstDeQueue.c | 6 +-
devel/bmake/files/lst.lib/lstDestroy.c | 6 +-
devel/bmake/files/lst.lib/lstDupl.c | 6 +-
devel/bmake/files/lst.lib/lstEnQueue.c | 6 +-
devel/bmake/files/lst.lib/lstFind.c | 6 +-
devel/bmake/files/lst.lib/lstFindFrom.c | 6 +-
devel/bmake/files/lst.lib/lstFirst.c | 6 +-
devel/bmake/files/lst.lib/lstForEach.c | 6 +-
devel/bmake/files/lst.lib/lstForEachFrom.c | 6 +-
devel/bmake/files/lst.lib/lstInit.c | 6 +-
devel/bmake/files/lst.lib/lstInsert.c | 6 +-
devel/bmake/files/lst.lib/lstInt.h | 14 +-
devel/bmake/files/lst.lib/lstIsAtEnd.c | 6 +-
devel/bmake/files/lst.lib/lstIsEmpty.c | 6 +-
devel/bmake/files/lst.lib/lstLast.c | 6 +-
devel/bmake/files/lst.lib/lstMember.c | 6 +-
devel/bmake/files/lst.lib/lstNext.c | 6 +-
devel/bmake/files/lst.lib/lstOpen.c | 6 +-
devel/bmake/files/lst.lib/lstRemove.c | 6 +-
devel/bmake/files/lst.lib/lstReplace.c | 6 +-
devel/bmake/files/lst.lib/lstSucc.c | 6 +-
devel/bmake/files/lst.lib/makefile.boot.in | 4 +-
devel/bmake/files/machine.sh | 2 +-
devel/bmake/files/main.c | 530 +-
devel/bmake/files/make-conf.h | 2 +-
devel/bmake/files/make.1 | 2 +-
devel/bmake/files/make.c | 6 +-
devel/bmake/files/make.h | 2 +-
devel/bmake/files/makefile.boot.in | 21 +-
devel/bmake/files/missing/sys/cdefs.h | 2 +-
devel/bmake/files/mkdeps.sh | 2 +-
devel/bmake/files/nonints.h | 2 +-
devel/bmake/files/os.sh | 2 +-
devel/bmake/files/parse.c | 6 +-
devel/bmake/files/pathnames.h | 25 +-
devel/bmake/files/ranlib.h | 2 +-
devel/bmake/files/setenv.c | 2 +-
devel/bmake/files/sigcompat.c | 9 +-
devel/bmake/files/sprite.h | 2 +-
devel/bmake/files/str.c | 6 +-
devel/bmake/files/suff.c | 6 +-
devel/bmake/files/targ.c | 6 +-
devel/bmake/files/trace.c | 6 +-
devel/bmake/files/trace.h | 2 +-
devel/bmake/files/unit-tests/Makefile.in | 4 +-
devel/bmake/files/unit-tests/cond1 | 2 +-
devel/bmake/files/unit-tests/modorder | 2 +-
devel/bmake/files/unit-tests/modword | 2 +-
devel/bmake/files/unit-tests/posix | 2 +-
devel/bmake/files/unit-tests/varcmd | 2 +-
devel/bmake/files/util.c | 8 +-
devel/bmake/files/var.c | 2553 ++++++----
devel/bmake/files/wait.h | 2 +-
87 files changed, 6238 insertions(+), 7142 deletions(-)
diffs (truncated from 19964 to 300 lines):
diff -r 27e39d965439 -r e6989213e17d devel/bmake/Makefile
--- a/devel/bmake/Makefile Sun Mar 09 19:39:31 2008 +0000
+++ b/devel/bmake/Makefile Sun Mar 09 19:54:28 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2008/03/09 19:54:28 joerg Exp $
#
-DISTNAME= bmake-20051105
-PKGREVISION= 4
+DISTNAME= bmake-20080215
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,7 +9,7 @@
# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
# source is kept in files/ for bootstrap purposes
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://www.crufty.net/help/sjg/bmake.html
COMMENT= Portable (autoconf) version of NetBSD 'make' utility
@@ -20,7 +19,6 @@
WRKSRC= ${WRKDIR}/bmake
NO_CHECKSUM= yes
-NO_MTREE= yes
USE_FEATURES= nbcompat
diff -r 27e39d965439 -r e6989213e17d devel/bmake/files/ChangeLog
--- a/devel/bmake/files/ChangeLog Sun Mar 09 19:39:31 2008 +0000
+++ b/devel/bmake/files/ChangeLog Sun Mar 09 19:54:28 2008 +0000
@@ -1,3 +1,130 @@
+2008-02-15 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * merge some patches from NetBSD pkgsrc.
+
+ * makefile.boot.in (BOOTSTRAP_SYS_PATH): Allow better control of
+ the MAKSYSPATH used during bootstrap.
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20080215
+ * Merge with NetBSD make, pick up:
+ o warn if non-space chars follow 'empty' in a conditional.
+
+2008-01-18 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20080118
+ * Merge with NetBSD make, pick up:
+ o consider dependencies read from .depend as optional - dsl
+ o remember when buffer for reading makefile grows - dsl
+ o add -dl (aka LOUD) - David O'Brien
+
+2007-10-22 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20071022
+ * Merge with NetBSD make, pick up:
+ o Allow .PATH<suffix> to be used for .include ""
+
+ * boot-strap: source default settings from .bmake-boot-strap.rc
+
+2007-10-16 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in: fix maninstall on various systems
+ provided that our man.mk is used.
+ For non-BSD systems we install the preformatted page
+ into $MANDIR/cat1
+
+2007-10-15 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * boot-strap: make bmake.1 too, so maninstall works.
+
+2007-10-14 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20071014
+ * Merge with NetBSD make, pick up:
+ o revamped handling of defshell - configure no longer needs to
+ know the content of the shells array - apb
+ o stop Var_Subst modifying its input - apb
+ o avoid calling ParseTrackInput too often - dsl
+
+2007-10-11 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20071011
+ * Merge with NetBSD make, pick up:
+ o fix Shell_Init for case that _BASENAME_DEFSHELL is absolute path.
+
+ * sigcompat.c: some tweaks for HP-UX 11.x based on
+ patch from Tobias Nygren
+
+ * configure.in: update handling of --with-defshell to match
+ new make behavior. --with-defshell=/usr/xpg4/bin/sh
+ will now do what one might hope - provided the chosen shell
+ behaves enough like sh.
+
+2007-10-08 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20071008
+ * Merge with NetBSD make, pick up:
+ o .MAKE.JOB.PREFIX - control the token output before jobs - sjg
+ o .export/.MAKE.EXPORTED - export of variables - sjg
+ o .MAKE.MAKEFILES - track all makefiles read - sjg
+ o performance improvements - dsl
+ o revamp parallel job scheduling - dsl
+
+2006-07-28 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060728
+ * Merge with NetBSD make, pick up:
+ o extra debug info during variable and cond processing - sjg
+ o shell definition now covers newline - rillig
+ o minor mem leak in PrintOnError - sjg
+
+2006-05-11 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060511
+ * Merge with NetBSD make, pick up:
+ o more memory leaks - coverity
+ o possible overflow in ArchFindMember - coverity
+ o extract variable modifier code out of Var_Parse()
+ so it can be called recursively - sjg
+ o unit-tests/moderrs - sjg
+
+2006-04-12 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060412
+ * Merge with NetBSD make, pick up:
+ o fixes for some memory leaks - coverity
+ o only read first sys.mk etc when searching sysIncPath - sjg
+
+ * main.c (ReadMakefile): remove hack for __INTERIX that prevented
+ setting ${MAKEFILE} - OBATA Akio
+
+2006-03-18 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060318
+ * Merge with NetBSD make, pick up:
+ o cleanup of job.c to remove remote handling, distcc is more
+ useful and this code was likely bit-rotting - dsl
+ o fix for :P modifier - sjg
+ * boot-strap: set default prefix to something reasonable
+ (for me anyway).
+
+2006-03-01 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060301
+ * Merge with NetBSD make, pick up:
+ o make .WAIT apply recursively, document and test case - apb
+ o allow variable modifiers in a variable appear anywhere in
+ modifier list, document and test case - sjg
+
+2006-02-22 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump to 20060222
+ * Merge with NetBSD make, pick up:
+ o improved job token handling - dsl
+ o SIG_DFL the correct signal before exec - dsl
+ o more debug info during parsing - dsl
+ o allow variable modifiers to be specified via variable - sjg
+ * boot-strap: explain why we died if no mksrc
+
2005-11-05 Simon J. Gerraty <sjg%void.crufty.net@localhost>
* Makefile.in (BMAKE_VERSION): bump to 20051105
diff -r 27e39d965439 -r e6989213e17d devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in Sun Mar 09 19:39:31 2008 +0000
+++ b/devel/bmake/files/Makefile.in Sun Mar 09 19:54:28 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.in,v 1.5 2007/09/06 19:23:25 joerg Exp $
+# $NetBSD: Makefile.in,v 1.6 2008/03/09 19:54:29 joerg Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.5 2007/09/06 19:23:25 joerg Exp $
+# $Id: Makefile.in,v 1.6 2008/03/09 19:54:29 joerg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -11,6 +11,7 @@
lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \
lstInit.c lstInsert.c lstIsAtEnd.c lstIsEmpty.c lstLast.c \
lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c
+SRCS += lstPrev.c
.if !empty(LIBOBJS)
SRCS+= ${LIBOBJS:.o=.c}
@@ -22,21 +23,15 @@
CC?= @CC@
# Base version on src date
-BMAKE_VERSION= 20051105
+BMAKE_VERSION= 20080215
# knowing when it was built is also handy
BUILD_DATE!= date +%Y%m%d
MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE}
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
+DEFAULT_SYS_PATH = @default_sys_path@
-DEFAULT_CSH = @DEFAULT_CSH@
-DEFAULT_KSH = @DEFAULT_KSH@
-DEFAULT_SH = @DEFAULT_SH@
-DEFAULT_SYS_PATH = @DEFAULT_SYS_PATH@
-
-CFLAGS+= @CFLAGS@ -DDEFAULT_CSH=\"${DEFAULT_CSH}\"
-CFLAGS+= -DDEFAULT_KSH=\"${DEFAULT_KSH}\" -DDEFAULT_SH=\"${DEFAULT_SH}\"
-CFLAGS+= -DDEFAULT_SYS_PATH=\"${DEFAULT_SYS_PATH}\"
+CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE
CFLAGS+= ${CFLAGS_${.TARGET:T}}
CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
@@ -57,7 +52,7 @@
# Don't set these for anyone else since we don't know what the effect may be.
# On FreeBSD WARNS=2 sets a bunch of -W flags that make does not handle.
WFORMAT= 1
-WARNS=3
+WARNS=4
.NOPATH: bmake.cat1
.if make(install) && exists(${DESTDIR}/usr/share/doc)
SUBDIR= PSD.doc
@@ -68,7 +63,7 @@
# XXX not sure if we still want this given that configure
# lets us force or not the definition of MACHINE.
CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\""
-NOMAN=no
+MANTARGET=cat
SRCS+= getenv.c
INSTALL?=${srcdir}/install-sh
.if (${MACHINE} == "sun386")
@@ -103,6 +98,20 @@
.endif
+.if !empty(isBSD44:M${OS})
+.if "${OS}" != "NetBSD"
+MAN1=${MAN}
+.endif
+MANTARGET?=man
+.endif
+
+MANTARGET?= cat
+MANDEST?= ${MANDIR}/${MANTARGET}1
+
+.if ${MANTARGET} == "cat"
+_mfromdir=${srcdir}
+.endif
+
.if exists(${srcdir}/../Makefile.inc)
.include "${srcdir}/../Makefile.inc"
.endif
@@ -118,15 +127,6 @@
BINDIR= ${prefix}/bin
MANDIR= ${prefix}/man
-.if "${OS}" != "NetBSD" && !empty(isBSD44:M${OS})
-# freebsd's bsd.man.mk works differently
-MAN1=${MAN}
-MANDIR= ${prefix}/man/man
-MANDEST= ${MANDIR}1
-.NOPATH: bmake.cat1
-.endif
-MANDEST?= ${MANDIR}
-
arch.o: config.h
# make sure that MAKE_VERSION gets updated.
main.o: ${SRCS} ${MAKEFILE}
@@ -149,6 +149,14 @@
@echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false
.endif
+.ifdef TOOLDIR
+# this is a native netbsd build,
+# use libutil rather than the local emalloc etc.
+CPPFLAGS+= -DHAVE_EMALLOC
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
+.endif
+
# A simple unit-test driver to help catch regressions
accept test:
cd ${.CURDIR}/unit-tests && ${.MAKE:S,^./,${.CURDIR}/,} TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
diff -r 27e39d965439 -r e6989213e17d devel/bmake/files/PSD.doc/Makefile
--- a/devel/bmake/files/PSD.doc/Makefile Sun Mar 09 19:39:31 2008 +0000
+++ b/devel/bmake/files/PSD.doc/Makefile Sun Mar 09 19:54:28 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/09 19:54:29 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
DIR= psd/12.make
diff -r 27e39d965439 -r e6989213e17d devel/bmake/files/PSD.doc/tutorial.ms
--- a/devel/bmake/files/PSD.doc/tutorial.ms Sun Mar 09 19:39:31 2008 +0000
+++ b/devel/bmake/files/PSD.doc/tutorial.ms Sun Mar 09 19:54:28 2008 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: tutorial.ms,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $
+.\" $NetBSD: tutorial.ms,v 1.2 2008/03/09 19:54:29 joerg Exp $
.\" Copyright (c) 1988, 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff -r 27e39d965439 -r e6989213e17d devel/bmake/files/aclocal.m4
Home |
Main Index |
Thread Index |
Old Index