pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/bmake Update to bmake-20090909
details: https://anonhg.NetBSD.org/pkgsrc/rev/75b0b3d19f0b
branches: trunk
changeset: 399362:75b0b3d19f0b
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Sep 18 21:27:25 2009 +0000
description:
Update to bmake-20090909
diffstat:
devel/bmake/Makefile | 4 +-
devel/bmake/files/ChangeLog | 55 +
devel/bmake/files/FILES | 4 +
devel/bmake/files/Makefile.in | 12 +-
devel/bmake/files/PSD.doc/tutorial.ms | 2 +-
devel/bmake/files/arch.c | 48 +-
devel/bmake/files/bmake.1 | 212 ++++-
devel/bmake/files/bmake.cat1 | 150 ++-
devel/bmake/files/boot-strap | 93 +-
devel/bmake/files/buf.c | 185 +---
devel/bmake/files/buf.h | 45 +-
devel/bmake/files/compat.c | 43 +-
devel/bmake/files/cond.c | 1051 +++++++++++++--------------
devel/bmake/files/configure | 5 -
devel/bmake/files/configure.in | 16 +-
devel/bmake/files/dir.c | 101 +-
devel/bmake/files/dir.h | 6 +-
devel/bmake/files/for.c | 522 ++++++++-----
devel/bmake/files/hash.c | 12 +-
devel/bmake/files/hash.h | 16 +-
devel/bmake/files/job.c | 74 +-
devel/bmake/files/job.h | 6 +-
devel/bmake/files/lst.h | 47 +-
devel/bmake/files/lst.lib/lstAppend.c | 18 +-
devel/bmake/files/lst.lib/lstAtEnd.c | 8 +-
devel/bmake/files/lst.lib/lstAtFront.c | 8 +-
devel/bmake/files/lst.lib/lstConcat.c | 24 +-
devel/bmake/files/lst.lib/lstDatum.c | 14 +-
devel/bmake/files/lst.lib/lstDeQueue.c | 18 +-
devel/bmake/files/lst.lib/lstDestroy.c | 30 +-
devel/bmake/files/lst.lib/lstDupl.c | 28 +-
devel/bmake/files/lst.lib/lstEnQueue.c | 8 +-
devel/bmake/files/lst.lib/lstFind.c | 10 +-
devel/bmake/files/lst.lib/lstFindFrom.c | 32 +-
devel/bmake/files/lst.lib/lstFirst.c | 10 +-
devel/bmake/files/lst.lib/lstForEach.c | 8 +-
devel/bmake/files/lst.lib/lstForEachFrom.c | 12 +-
devel/bmake/files/lst.lib/lstInit.c | 10 +-
devel/bmake/files/lst.lib/lstInsert.c | 16 +-
devel/bmake/files/lst.lib/lstInt.h | 18 +-
devel/bmake/files/lst.lib/lstIsEmpty.c | 10 +-
devel/bmake/files/lst.lib/lstLast.c | 10 +-
devel/bmake/files/lst.lib/lstMember.c | 16 +-
devel/bmake/files/lst.lib/lstNext.c | 18 +-
devel/bmake/files/lst.lib/lstOpen.c | 10 +-
devel/bmake/files/lst.lib/lstRemove.c | 18 +-
devel/bmake/files/lst.lib/lstReplace.c | 10 +-
devel/bmake/files/lst.lib/lstSucc.c | 10 +-
devel/bmake/files/main.c | 461 +++++------
devel/bmake/files/make.1 | 176 ++-
devel/bmake/files/make.c | 80 +-
devel/bmake/files/make.h | 44 +-
devel/bmake/files/makefile.boot.in | 6 +-
devel/bmake/files/nonints.h | 36 +-
devel/bmake/files/parse.c | 273 +++---
devel/bmake/files/pathnames.h | 7 +-
devel/bmake/files/sigcompat.c | 5 +-
devel/bmake/files/sprite.h | 23 +-
devel/bmake/files/str.c | 31 +-
devel/bmake/files/suff.c | 194 ++--
devel/bmake/files/targ.c | 54 +-
devel/bmake/files/trace.c | 10 +-
devel/bmake/files/unit-tests/Makefile.in | 6 +-
devel/bmake/files/unit-tests/test.exp | 5 +-
devel/bmake/files/util.c | 24 +-
devel/bmake/files/var.c | 830 +++++++++++----------
66 files changed, 2810 insertions(+), 2538 deletions(-)
diffs (truncated from 11359 to 300 lines):
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/Makefile
--- a/devel/bmake/Makefile Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/Makefile Fri Sep 18 21:27:25 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2009/04/09 00:48:07 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2009/09/18 21:27:25 joerg Exp $
#
-DISTNAME= bmake-20081111
+DISTNAME= bmake-20090909
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/files/ChangeLog
--- a/devel/bmake/files/ChangeLog Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/files/ChangeLog Fri Sep 18 21:27:25 2009 +0000
@@ -1,3 +1,58 @@
+2009-09-09 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (MAKE_VERSION): bump version to 20090909
+ * Merge with NetBSD make, pick up:
+ o fix for -C, .CURDIR and .OBJDIR
+ * boot-strap:
+ o allow share_dir to be set independent of prefix.
+ o select default share_dir better when prefix ends in $HOST_TARGET
+ o if FORCE_BSD_MK etc were set, include them in the suggested
+ install-mk command.
+
+2009-09-08 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (MAKE_VERSION): bump version to 20090908
+ * Merge with NetBSD make, pick up:
+ o .MAKE.LEVEL for recursion tracking
+ o fix for :M scanning \:
+
+2009-09-03 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * configure.in: Don't -D__EXTENSIONS__ if
+ AC_USE_SYSTEM_EXTENSIONS says "no".
+
+2009-08-26 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (MAKE_VERSION): bump version to 20090826
+ Simplify MAKE_VERSION to just the bare date.
+ * Merge with NetBSD make, pick up:
+ o -C directory support.
+ o support for SIGINFO
+ o use $TMPDIR for temp files.
+ o child of vfork should be careful about modifying parent's state.
+
+
+2009-03-26 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Appy some patches for MiNT from David Brownlee
+
+2009-02-26 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20090222
+ * Merge with NetBSD make, pick up:
+ o Possible null pointer de-ref in Var_Set.
+
+2009-02-08 Simon J. Gerraty <sjg%void.crufty.net@localhost>
+
+ * Makefile.in (BMAKE_VERSION): bump version to 20090204
+ * Merge with NetBSD make, pick up:
+ o bmake_malloc et al moved to their own .c
+ o Count both () and {} when looking for the end of a :M pattern
+ o Change 'Buffer' so that it is the actual struct, not a pointer to it.
+ o strlist.c - functions for processing extendable arrays of pointers to strings.
+ o ClientData replaced with void *, so const void * can be used.
+ o New debug flag C for DEBUG_CWD
+
2008-11-11 Simon J. Gerraty <sjg%void.crufty.net@localhost>
* Makefile.in (BMAKE_VERSION): bump version to 20081111
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/files/FILES
--- a/devel/bmake/files/FILES Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/files/FILES Fri Sep 18 21:27:25 2009 +0000
@@ -13,6 +13,8 @@
compat.c
cond.c
make-conf.h
+make_malloc.c
+make_malloc.h
config.h.in
configure
aclocal.m4
@@ -28,6 +30,8 @@
install-sh
job.c
job.h
+strlist.c
+strlist.h
trace.c
trace.h
lst.h
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/files/Makefile.in Fri Sep 18 21:27:25 2009 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.in,v 1.12 2008/11/11 19:47:38 joerg Exp $
+# $NetBSD: Makefile.in,v 1.13 2009/09/18 21:27:25 joerg Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.12 2008/11/11 19:47:38 joerg Exp $
+# $Id: Makefile.in,v 1.13 2009/09/18 21:27:25 joerg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
make.c parse.c str.c suff.c targ.c trace.c var.c util.c
+SRCS+= strlist.c
+SRCS+= make_malloc.c
SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \
lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \
@@ -19,10 +21,7 @@
CC?= @CC@
# Base version on src date
-BMAKE_VERSION= 20081111
-# knowing when it was built is also handy
-BUILD_DATE!= date +%Y%m%d
-MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE}
+MAKE_VERSION= 20090909
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -122,6 +121,7 @@
.else
@echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false
.endif
+CFLAGS_var.o += -Wno-cast-qual
.ifdef TOOLDIR
# this is a native netbsd build,
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/files/PSD.doc/tutorial.ms
--- a/devel/bmake/files/PSD.doc/tutorial.ms Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/files/PSD.doc/tutorial.ms Fri Sep 18 21:27:25 2009 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: tutorial.ms,v 1.2 2008/03/09 19:54:29 joerg Exp $
+.\" $NetBSD: tutorial.ms,v 1.3 2009/09/18 21:27:25 joerg Exp $
.\" Copyright (c) 1988, 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff -r 669a80ce27bb -r 75b0b3d19f0b devel/bmake/files/arch.c
--- a/devel/bmake/files/arch.c Fri Sep 18 20:55:23 2009 +0000
+++ b/devel/bmake/files/arch.c Fri Sep 18 21:27:25 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $ */
+/* $NetBSD: arch.c,v 1.4 2009/09/18 21:27:25 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.4 2009/09/18 21:27:25 joerg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $");
+__RCSID("$NetBSD: arch.c,v 1.4 2009/09/18 21:27:25 joerg Exp $");
#endif
#endif /* not lint */
#endif
@@ -173,9 +173,9 @@
size_t fnamesize; /* Size of the string table */
} Arch;
-static int ArchFindArchive(ClientData, ClientData);
+static int ArchFindArchive(const void *, const void *);
#ifdef CLEANUP
-static void ArchFree(ClientData);
+static void ArchFree(void *);
#endif
static struct ar_hdr *ArchStatMember(char *, char *, Boolean);
static FILE *ArchFindMember(char *, char *, struct ar_hdr *, const char *);
@@ -222,7 +222,7 @@
*-----------------------------------------------------------------------
*/
static void
-ArchFree(ClientData ap)
+ArchFree(void *ap)
{
Arch *a = (Arch *)ap;
Hash_Search search;
@@ -405,7 +405,7 @@
*/
gn = Targ_FindNode(buf, TARG_CREATE);
- if (gn == NILGNODE) {
+ if (gn == NULL) {
free(buf);
return(FAILURE);
} else {
@@ -440,7 +440,7 @@
snprintf(nameBuf, sz, "%s(%s)", libName, member);
free(member);
gn = Targ_FindNode(nameBuf, TARG_CREATE);
- if (gn == NILGNODE) {
+ if (gn == NULL) {
free(nameBuf);
return (FAILURE);
} else {
@@ -455,7 +455,7 @@
(void)Lst_AtEnd(nodeLst, gn);
}
}
- Lst_Destroy(members, NOFREE);
+ Lst_Destroy(members, NULL);
free(nameBuf);
} else {
size_t sz = strlen(libName) + strlen(memName) + 3;
@@ -463,7 +463,7 @@
snprintf(nameBuf, sz, "%s(%s)", libName, memName);
gn = Targ_FindNode(nameBuf, TARG_CREATE);
free(nameBuf);
- if (gn == NILGNODE) {
+ if (gn == NULL) {
return (FAILURE);
} else {
/*
@@ -523,9 +523,9 @@
*-----------------------------------------------------------------------
*/
static int
-ArchFindArchive(ClientData ar, ClientData archName)
+ArchFindArchive(const void *ar, const void *archName)
{
- return (strcmp((char *)archName, ((Arch *)ar)->name));
+ return (strcmp(archName, ((const Arch *)ar)->name));
}
/*-
@@ -577,7 +577,7 @@
}
ln = Lst_Find(archives, archive, ArchFindArchive);
- if (ln != NILLNODE) {
+ if (ln != NULL) {
ar = (Arch *)Lst_Datum(ln);
he = Hash_FindEntry(&ar->members, member);
@@ -596,7 +596,7 @@
}
if ((he = Hash_FindEntry(&ar->members, copy)) != NULL)
return ((struct ar_hdr *)Hash_GetValue(he));
- return (NULL);
+ return NULL;
}
}
@@ -613,7 +613,7 @@
arch = ArchFindMember(archive, member, &sarh, "r");
if (arch == NULL) {
- return (NULL);
+ return NULL;
} else {
fclose(arch);
return (&sarh);
@@ -626,7 +626,7 @@
*/
arch = fopen(archive, "r");
if (arch == NULL) {
- return (NULL);
+ return NULL;
}
/*
@@ -636,7 +636,7 @@
if ((fread(magic, SARMAG, 1, arch) != 1) ||
(strncmp(magic, ARMAG, SARMAG) != 0)) {
fclose(arch);
- return (NULL);
+ return NULL;
}
ar = bmake_malloc(sizeof(Arch));
@@ -734,7 +734,7 @@
if (he != NULL) {
return ((struct ar_hdr *)Hash_GetValue(he));
} else {
- return (NULL);
+ return NULL;
}
badarch:
@@ -743,7 +743,7 @@
if (ar->fnametab)
free(ar->fnametab);
free(ar);
- return (NULL);
+ return NULL;
}
Home |
Main Index |
Thread Index |
Old Index