pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/bmake Keep the bmake source in pkgsrc/devel/bmak...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dafd2cfd9809
branches:  trunk
changeset: 501956:dafd2cfd9809
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Oct 31 21:34:24 2005 +0000

description:
Keep the bmake source in pkgsrc/devel/bmake/files/.
The plan is to remove the out-of-date source from bootstrap/bmake.
Sources obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/.
Source is kept in files/ for bootstrap purposes (to be done).

Update to version bmake-20051002. Changes include:

        * Makefile.in (BMAKE_VERSION): bump to 20051001
          support for UnixWare and some other systems,
          based on patches from pkgsrc/bootstrap

Remove DEPENDS for mk-files (as mentioned on tech-pkg in June).

Use libnbcompat. Also patch-aa is to use libnbcompat.
(I chose to use patches so files would be exact from original source
tarball.)

And use PKGMANDIR.

diffstat:

 devel/bmake/Makefile               |    28 +-
 devel/bmake/distinfo               |     3 +-
 devel/bmake/files/ChangeLog        |   551 ++
 devel/bmake/files/FILES            |    94 +
 devel/bmake/files/Makefile.in      |   146 +
 devel/bmake/files/README           |    48 +
 devel/bmake/files/aclocal.m4       |    77 +
 devel/bmake/files/arch.c           |  1385 +++++++
 devel/bmake/files/bmake.cat1       |   915 ++++
 devel/bmake/files/boot-strap       |   160 +
 devel/bmake/files/buf.c            |   335 +
 devel/bmake/files/buf.h            |   111 +
 devel/bmake/files/compat.c         |   701 +++
 devel/bmake/files/cond.c           |  1395 +++++++
 devel/bmake/files/config.h.in      |   246 +
 devel/bmake/files/configure        |  7047 ++++++++++++++++++++++++++++++++++++
 devel/bmake/files/configure.in     |   306 +
 devel/bmake/files/dir.c            |  1752 ++++++++
 devel/bmake/files/dir.h            |   108 +
 devel/bmake/files/find_lib.sh      |    13 +
 devel/bmake/files/for.c            |   392 ++
 devel/bmake/files/getenv.c         |    90 +
 devel/bmake/files/getopt.c         |   179 +
 devel/bmake/files/hash.c           |   463 ++
 devel/bmake/files/hash.h           |   150 +
 devel/bmake/files/install-sh       |   201 +
 devel/bmake/files/job.c            |  3755 +++++++++++++++++++
 devel/bmake/files/job.h            |   317 +
 devel/bmake/files/lst.h            |   198 +
 devel/bmake/files/machine.sh       |    94 +
 devel/bmake/files/main.c           |  1822 +++++++++
 devel/bmake/files/make-conf.h      |   167 +
 devel/bmake/files/make.1           |  1608 ++++++++
 devel/bmake/files/make.c           |  1234 ++++++
 devel/bmake/files/make.h           |   489 ++
 devel/bmake/files/makefile.boot.in |    76 +
 devel/bmake/files/mkdeps.sh        |   314 +
 devel/bmake/files/nonints.h        |   192 +
 devel/bmake/files/os.sh            |   210 +
 devel/bmake/files/parse.c          |  2993 +++++++++++++++
 devel/bmake/files/pathnames.h      |    59 +
 devel/bmake/files/ranlib.h         |    32 +
 devel/bmake/files/setenv.c         |   154 +
 devel/bmake/files/sigcompat.c      |   333 +
 devel/bmake/files/sprite.h         |   137 +
 devel/bmake/files/str.c            |   485 ++
 devel/bmake/files/suff.c           |  2626 +++++++++++++
 devel/bmake/files/targ.c           |   757 +++
 devel/bmake/files/trace.c          |   123 +
 devel/bmake/files/trace.h          |    56 +
 devel/bmake/files/util.c           |   512 ++
 devel/bmake/files/var.c            |  3524 ++++++++++++++++++
 devel/bmake/files/wait.h           |    81 +
 devel/bmake/patches/patch-aa       |    21 +
 54 files changed, 39256 insertions(+), 9 deletions(-)

diffs (truncated from 39509 to 300 lines):

diff -r d8745a263013 -r dafd2cfd9809 devel/bmake/Makefile
--- a/devel/bmake/Makefile      Mon Oct 31 21:33:19 2005 +0000
+++ b/devel/bmake/Makefile      Mon Oct 31 21:34:24 2005 +0000
@@ -1,23 +1,29 @@
-# $NetBSD: Makefile,v 1.23 2005/09/04 17:09:54 sjg Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/31 21:34:25 reed Exp $
 #
 
