diff options
| author | nia <nia@pkgsrc.org> | 2020-05-24 21:10:17 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-05-24 21:10:17 +0000 |
| commit | 9d9c11ec200f662ba4036a473ba67a97de6b4107 (patch) | |
| tree | 40ef1a6525a8f47d7635057a91a5df6e89464adf /devel/bmake/files | |
| parent | 8952825c9069351f6e5dc102fee78bc5f1e7ad1c (diff) | |
| download | pkgsrc-9d9c11ec200f662ba4036a473ba67a97de6b4107.tar.gz | |
bmake: Update to 20200524.
This should help bootstrap on older platforms, such as IRIX with
the mipspro compiler.
2020-05-24 Simon J Gerraty <sjg@beast.crufty.net>
* configure.in: add AC_PROG_CC_C99 for mipspro compiler
* dirname.c: remove include of namespace.h
Diffstat (limited to 'devel/bmake/files')
59 files changed, 322 insertions, 175 deletions
diff --git a/devel/bmake/files/ChangeLog b/devel/bmake/files/ChangeLog index ce56229b00f..41fd47c9ddf 100644 --- a/devel/bmake/files/ChangeLog +++ b/devel/bmake/files/ChangeLog @@ -1,3 +1,8 @@ +2020-05-24 Simon J Gerraty <sjg@beast.crufty.net> + + * configure.in: add AC_PROG_CC_C99 for mipspro compiler + * dirname.c: remove include of namespace.h + 2020-05-17 Simon J Gerraty <sjg@beast.crufty.net> * VERSION (_MAKE_VERSION): 20200517 diff --git a/devel/bmake/files/Makefile b/devel/bmake/files/Makefile index 99fbfddeddf..b811ad02352 100644 --- a/devel/bmake/files/Makefile +++ b/devel/bmake/files/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2020/05/24 11:09:43 nia Exp $ +# $Id: Makefile,v 1.5 2020/05/24 21:10:17 nia Exp $ PROG= bmake @@ -82,7 +82,7 @@ COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" # should be set by now USE_FILEMON ?= no .if ${USE_FILEMON:tl} != "no" -.PATH: ${.CURDIR}/filemon +.PATH: ${srcdir}/filemon SRCS+= filemon_${USE_FILEMON}.c COPTS.meta.c+= -DUSE_FILEMON -DUSE_FILEMON_${USE_FILEMON:tu} COPTS.job.c+= ${COPTS.meta.c} diff --git a/devel/bmake/files/VERSION b/devel/bmake/files/VERSION index e8a5a49202a..58520e567ff 100644 --- a/devel/bmake/files/VERSION +++ b/devel/bmake/files/VERSION @@ -1,2 +1,2 @@ # keep this compatible with sh and make -_MAKE_VERSION=20200517 +_MAKE_VERSION=20200524 diff --git a/devel/bmake/files/aclocal.m4 b/devel/bmake/files/aclocal.m4 index 779f604b336..421e86d51b1 100644 --- a/devel/bmake/files/aclocal.m4 +++ b/devel/bmake/files/aclocal.m4 @@ -1,5 +1,5 @@ dnl RCSid: -dnl $Id: aclocal.m4,v 1.5 2020/05/24 11:09:43 nia Exp $ +dnl $Id: aclocal.m4,v 1.6 2020/05/24 21:10:17 nia Exp $ dnl dnl diff --git a/devel/bmake/files/arch.c b/devel/bmake/files/arch.c index 69646c4967e..e929402bf8e 100644 --- a/devel/bmake/files/arch.c +++ b/devel/bmake/files/arch.c @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.8 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.8 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia 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.8 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/bmake.1 b/devel/bmake/files/bmake.1 index e562df66d99..e30b5fce4c8 100644 --- a/devel/bmake/files/bmake.1 +++ b/devel/bmake/files/bmake.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: bmake.1,v 1.11 2020/05/24 11:09:43 nia Exp $ +.\" $NetBSD: bmake.1,v 1.12 2020/05/24 21:10:17 nia Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd April 27, 2020 +.Dd May 26, 2018 .Dt BMAKE 1 .Os .Sh NAME @@ -272,7 +272,7 @@ that do not depend on the target whose creation caused the error. .It Fl m Ar directory Specify a directory in which to search for sys.mk and makefiles included via the -.Li \&< Ns Ar file Ns Li \&> Ns -style +.Ao Ar file Ac Ns -style include statement. The .Fl m @@ -280,7 +280,7 @@ option can be used multiple times to form a search path. This path will override the default system include path: /usr/share/mk. Furthermore the system include path will be appended to the search path used for -.Li \*q Ns Ar file Ns Li \*q Ns -style +.Qo Ar file Qc Ns -style include statements (see the .Fl I option). @@ -1234,7 +1234,7 @@ Quotes every shell meta-character in the variable, and also doubles characters so that it can be passed safely through recursive invocations of .Nm . -This is equivalent to: +This is equivalent to: .Sq \&:S/\e\&$/&&/g:Q . .It Cm \&:R Replaces each word in the variable with everything but its suffix. @@ -1429,29 +1429,6 @@ is the substring of .Ar old_string to be replaced in .Ar new_string . -If only -.Ar old_string -contains the pattern matching character -.Ar % , -and -.Ar old_string -matches, then the result is the -.Ar new_string . -If only the -.Ar new_string -contains the pattern matching character -.Ar % , -then it is not treated specially and it is printed as a literal -.Ar % -on match. -If there is more than one pattern matching character -.Ar ( % ) -in either the -.Ar new_string -or -.Ar old_string , -only the first instance is treated specially (as the pattern character); -all subsequent instances are treated as regular characters .Pp Variable expansion occurs in the normal fashion inside both .Ar old_string @@ -1646,9 +1623,9 @@ dot .Pq Ql \&. character. Files are included with either -.Cm \&.include \&< Ns Ar file Ns Cm \&> +.Cm \&.include Aq Ar file or -.Cm \&.include \&\*q Ns Ar file Ns Cm \&\*q . +.Cm \&.include Pf \*q Ar file Ns \*q . Variables between the angle brackets or double quotes are expanded to form the file name. If angle brackets are used, the included makefile is expected to be in @@ -2329,13 +2306,13 @@ An incomplete list of changes in older versions of .Nm : .Pp The way that .for loop variables are substituted changed after -.Nx 5.0 +NetBSD 5.0 so that they still appear to be variable expansions. In particular this stops them being treated as syntax, and removes some obscure problems using them in .if statements. .Pp The way that parallel makes are scheduled changed in -.Nx 4.0 +NetBSD 4.0 so that .ORDER and .WAIT apply recursively to the dependent nodes. The algorithms used may change again in the future. .Ss Other make dialects @@ -2407,6 +2384,36 @@ portable. .Xr mkdep 1 .Sh HISTORY .Nm -is derived from NetBSD's +is derived from NetBSD .Xr make 1 . It uses autoconf to facilitate portability to other platforms. +.Pp +A +make +command appeared in +.At v7 . +This +make +implementation is based on Adam De Boor's pmake program which was written +for Sprite at Berkeley. +It was designed to be a parallel distributed make running jobs on different +machines using a daemon called +.Dq customs . +.Pp +Historically the target/dependency +.Dq FRC +has been used to FoRCe rebuilding (since the target/dependency +does not exist... unless someone creates an +.Dq FRC +file). +.Sh BUGS +The +make +syntax is difficult to parse without actually acting of the data. +For instance finding the end of a variable use should involve scanning each +the modifiers using the correct terminator for each field. +In many places +make +just counts {} and () in order to find the end of a variable expansion. +.Pp +There is no way of escaping a space character in a filename. diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap index ba30c7e2139..a23a20672e7 100755 --- a/devel/bmake/files/boot-strap +++ b/devel/bmake/files/boot-strap @@ -115,7 +115,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.13 2020/05/24 11:09:43 nia Exp $ +# $Id: boot-strap,v 1.14 2020/05/24 21:10:17 nia Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # diff --git a/devel/bmake/files/bsd.after-import.mk b/devel/bmake/files/bsd.after-import.mk index 532809b8136..158b220fc2a 100644 --- a/devel/bmake/files/bsd.after-import.mk +++ b/devel/bmake/files/bsd.after-import.mk @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.4 2020/05/24 11:09:43 nia Exp $ +# $Id: bsd.after-import.mk,v 1.5 2020/05/24 21:10:17 nia Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. diff --git a/devel/bmake/files/buf.c b/devel/bmake/files/buf.c index d14b7583bbf..391b47fd581 100644 --- a/devel/bmake/files/buf.c +++ b/devel/bmake/files/buf.c @@ -1,4 +1,4 @@ -/* $NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/buf.h b/devel/bmake/files/buf.h index a0b437e181c..1c4c1f8e976 100644 --- a/devel/bmake/files/buf.h +++ b/devel/bmake/files/buf.h @@ -1,4 +1,4 @@ -/* $NetBSD: buf.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: buf.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/compat.c b/devel/bmake/files/compat.c index a7659064064..91943b59bd5 100644 --- a/devel/bmake/files/compat.c +++ b/devel/bmake/files/compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.11 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: compat.c,v 1.12 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.11 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.12 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.11 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: compat.c,v 1.12 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/cond.c b/devel/bmake/files/cond.c index 275e38757dc..9c2d169b3c8 100644 --- a/devel/bmake/files/cond.c +++ b/devel/bmake/files/cond.c @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.9 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: cond.c,v 1.10 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: cond.c,v 1.9 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.10 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.9 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: cond.c,v 1.10 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/configure b/devel/bmake/files/configure index 74c7e10053f..8ee6bc196a8 100755 --- a/devel/bmake/files/configure +++ b/devel/bmake/files/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for bmake 20200418. +# Generated by GNU Autoconf 2.69 for bmake 20200524. # # Report bugs to <sjg@NetBSD.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bmake' PACKAGE_TARNAME='bmake' -PACKAGE_VERSION='20200418' -PACKAGE_STRING='bmake 20200418' +PACKAGE_VERSION='20200524' +PACKAGE_STRING='bmake 20200524' PACKAGE_BUGREPORT='sjg@NetBSD.org' PACKAGE_URL='' @@ -1254,7 +1254,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bmake 20200418 to adapt to many kinds of systems. +\`configure' configures bmake 20200524 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bmake 20200418:";; + short | recursive ) echo "Configuration of bmake 20200524:";; esac cat <<\_ACEOF @@ -1421,7 +1421,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bmake configure 20200418 +bmake configure 20200524 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2001,7 +2001,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bmake $as_me 20200418, which was +It was created by bmake $as_me 20200524, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4228,48 +4228,183 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : $as_echo_n "(cached) " >&6 else - ac_pattern="Autoconf.*'x'" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sgtty.h> -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* +#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} - if test $ac_cv_prog_gcc_traditional = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <termio.h> -Autoconf TCGETA +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + fi + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -6639,7 +6774,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bmake $as_me 20200418, which was +This file was extended by bmake $as_me 20200524, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6701,7 +6836,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bmake config.status 20200418 +bmake config.status 20200524 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/devel/bmake/files/configure.in b/devel/bmake/files/configure.in index 98c320a8b61..f66f771ed03 100644 --- a/devel/bmake/files/configure.in +++ b/devel/bmake/files/configure.in @@ -1,11 +1,11 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.15 2020/05/24 11:09:43 nia Exp $ +dnl $Id: configure.in,v 1.16 2020/05/24 21:10:17 nia Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20200418], [sjg@NetBSD.org]) +AC_INIT([bmake], [20200524], [sjg@NetBSD.org]) AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute @@ -100,7 +100,8 @@ dnl see _EXTENSIONS_ we use it. AC_USE_SYSTEM_EXTENSIONS dnl Checks for programs. AC_PROG_CC -AC_PROG_GCC_TRADITIONAL +AC_PROG_CC_C99 +dnl AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL dnl Executable suffix - normally empty; .exe on os2. AC_SUBST(ac_exe_suffix)dnl diff --git a/devel/bmake/files/dir.c b/devel/bmake/files/dir.c index 14531c2c7d4..09f366be5b6 100644 --- a/devel/bmake/files/dir.c +++ b/devel/bmake/files/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.7 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: dir.c,v 1.8 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: dir.c,v 1.7 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: dir.c,v 1.8 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: dir.c,v 1.7 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: dir.c,v 1.8 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/dir.h b/devel/bmake/files/dir.h index df6e74d947a..815e77d20ba 100644 --- a/devel/bmake/files/dir.h +++ b/devel/bmake/files/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: dir.h,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/dirname.c b/devel/bmake/files/dirname.c index f905aeeeb1d..e3b1d8e6ef6 100644 --- a/devel/bmake/files/dirname.c +++ b/devel/bmake/files/dirname.c @@ -1,4 +1,4 @@ -/* $NetBSD: dirname.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: dirname.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 1997, 2002 The NetBSD Foundation, Inc. @@ -36,10 +36,9 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: dirname.c,v 1.3 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: dirname.c,v 1.4 2020/05/24 21:10:17 nia Exp $"); #endif /* !LIBC_SCCS && !lint */ -#include "namespace.h" #include <sys/param.h> #ifdef HAVE_LIBGEN_H #include <libgen.h> diff --git a/devel/bmake/files/for.c b/devel/bmake/files/for.c index 6c3e14fbf66..b33c493bca6 100644 --- a/devel/bmake/files/for.c +++ b/devel/bmake/files/for.c @@ -1,4 +1,4 @@ -/* $NetBSD: for.c,v 1.8 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: for.c,v 1.9 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1992, The Regents of the University of California. @@ -30,14 +30,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: for.c,v 1.8 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: for.c,v 1.9 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)for.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: for.c,v 1.8 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: for.c,v 1.9 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/getopt.c b/devel/bmake/files/getopt.c index c83c6ec8c62..300ceda7a0e 100644 --- a/devel/bmake/files/getopt.c +++ b/devel/bmake/files/getopt.c @@ -1,4 +1,4 @@ -/* $NetBSD: getopt.c,v 1.4 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: getopt.c,v 1.5 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1987, 1993, 1994 diff --git a/devel/bmake/files/hash.c b/devel/bmake/files/hash.c index 45e5ef6625d..2a12caa5214 100644 --- a/devel/bmake/files/hash.c +++ b/devel/bmake/files/hash.c @@ -1,4 +1,4 @@ -/* $NetBSD: hash.c,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: hash.c,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: hash.c,v 1.6 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: hash.c,v 1.7 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: hash.c,v 1.6 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: hash.c,v 1.7 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/hash.h b/devel/bmake/files/hash.h index cdcf4e1c352..1545f711a14 100644 --- a/devel/bmake/files/hash.h +++ b/devel/bmake/files/hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: hash.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: hash.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/install-sh b/devel/bmake/files/install-sh index cf654769ad6..d68fd8f6040 100755 --- a/devel/bmake/files/install-sh +++ b/devel/bmake/files/install-sh @@ -53,7 +53,7 @@ # # RCSid: -# $Id: install-sh,v 1.4 2020/05/24 11:09:43 nia Exp $ +# $Id: install-sh,v 1.5 2020/05/24 21:10:17 nia Exp $ # # @(#) Copyright (c) 1993 Simon J. Gerraty # diff --git a/devel/bmake/files/job.c b/devel/bmake/files/job.c index 203d5a59cf7..22cd18cbd15 100644 --- a/devel/bmake/files/job.c +++ b/devel/bmake/files/job.c @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.19 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: job.c,v 1.20 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.19 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.20 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.19 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: job.c,v 1.20 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/job.h b/devel/bmake/files/job.h index 4b68009c2d0..1f3e72d8553 100644 --- a/devel/bmake/files/job.h +++ b/devel/bmake/files/job.h @@ -1,4 +1,4 @@ -/* $NetBSD: job.h,v 1.9 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: job.h,v 1.10 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/lst.h b/devel/bmake/files/lst.h index a9644e1442e..79c248fd7e5 100644 --- a/devel/bmake/files/lst.h +++ b/devel/bmake/files/lst.h @@ -1,4 +1,4 @@ -/* $NetBSD: lst.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: lst.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/machine.sh b/devel/bmake/files/machine.sh index 395b80a9fa7..1c230bce410 100755 --- a/devel/bmake/files/machine.sh +++ b/devel/bmake/files/machine.sh @@ -2,7 +2,7 @@ # derrived from /etc/rc_d/os.sh # RCSid: -# $Id: machine.sh,v 1.12 2020/05/24 11:09:43 nia Exp $ +# $Id: machine.sh,v 1.13 2020/05/24 21:10:17 nia Exp $ # # @(#) Copyright (c) 1994-2002 Simon J. Gerraty # diff --git a/devel/bmake/files/main.c b/devel/bmake/files/main.c index b6148a55e32..e5e89364301 100644 --- a/devel/bmake/files/main.c +++ b/devel/bmake/files/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.15 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: main.c,v 1.16 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.15 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.16 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.15 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: main.c,v 1.16 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/make-conf.h b/devel/bmake/files/make-conf.h index 20957af45dc..0d184c4b31b 100644 --- a/devel/bmake/files/make-conf.h +++ b/devel/bmake/files/make-conf.h @@ -1,4 +1,4 @@ -/* $NetBSD: make-conf.h,v 1.4 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: make-conf.h,v 1.5 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/make.c b/devel/bmake/files/make.c index d9ba8d1b53a..4fc288fe09d 100644 --- a/devel/bmake/files/make.c +++ b/devel/bmake/files/make.c @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.7 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: make.c,v 1.8 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.7 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.8 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.7 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: make.c,v 1.8 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/make.h b/devel/bmake/files/make.h index c0c2423463f..f125126b8d5 100644 --- a/devel/bmake/files/make.h +++ b/devel/bmake/files/make.h @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.10 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: make.h,v 1.11 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/make_malloc.c b/devel/bmake/files/make_malloc.c index 51501fcd4d3..7b682540e3d 100644 --- a/devel/bmake/files/make_malloc.c +++ b/devel/bmake/files/make_malloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: make_malloc.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: make_malloc.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ #ifdef MAKE_NATIVE #include <sys/cdefs.h> -__RCSID("$NetBSD: make_malloc.c,v 1.3 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: make_malloc.c,v 1.4 2020/05/24 21:10:17 nia Exp $"); #endif #include <stdio.h> diff --git a/devel/bmake/files/make_malloc.h b/devel/bmake/files/make_malloc.h index f90dc1aaf8c..bc3937d38db 100644 --- a/devel/bmake/files/make_malloc.h +++ b/devel/bmake/files/make_malloc.h @@ -1,4 +1,4 @@ -/* $NetBSD: make_malloc.h,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: make_malloc.h,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. diff --git a/devel/bmake/files/makefile.in b/devel/bmake/files/makefile.in index ea379dca1ce..1d73240d390 100644 --- a/devel/bmake/files/makefile.in +++ b/devel/bmake/files/makefile.in @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.3 2020/05/24 11:09:43 nia Exp $ +# $Id: makefile.in,v 1.4 2020/05/24 21:10:17 nia Exp $ # a simple makefile for those who don't like anything beyond: # ./configure; make; make install diff --git a/devel/bmake/files/meta.c b/devel/bmake/files/meta.c index ad27defbb99..ed593802c06 100644 --- a/devel/bmake/files/meta.c +++ b/devel/bmake/files/meta.c @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.4 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: meta.c,v 1.5 2020/05/24 21:10:17 nia Exp $ */ /* * Implement 'meta' mode. diff --git a/devel/bmake/files/meta.h b/devel/bmake/files/meta.h index 497ea91000b..0504eec3d76 100644 --- a/devel/bmake/files/meta.h +++ b/devel/bmake/files/meta.h @@ -1,4 +1,4 @@ -/* $NetBSD: meta.h,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: meta.h,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /* * Things needed for 'meta' mode. diff --git a/devel/bmake/files/metachar.c b/devel/bmake/files/metachar.c index 7c4ba43851d..20fa0634a4b 100644 --- a/devel/bmake/files/metachar.c +++ b/devel/bmake/files/metachar.c @@ -1,4 +1,4 @@ -/* $NetBSD: metachar.c,v 1.2 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: metachar.c,v 1.3 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #endif #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: metachar.c,v 1.2 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: metachar.c,v 1.3 2020/05/24 21:10:17 nia Exp $"); #endif #include "metachar.h" diff --git a/devel/bmake/files/metachar.h b/devel/bmake/files/metachar.h index 874119bf158..9bed994e821 100644 --- a/devel/bmake/files/metachar.h +++ b/devel/bmake/files/metachar.h @@ -1,4 +1,4 @@ -/* $NetBSD: metachar.h,v 1.2 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: metachar.h,v 1.3 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. diff --git a/devel/bmake/files/mkdeps.sh b/devel/bmake/files/mkdeps.sh index 0c356435561..132b3e66449 100755 --- a/devel/bmake/files/mkdeps.sh +++ b/devel/bmake/files/mkdeps.sh @@ -40,7 +40,7 @@ # # RCSid: -# $Id: mkdeps.sh,v 1.4 2020/05/24 11:09:43 nia Exp $ +# $Id: mkdeps.sh,v 1.5 2020/05/24 21:10:17 nia Exp $ # # @(#) Copyright (c) 1993 Simon J. Gerraty # diff --git a/devel/bmake/files/nonints.h b/devel/bmake/files/nonints.h index 45071a06950..157c1a6bc10 100644 --- a/devel/bmake/files/nonints.h +++ b/devel/bmake/files/nonints.h @@ -1,4 +1,4 @@ -/* $NetBSD: nonints.h,v 1.9 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: nonints.h,v 1.10 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/os.sh b/devel/bmake/files/os.sh index 4e08095f050..70a27a272a4 100644 --- a/devel/bmake/files/os.sh +++ b/devel/bmake/files/os.sh @@ -17,7 +17,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: os.sh,v 1.12 2020/05/24 11:09:43 nia Exp $ +# $Id: os.sh,v 1.13 2020/05/24 21:10:17 nia Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # diff --git a/devel/bmake/files/parse.c b/devel/bmake/files/parse.c index 22a8185c5da..809d14bd488 100644 --- a/devel/bmake/files/parse.c +++ b/devel/bmake/files/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.11 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: parse.c,v 1.12 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.11 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.12 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.11 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: parse.c,v 1.12 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/pathnames.h b/devel/bmake/files/pathnames.h index 0a33981c7dc..64852f9dc63 100644 --- a/devel/bmake/files/pathnames.h +++ b/devel/bmake/files/pathnames.h @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: pathnames.h,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1990, 1993 @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.6 2020/05/24 11:09:43 nia Exp $ + * $Id: pathnames.h,v 1.7 2020/05/24 21:10:17 nia Exp $ */ #if HAVE_CONFIG_H diff --git a/devel/bmake/files/ranlib.h b/devel/bmake/files/ranlib.h index ca89ea39b47..3caacae6332 100644 --- a/devel/bmake/files/ranlib.h +++ b/devel/bmake/files/ranlib.h @@ -1,5 +1,5 @@ /* @(#)ranlib.h 1.6 88/08/19 SMI; from UCB 4.1 83/05/03 */ -/* $Id: ranlib.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */ +/* $Id: ranlib.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */ /* * Structure of the __.SYMDEF table of contents for an archive. diff --git a/devel/bmake/files/realpath.c b/devel/bmake/files/realpath.c index 1cf4b3e2487..1944b1f8c50 100644 --- a/devel/bmake/files/realpath.c +++ b/devel/bmake/files/realpath.c @@ -1,5 +1,5 @@ -/* $Id: realpath.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ -/* from: $NetBSD: realpath.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $Id: realpath.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ +/* from: $NetBSD: realpath.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1995 diff --git a/devel/bmake/files/setenv.c b/devel/bmake/files/setenv.c index 85af1f17e50..32bc42d8fbc 100644 --- a/devel/bmake/files/setenv.c +++ b/devel/bmake/files/setenv.c @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)setenv.c 5.6 (Berkeley) 6/4/91";*/ -static char *rcsid = "$Id: setenv.c,v 1.4 2020/05/24 11:09:43 nia Exp $"; +static char *rcsid = "$Id: setenv.c,v 1.5 2020/05/24 21:10:17 nia Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stddef.h> diff --git a/devel/bmake/files/sigcompat.c b/devel/bmake/files/sigcompat.c index 98e5d5d9edd..29cdaa2a575 100644 --- a/devel/bmake/files/sigcompat.c +++ b/devel/bmake/files/sigcompat.c @@ -104,7 +104,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)sigcompat.c 5.3 (Berkeley) 2/24/91";*/ -static char *rcsid = "$Id: sigcompat.c,v 1.7 2020/05/24 11:09:43 nia Exp $"; +static char *rcsid = "$Id: sigcompat.c,v 1.8 2020/05/24 21:10:17 nia Exp $"; #endif /* LIBC_SCCS and not lint */ #undef signal diff --git a/devel/bmake/files/sprite.h b/devel/bmake/files/sprite.h index beb6879ea6e..21cfc88dd9e 100644 --- a/devel/bmake/files/sprite.h +++ b/devel/bmake/files/sprite.h @@ -1,4 +1,4 @@ -/* $NetBSD: sprite.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: sprite.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/str.c b/devel/bmake/files/str.c index 87f551f2c66..be7c61d4f8d 100644 --- a/devel/bmake/files/str.c +++ b/devel/bmake/files/str.c @@ -1,4 +1,4 @@ -/* $NetBSD: str.c,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: str.c,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: str.c,v 1.6 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: str.c,v 1.7 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90"; #else -__RCSID("$NetBSD: str.c,v 1.6 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: str.c,v 1.7 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/stresep.c b/devel/bmake/files/stresep.c index 9b73eb06f6b..a181b0711ed 100644 --- a/devel/bmake/files/stresep.c +++ b/devel/bmake/files/stresep.c @@ -1,4 +1,4 @@ -/* $NetBSD: stresep.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: stresep.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 1990, 1993 diff --git a/devel/bmake/files/strlcpy.c b/devel/bmake/files/strlcpy.c index 4682990375f..2922203ad9c 100644 --- a/devel/bmake/files/strlcpy.c +++ b/devel/bmake/files/strlcpy.c @@ -1,4 +1,4 @@ -/* $NetBSD: strlcpy.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: strlcpy.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */ /* diff --git a/devel/bmake/files/strlist.c b/devel/bmake/files/strlist.c index be67a7656ae..3a368220e8e 100644 --- a/devel/bmake/files/strlist.c +++ b/devel/bmake/files/strlist.c @@ -1,4 +1,4 @@ -/* $NetBSD: strlist.c,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: strlist.c,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2008 - 2009 The NetBSD Foundation, Inc. @@ -33,11 +33,11 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: strlist.c,v 1.3 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: strlist.c,v 1.4 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: strlist.c,v 1.3 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: strlist.c,v 1.4 2020/05/24 21:10:17 nia Exp $"); #endif /* not lint */ #endif diff --git a/devel/bmake/files/strlist.h b/devel/bmake/files/strlist.h index 99d6a41f802..84a81eab514 100644 --- a/devel/bmake/files/strlist.h +++ b/devel/bmake/files/strlist.h @@ -1,4 +1,4 @@ -/* $NetBSD: strlist.h,v 1.3 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: strlist.h,v 1.4 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2008 - 2009 The NetBSD Foundation, Inc. diff --git a/devel/bmake/files/suff.c b/devel/bmake/files/suff.c index f396b7a1d8a..b8260bafa7a 100644 --- a/devel/bmake/files/suff.c +++ b/devel/bmake/files/suff.c @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: suff.c,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.6 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.7 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.6 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: suff.c,v 1.7 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/targ.c b/devel/bmake/files/targ.c index 3649c13b19c..9471468857c 100644 --- a/devel/bmake/files/targ.c +++ b/devel/bmake/files/targ.c @@ -1,4 +1,4 @@ -/* $NetBSD: targ.c,v 1.7 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: targ.c,v 1.8 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: targ.c,v 1.7 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: targ.c,v 1.8 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: targ.c,v 1.7 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: targ.c,v 1.8 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/trace.c b/devel/bmake/files/trace.c index cf8eb3f52c2..f9ae7fbb5e3 100644 --- a/devel/bmake/files/trace.c +++ b/devel/bmake/files/trace.c @@ -1,4 +1,4 @@ -/* $NetBSD: trace.c,v 1.7 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: trace.c,v 1.8 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,11 +31,11 @@ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: trace.c,v 1.7 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: trace.c,v 1.8 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: trace.c,v 1.7 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: trace.c,v 1.8 2020/05/24 21:10:17 nia Exp $"); #endif /* not lint */ #endif diff --git a/devel/bmake/files/trace.h b/devel/bmake/files/trace.h index 0f8614b5427..c8332f2bed1 100644 --- a/devel/bmake/files/trace.h +++ b/devel/bmake/files/trace.h @@ -1,4 +1,4 @@ -/* $NetBSD: trace.h,v 1.6 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: trace.h,v 1.7 2020/05/24 21:10:17 nia Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. diff --git a/devel/bmake/files/util.c b/devel/bmake/files/util.c index 1d0c1e14cd9..ffbb3d68236 100644 --- a/devel/bmake/files/util.c +++ b/devel/bmake/files/util.c @@ -1,9 +1,9 @@ -/* $NetBSD: util.c,v 1.15 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: util.c,v 1.16 2020/05/24 21:10:17 nia Exp $ */ /* * Missing stuff from OS's * - * $Id: util.c,v 1.15 2020/05/24 11:09:43 nia Exp $ + * $Id: util.c,v 1.16 2020/05/24 21:10:17 nia Exp $ */ #if defined(__MINT__) || defined(__linux__) #include <signal.h> @@ -12,10 +12,10 @@ #include "make.h" #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: util.c,v 1.15 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: util.c,v 1.16 2020/05/24 21:10:17 nia Exp $"; #else #ifndef lint -__RCSID("$NetBSD: util.c,v 1.15 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: util.c,v 1.16 2020/05/24 21:10:17 nia Exp $"); #endif #endif diff --git a/devel/bmake/files/var.c b/devel/bmake/files/var.c index b73ff49fa0b..726704c0211 100644 --- a/devel/bmake/files/var.c +++ b/devel/bmake/files/var.c @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.11 2020/05/24 11:09:43 nia Exp $ */ +/* $NetBSD: var.c,v 1.12 2020/05/24 21:10:17 nia Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.11 2020/05/24 11:09:43 nia Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.12 2020/05/24 21:10:17 nia Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.11 2020/05/24 11:09:43 nia Exp $"); +__RCSID("$NetBSD: var.c,v 1.12 2020/05/24 21:10:17 nia Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/wait.h b/devel/bmake/files/wait.h index 890554ac2f0..1a6652f378f 100644 --- a/devel/bmake/files/wait.h +++ b/devel/bmake/files/wait.h @@ -6,7 +6,7 @@ */ /* * RCSid: - * $Id: wait.h,v 1.4 2020/05/24 11:09:43 nia Exp $ + * $Id: wait.h,v 1.5 2020/05/24 21:10:17 nia Exp $ * * @(#)Copyright (c) 1994, Simon J. Gerraty. * |