-DISTNAME=       bmake-20050901
+DISTNAME=       bmake-20051002
 CATEGORIES=    devel
-MASTER_SITES=   ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
+MASTER_SITES=  # empty
+DISTFILES=     # empty
+
+# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
+# source is kept in files/ for bootstrap purposes
 
 MAINTAINER=    sjg%NetBSD.org@localhost
 HOMEPAGE=      http://www.crufty.net/help/sjg/bmake.html
 COMMENT=       Portable (autoconf) version of NetBSD 'make' utility
 
-DEPENDS+=      mk-files>=20030714:../../devel/mk-files
-
 WRKSRC=                ${WRKDIR}/bmake
+NO_CHECKSUM=   YES
 
 makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
 GNU_CONFIGURE= no
 CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
 
-INSTALLATION_DIRS=     bin man/cat1 man/man1
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+
+do-extract:
+       ${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-configure:
 
@@ -31,8 +37,14 @@
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
-       ${INSTALL_MAN} ${BMAKE_CAT1} ${PREFIX}/man/cat1/bmake.0
-       ${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.1 ${PREFIX}/man/man1
+       ${INSTALL_MAN} ${BMAKE_CAT1} ${PREFIX}/${PKGMANDIR}/cat1/bmake.0
+       ${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.1 ${PREFIX}/${PKGMANDIR}/man1
+
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")  
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
 
diff -r d8745a263013 -r dafd2cfd9809 devel/bmake/distinfo
--- a/devel/bmake/distinfo      Mon Oct 31 21:33:19 2005 +0000
+++ b/devel/bmake/distinfo      Mon Oct 31 21:34:24 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2005/09/04 17:09:54 sjg Exp $
+$NetBSD: distinfo,v 1.20 2005/10/31 21:34:25 reed Exp $
 
 SHA1 (bmake-20050901.tar.gz) = 167e9d637030d4125907b943a3e08d7976018e4f
 RMD160 (bmake-20050901.tar.gz) = e77305eead0fec601c0436158d4dc81a8fd7dd0e
 Size (bmake-20050901.tar.gz) = 343100 bytes
+SHA1 (patch-aa) = 32df79c50ee516f3ec7c006f5c38fad11b909a82
diff -r d8745a263013 -r dafd2cfd9809 devel/bmake/files/ChangeLog
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bmake/files/ChangeLog       Mon Oct 31 21:34:24 2005 +0000
@@ -0,0 +1,551 @@
+2005-10-10  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20051002
+         fix a silly typo
+
+2005-10-09  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20051001
+         support for UnixWare and some other systems,
+         based on patches from pkgsrc/bootstrap
+
+2005-09-03  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20050901
+       * Merge with NetBSD make, pick up:
+         o possible parse error causing us to wander off.
+
+2005-06-06  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20050606
+       * Merge with NetBSD make, pick up:
+         o :0x modifier for randomizing a list
+         o fixes for a number of -Wuninitialized issues.
+
+2005-05-30  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20050530
+       * Merge with NetBSD make, pick up:
+         o Handle dependencies for .BEGIN, .END and .INTERRUPT
+
+       * README: was seriously out of date.
+       
+2005-03-22  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Important to use .MAKE rather than MAKE.
+
+2005-03-15  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20050315
+       * Merge with NetBSD make, pick up:
+         o don't mistake .elsefoo for .else
+         o use suffix-specific search path correctly
+         o bunch of style nits
+
+2004-05-11  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * boot-strap: 
+       o ensure that args to --src and --with-mksrc
+         are resolved before giving them to configure.
+       o add -o "objdir" so that builder can control it,
+         default is $OS as determined by os.sh
+       o add -q to suppress all the install instructions.
+
+2004-05-08  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Remove __IDSTRING()
+
+       * Makefile.in (BMAKE_VERSION): bump to 20040508
+       * Merge with NetBSD make, pick up:
+         o posix fixes
+           - remove '-e' from compat mode
+           - add support for '+' command-line prefix.
+         o fix for handling '--' on command-line.
+         o fix include in lst.lib/lstInt.h to simplify '-I's
+         o we also picked up replacement of MAKE_BOOTSTRAP 
+           with !MAKE_NATIVE which is a noop, but possibly confusing.
+
+2004-04-14  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20040414
+       * Merge with NetBSD make, pick up:
+         o allow quoted strings on lhs of conditionals
+         o issue warning when extra .else is seen
+         o print line numer when errors encountered during parsing from
+         string.
+
+2004-02-20  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION):  bump to 20040220
+       * Merge with NetBSD make, pick up:
+         o fix for old :M parsing bug.
+         o re-jigged unit-tests
+
+2004-02-15  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (accept test): use ${.MAKE:S,^./,${.CURDIR}/,}
+       so that './bmake -f Makefile test' works.
+       
+2004-02-14  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in: (BMAKE_VERSION): bump to 20040214
+       * Merge with NetBSD make, pick up:
+         o search upwards for *.mk
+         o fix for double free of var substitution buffers
+         o use of getopt replaced with custom code, since the usage
+         (re-scanning) isn't posix compatible.
+
+2004-02-12  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * arch.c: don't include ranlib.h on ELF systems
+       (thanks to Chuck Cranor <chuck%ece.cmu.edu@localhost>).
+
+2004-01-18  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump to 20040118
+
+       * boot-strap (while): export vars we assign to on cmdline
+       * unit-test/Makefile.in: ternary is .PHONY
+
+2004-01-08  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20040108
+       * Merge with NetBSD make, pick up:
+         o fix for ternary modifier
+
+2004-01-06  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20040105
+       * Merge with NetBSD make, pick up:
+         o fix for cond.c to handle compound expressions better
+         o variable expansion within sysV style replacements
+         
+2003-12-22  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Make portable snprintf safer - output to /dev/null first to
+       check space needed.
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20031222
+       * Merge with NetBSD make, pick up:
+         o -dg3 to show input graph when things go wrong.
+         o explicitly look for makefiles in objdir if not found in curdir so
+           that errors in .depend etc will be reported accurarely. 
+         o avoid use of -e in shell scripts in jobs mode, use '|| exit $?'
+           instead as it more accurately reflects the expected behavior and
+           is more consistently implemented.
+         o avoid use of asprintf.
+
+2003-09-28  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * util.c: Add asprintf and vasprintf.
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20030928
+       * Merge with NetBSD make, pick up:
+       :[] modifier - allows picking words from a variable.
+       :tW modifier - allows treating value as one big word.
+       W flag for :C and :S - allows treating value as one big word.
+       
+2003-09-12  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Merge with NetBSD make
+       pick up -de flag to enable printing failed command.
+       don't skip 1st two dir entries (normally . and ..) since
+       coda does not have them.
+
+2003-09-09  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20030909
+       * Merge with NetBSD make, pick up:
+       - changes for -V '${VAR}' to print fully expanded value
+         cf. -V VAR
+       - CompatRunCommand now prints the command that failed.
+       - several files got updated 3 clause Berkeley license.
+       
+2003-08-02  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * boot-strap: Allow setting configure args on command line.
+
+2003-07-31  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * configure.in: add --with-defshell to allow sh or ksh
+       to be selected as default shell.
+
+       * Makefile.in: bump version to 20030731
+
+       * Merge with NetBSD make 
+       Pick up .SHELL spec for ksh and associate man page changes.
+       Also compat mode now uses the same shell specs.
+
+2003-07-29  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * var.c (Var_Parse): ensure delim is initialized.
+
+       * unit-tests/Makefile.in: use single quotes to avoid problems from
+       some shells.
+
+       * makefile.boot.in:
+       Run the unit-tests as part of the bootstrap procedure.
+
+2003-07-28  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * unit-tests/Makefile.in: always force complaints from
+       ${TEST_MAKE} to be from 'make'.
+
+       * configure.in: add check for 'diff -u'
+       also fix some old autoconf'isms
+       
+       * Makefile.in (BMAKE_VERSION): bump version to 20030728.
+       if using GCC add -Wno-cast-qual to CFLAGS for var.o
+
+       * Merge with NetBSD make
+       Pick up fix for :ts parsing error in some cases.
+       Pick unit-tests.
+
+2003-07-23  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20030723.
+
+       * var.c (Var_Parse): fix bug in :ts modifier, after const
+       correctness fixes, must pass nstr to VarModify.
+
+2003-07-14  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in: BMAKE_VERSION switch to a date based version.
+       We'll generally use the date of last import from NetBSD.
+
+       * Merge with NetBSD make
+       Pick up fixes for const-correctness, now passes WARNS=3 on
+       NetBSD.
+       Pick up :ts modifier, allows controlling the separator used
+       between words in variable expansion.
+
+2003-07-11  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * FILES: include boot-strap and os.sh
+
+       * Makefile.in: only set WARNS if we are NetBSD, the effect on
+       FreeBSD is known to be bad.
+
+       * makefile.boot.in (bootstrap): make this the default target.



Home | Main Index | Thread Index | Old Index