CVS commit: pkgsrc/devel/bmake

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May 24 21:10:17 UTC 2020

Modified Files:
        pkgsrc/devel/bmake: Makefile
        pkgsrc/devel/bmake/files: ChangeLog Makefile VERSION aclocal.m4 arch.c
            bmake.1 boot-strap bsd.after-import.mk buf.c buf.h compat.c cond.c
            configure configure.in dir.c dir.h dirname.c for.c getopt.c hash.c
            hash.h install-sh job.c job.h lst.h machine.sh main.c make-conf.h
            make.c make.h make_malloc.c make_malloc.h makefile.in meta.c meta.h
            metachar.c metachar.h mkdeps.sh nonints.h os.sh parse.c pathnames.h
            ranlib.h realpath.c setenv.c sigcompat.c sprite.h str.c stresep.c
            strlcpy.c strlist.c strlist.h suff.c targ.c trace.c trace.h util.c
            var.c wait.h

Log Message:
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@localhost>

        * configure.in: add AC_PROG_CC_C99 for mipspro compiler
        * dirname.c: remove include of namespace.h


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/devel/bmake/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/bmake/files/ChangeLog \
    pkgsrc/devel/bmake/files/boot-strap
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/bmake/files/Makefile \
    pkgsrc/devel/bmake/files/bsd.after-import.mk \
    pkgsrc/devel/bmake/files/getopt.c pkgsrc/devel/bmake/files/install-sh \
    pkgsrc/devel/bmake/files/make-conf.h pkgsrc/devel/bmake/files/meta.c \
    pkgsrc/devel/bmake/files/mkdeps.sh pkgsrc/devel/bmake/files/setenv.c \
    pkgsrc/devel/bmake/files/wait.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/bmake/files/VERSION \
    pkgsrc/devel/bmake/files/metachar.c pkgsrc/devel/bmake/files/metachar.h
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/bmake/files/aclocal.m4 \
    pkgsrc/devel/bmake/files/buf.h pkgsrc/devel/bmake/files/hash.h \
    pkgsrc/devel/bmake/files/lst.h pkgsrc/devel/bmake/files/ranlib.h \
    pkgsrc/devel/bmake/files/sprite.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/bmake/files/arch.c \
    pkgsrc/devel/bmake/files/for.c
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/bmake/files/bmake.1 \
    pkgsrc/devel/bmake/files/compat.c pkgsrc/devel/bmake/files/parse.c \
    pkgsrc/devel/bmake/files/var.c
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/bmake/files/buf.c \
    pkgsrc/devel/bmake/files/dir.h pkgsrc/devel/bmake/files/hash.c \
    pkgsrc/devel/bmake/files/pathnames.h pkgsrc/devel/bmake/files/str.c \
    pkgsrc/devel/bmake/files/suff.c pkgsrc/devel/bmake/files/trace.h
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/bmake/files/cond.c \
    pkgsrc/devel/bmake/files/job.h pkgsrc/devel/bmake/files/nonints.h
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/bmake/files/configure
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/bmake/files/configure.in \
    pkgsrc/devel/bmake/files/main.c pkgsrc/devel/bmake/files/util.c
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/bmake/files/dir.c \
    pkgsrc/devel/bmake/files/make.c pkgsrc/devel/bmake/files/sigcompat.c \
    pkgsrc/devel/bmake/files/targ.c pkgsrc/devel/bmake/files/trace.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/bmake/files/dirname.c \
    pkgsrc/devel/bmake/files/make_malloc.c \
    pkgsrc/devel/bmake/files/make_malloc.h \
    pkgsrc/devel/bmake/files/makefile.in pkgsrc/devel/bmake/files/meta.h \
    pkgsrc/devel/bmake/files/realpath.c pkgsrc/devel/bmake/files/stresep.c \
    pkgsrc/devel/bmake/files/strlcpy.c pkgsrc/devel/bmake/files/strlist.c \
    pkgsrc/devel/bmake/files/strlist.h
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/bmake/files/job.c
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/bmake/files/machine.sh \
    pkgsrc/devel/bmake/files/os.sh
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/bmake/files/make.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/bmake/Makefile
diff -u pkgsrc/devel/bmake/Makefile:1.74 pkgsrc/devel/bmake/Makefile:1.75
--- pkgsrc/devel/bmake/Makefile:1.74    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/Makefile Sun May 24 21:10:17 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2020/05/24 11:09:43 nia Exp $
+# $NetBSD: Makefile,v 1.75 2020/05/24 21:10:17 nia Exp $
 
-DISTNAME=      bmake-20200517
+DISTNAME=      bmake-20200524
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Index: pkgsrc/devel/bmake/files/ChangeLog
diff -u pkgsrc/devel/bmake/files/ChangeLog:1.13 pkgsrc/devel/bmake/files/ChangeLog:1.14
--- pkgsrc/devel/bmake/files/ChangeLog:1.13     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/ChangeLog  Sun May 24 21:10:17 2020
@@ -1,3 +1,8 @@
+2020-05-24  Simon J Gerraty  <sjg%beast.crufty.net@localhost>
+
+       * 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@localhost>
 
        * VERSION (_MAKE_VERSION): 20200517
Index: pkgsrc/devel/bmake/files/boot-strap
diff -u pkgsrc/devel/bmake/files/boot-strap:1.13 pkgsrc/devel/bmake/files/boot-strap:1.14
--- pkgsrc/devel/bmake/files/boot-strap:1.13    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/boot-strap Sun May 24 21:10:17 2020
@@ -115,7 +115,7 @@
 #      Simon J. Gerraty <sjg%crufty.net@localhost>
 
 # 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
 #

Index: pkgsrc/devel/bmake/files/Makefile
diff -u pkgsrc/devel/bmake/files/Makefile:1.4 pkgsrc/devel/bmake/files/Makefile:1.5
--- pkgsrc/devel/bmake/files/Makefile:1.4       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/Makefile   Sun May 24 21:10:17 2020
@@ -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
 # 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}
Index: pkgsrc/devel/bmake/files/bsd.after-import.mk
diff -u pkgsrc/devel/bmake/files/bsd.after-import.mk:1.4 pkgsrc/devel/bmake/files/bsd.after-import.mk:1.5
--- pkgsrc/devel/bmake/files/bsd.after-import.mk:1.4    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/bsd.after-import.mk        Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/getopt.c
diff -u pkgsrc/devel/bmake/files/getopt.c:1.4 pkgsrc/devel/bmake/files/getopt.c:1.5
--- pkgsrc/devel/bmake/files/getopt.c:1.4       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/getopt.c   Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/install-sh
diff -u pkgsrc/devel/bmake/files/install-sh:1.4 pkgsrc/devel/bmake/files/install-sh:1.5
--- pkgsrc/devel/bmake/files/install-sh:1.4     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/install-sh Sun May 24 21:10:17 2020
@@ -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
 #
Index: pkgsrc/devel/bmake/files/make-conf.h
diff -u pkgsrc/devel/bmake/files/make-conf.h:1.4 pkgsrc/devel/bmake/files/make-conf.h:1.5
--- pkgsrc/devel/bmake/files/make-conf.h:1.4    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/make-conf.h        Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/meta.c
diff -u pkgsrc/devel/bmake/files/meta.c:1.4 pkgsrc/devel/bmake/files/meta.c:1.5
--- pkgsrc/devel/bmake/files/meta.c:1.4 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/meta.c     Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/mkdeps.sh
diff -u pkgsrc/devel/bmake/files/mkdeps.sh:1.4 pkgsrc/devel/bmake/files/mkdeps.sh:1.5
--- pkgsrc/devel/bmake/files/mkdeps.sh:1.4      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/mkdeps.sh  Sun May 24 21:10:17 2020
@@ -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
 #
Index: pkgsrc/devel/bmake/files/setenv.c
diff -u pkgsrc/devel/bmake/files/setenv.c:1.4 pkgsrc/devel/bmake/files/setenv.c:1.5
--- pkgsrc/devel/bmake/files/setenv.c:1.4       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/setenv.c   Sun May 24 21:10:17 2020
@@ -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>
Index: pkgsrc/devel/bmake/files/wait.h
diff -u pkgsrc/devel/bmake/files/wait.h:1.4 pkgsrc/devel/bmake/files/wait.h:1.5
--- pkgsrc/devel/bmake/files/wait.h:1.4 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/wait.h     Sun May 24 21:10:17 2020
@@ -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.
  *      

Index: pkgsrc/devel/bmake/files/VERSION
diff -u pkgsrc/devel/bmake/files/VERSION:1.2 pkgsrc/devel/bmake/files/VERSION:1.3
--- pkgsrc/devel/bmake/files/VERSION:1.2        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/VERSION    Sun May 24 21:10:17 2020
@@ -1,2 +1,2 @@
 # keep this compatible with sh and make
-_MAKE_VERSION=20200517
+_MAKE_VERSION=20200524
Index: pkgsrc/devel/bmake/files/metachar.c
diff -u pkgsrc/devel/bmake/files/metachar.c:1.2 pkgsrc/devel/bmake/files/metachar.c:1.3
--- pkgsrc/devel/bmake/files/metachar.c:1.2     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/metachar.c Sun May 24 21:10:17 2020
@@ -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"
Index: pkgsrc/devel/bmake/files/metachar.h
diff -u pkgsrc/devel/bmake/files/metachar.h:1.2 pkgsrc/devel/bmake/files/metachar.h:1.3
--- pkgsrc/devel/bmake/files/metachar.h:1.2     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/metachar.h Sun May 24 21:10:17 2020
@@ -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.

Index: pkgsrc/devel/bmake/files/aclocal.m4
diff -u pkgsrc/devel/bmake/files/aclocal.m4:1.5 pkgsrc/devel/bmake/files/aclocal.m4:1.6
--- pkgsrc/devel/bmake/files/aclocal.m4:1.5     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/aclocal.m4 Sun May 24 21:10:17 2020
@@ -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 
Index: pkgsrc/devel/bmake/files/buf.h
diff -u pkgsrc/devel/bmake/files/buf.h:1.5 pkgsrc/devel/bmake/files/buf.h:1.6
--- pkgsrc/devel/bmake/files/buf.h:1.5  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/buf.h      Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/hash.h
diff -u pkgsrc/devel/bmake/files/hash.h:1.5 pkgsrc/devel/bmake/files/hash.h:1.6
--- pkgsrc/devel/bmake/files/hash.h:1.5 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/hash.h     Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/lst.h
diff -u pkgsrc/devel/bmake/files/lst.h:1.5 pkgsrc/devel/bmake/files/lst.h:1.6
--- pkgsrc/devel/bmake/files/lst.h:1.5  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/lst.h      Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/ranlib.h
diff -u pkgsrc/devel/bmake/files/ranlib.h:1.5 pkgsrc/devel/bmake/files/ranlib.h:1.6
--- pkgsrc/devel/bmake/files/ranlib.h:1.5       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/ranlib.h   Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/sprite.h
diff -u pkgsrc/devel/bmake/files/sprite.h:1.5 pkgsrc/devel/bmake/files/sprite.h:1.6
--- pkgsrc/devel/bmake/files/sprite.h:1.5       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/sprite.h   Sun May 24 21:10:17 2020
@@ -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

Index: pkgsrc/devel/bmake/files/arch.c
diff -u pkgsrc/devel/bmake/files/arch.c:1.8 pkgsrc/devel/bmake/files/arch.c:1.9
--- pkgsrc/devel/bmake/files/arch.c:1.8 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/arch.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/for.c
diff -u pkgsrc/devel/bmake/files/for.c:1.8 pkgsrc/devel/bmake/files/for.c:1.9
--- pkgsrc/devel/bmake/files/for.c:1.8  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/for.c      Sun May 24 21:10:17 2020
@@ -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

Index: pkgsrc/devel/bmake/files/bmake.1
diff -u pkgsrc/devel/bmake/files/bmake.1:1.11 pkgsrc/devel/bmake/files/bmake.1:1.12
--- pkgsrc/devel/bmake/files/bmake.1:1.11       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/bmake.1    Sun May 24 21:10:17 2020
@@ -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 c
 .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 for
 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
 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 v
 .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.
Index: pkgsrc/devel/bmake/files/compat.c
diff -u pkgsrc/devel/bmake/files/compat.c:1.11 pkgsrc/devel/bmake/files/compat.c:1.12
--- pkgsrc/devel/bmake/files/compat.c:1.11      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/compat.c   Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/parse.c
diff -u pkgsrc/devel/bmake/files/parse.c:1.11 pkgsrc/devel/bmake/files/parse.c:1.12
--- pkgsrc/devel/bmake/files/parse.c:1.11       Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/parse.c    Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/var.c
diff -u pkgsrc/devel/bmake/files/var.c:1.11 pkgsrc/devel/bmake/files/var.c:1.12
--- pkgsrc/devel/bmake/files/var.c:1.11 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/var.c      Sun May 24 21:10:17 2020
@@ -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

Index: pkgsrc/devel/bmake/files/buf.c
diff -u pkgsrc/devel/bmake/files/buf.c:1.6 pkgsrc/devel/bmake/files/buf.c:1.7
--- pkgsrc/devel/bmake/files/buf.c:1.6  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/buf.c      Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/dir.h
diff -u pkgsrc/devel/bmake/files/dir.h:1.6 pkgsrc/devel/bmake/files/dir.h:1.7
--- pkgsrc/devel/bmake/files/dir.h:1.6  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/dir.h      Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/hash.c
diff -u pkgsrc/devel/bmake/files/hash.c:1.6 pkgsrc/devel/bmake/files/hash.c:1.7
--- pkgsrc/devel/bmake/files/hash.c:1.6 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/hash.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/pathnames.h
diff -u pkgsrc/devel/bmake/files/pathnames.h:1.6 pkgsrc/devel/bmake/files/pathnames.h:1.7
--- pkgsrc/devel/bmake/files/pathnames.h:1.6    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/pathnames.h        Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/str.c
diff -u pkgsrc/devel/bmake/files/str.c:1.6 pkgsrc/devel/bmake/files/str.c:1.7
--- pkgsrc/devel/bmake/files/str.c:1.6  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/str.c      Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/suff.c
diff -u pkgsrc/devel/bmake/files/suff.c:1.6 pkgsrc/devel/bmake/files/suff.c:1.7
--- pkgsrc/devel/bmake/files/suff.c:1.6 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/suff.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/trace.h
diff -u pkgsrc/devel/bmake/files/trace.h:1.6 pkgsrc/devel/bmake/files/trace.h:1.7
--- pkgsrc/devel/bmake/files/trace.h:1.6        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/trace.h    Sun May 24 21:10:17 2020
@@ -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.

Index: pkgsrc/devel/bmake/files/cond.c
diff -u pkgsrc/devel/bmake/files/cond.c:1.9 pkgsrc/devel/bmake/files/cond.c:1.10
--- pkgsrc/devel/bmake/files/cond.c:1.9 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/cond.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/job.h
diff -u pkgsrc/devel/bmake/files/job.h:1.9 pkgsrc/devel/bmake/files/job.h:1.10
--- pkgsrc/devel/bmake/files/job.h:1.9  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/job.h      Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/nonints.h
diff -u pkgsrc/devel/bmake/files/nonints.h:1.9 pkgsrc/devel/bmake/files/nonints.h:1.10
--- pkgsrc/devel/bmake/files/nonints.h:1.9      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/nonints.h  Sun May 24 21:10:17 2020
@@ -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

Index: pkgsrc/devel/bmake/files/configure
diff -u pkgsrc/devel/bmake/files/configure:1.17 pkgsrc/devel/bmake/files/configure:1.18
--- pkgsrc/devel/bmake/files/configure:1.17     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/configure  Sun May 24 21:10:17 2020
@@ -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@localhost>.
 #
@@ -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@localhost'
 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 con
 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);
+}
+
+// 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;
 
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
+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_wri
 # 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\\"
 

Index: pkgsrc/devel/bmake/files/configure.in
diff -u pkgsrc/devel/bmake/files/configure.in:1.15 pkgsrc/devel/bmake/files/configure.in:1.16
--- pkgsrc/devel/bmake/files/configure.in:1.15  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/configure.in       Sun May 24 21:10:17 2020
@@ -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@localhost])
+AC_INIT([bmake], [20200524], [sjg%NetBSD.org@localhost])
 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
Index: pkgsrc/devel/bmake/files/main.c
diff -u pkgsrc/devel/bmake/files/main.c:1.15 pkgsrc/devel/bmake/files/main.c:1.16
--- pkgsrc/devel/bmake/files/main.c:1.15        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/main.c     Sun May 24 21:10:17 2020
@@ -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, 19
 #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
Index: pkgsrc/devel/bmake/files/util.c
diff -u pkgsrc/devel/bmake/files/util.c:1.15 pkgsrc/devel/bmake/files/util.c:1.16
--- pkgsrc/devel/bmake/files/util.c:1.15        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/util.c     Sun May 24 21:10:17 2020
@@ -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
 

Index: pkgsrc/devel/bmake/files/dir.c
diff -u pkgsrc/devel/bmake/files/dir.c:1.7 pkgsrc/devel/bmake/files/dir.c:1.8
--- pkgsrc/devel/bmake/files/dir.c:1.7  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/dir.c      Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/make.c
diff -u pkgsrc/devel/bmake/files/make.c:1.7 pkgsrc/devel/bmake/files/make.c:1.8
--- pkgsrc/devel/bmake/files/make.c:1.7 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/make.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/sigcompat.c
diff -u pkgsrc/devel/bmake/files/sigcompat.c:1.7 pkgsrc/devel/bmake/files/sigcompat.c:1.8
--- pkgsrc/devel/bmake/files/sigcompat.c:1.7    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/sigcompat.c        Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/targ.c
diff -u pkgsrc/devel/bmake/files/targ.c:1.7 pkgsrc/devel/bmake/files/targ.c:1.8
--- pkgsrc/devel/bmake/files/targ.c:1.7 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/targ.c     Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/trace.c
diff -u pkgsrc/devel/bmake/files/trace.c:1.7 pkgsrc/devel/bmake/files/trace.c:1.8
--- pkgsrc/devel/bmake/files/trace.c:1.7        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/trace.c    Sun May 24 21:10:17 2020
@@ -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
 

Index: pkgsrc/devel/bmake/files/dirname.c
diff -u pkgsrc/devel/bmake/files/dirname.c:1.3 pkgsrc/devel/bmake/files/dirname.c:1.4
--- pkgsrc/devel/bmake/files/dirname.c:1.3      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/dirname.c  Sun May 24 21:10:17 2020
@@ -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>
Index: pkgsrc/devel/bmake/files/make_malloc.c
diff -u pkgsrc/devel/bmake/files/make_malloc.c:1.3 pkgsrc/devel/bmake/files/make_malloc.c:1.4
--- pkgsrc/devel/bmake/files/make_malloc.c:1.3  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/make_malloc.c      Sun May 24 21:10:17 2020
@@ -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>
Index: pkgsrc/devel/bmake/files/make_malloc.h
diff -u pkgsrc/devel/bmake/files/make_malloc.h:1.3 pkgsrc/devel/bmake/files/make_malloc.h:1.4
--- pkgsrc/devel/bmake/files/make_malloc.h:1.3  Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/make_malloc.h      Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/makefile.in
diff -u pkgsrc/devel/bmake/files/makefile.in:1.3 pkgsrc/devel/bmake/files/makefile.in:1.4
--- pkgsrc/devel/bmake/files/makefile.in:1.3    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/makefile.in        Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/meta.h
diff -u pkgsrc/devel/bmake/files/meta.h:1.3 pkgsrc/devel/bmake/files/meta.h:1.4
--- pkgsrc/devel/bmake/files/meta.h:1.3 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/meta.h     Sun May 24 21:10:17 2020
@@ -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.
Index: pkgsrc/devel/bmake/files/realpath.c
diff -u pkgsrc/devel/bmake/files/realpath.c:1.3 pkgsrc/devel/bmake/files/realpath.c:1.4
--- pkgsrc/devel/bmake/files/realpath.c:1.3     Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/realpath.c Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/stresep.c
diff -u pkgsrc/devel/bmake/files/stresep.c:1.3 pkgsrc/devel/bmake/files/stresep.c:1.4
--- pkgsrc/devel/bmake/files/stresep.c:1.3      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/stresep.c  Sun May 24 21:10:17 2020
@@ -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
Index: pkgsrc/devel/bmake/files/strlcpy.c
diff -u pkgsrc/devel/bmake/files/strlcpy.c:1.3 pkgsrc/devel/bmake/files/strlcpy.c:1.4
--- pkgsrc/devel/bmake/files/strlcpy.c:1.3      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/strlcpy.c  Sun May 24 21:10:17 2020
@@ -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 $     */
 
 /*
Index: pkgsrc/devel/bmake/files/strlist.c
diff -u pkgsrc/devel/bmake/files/strlist.c:1.3 pkgsrc/devel/bmake/files/strlist.c:1.4
--- pkgsrc/devel/bmake/files/strlist.c:1.3      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/strlist.c  Sun May 24 21:10:17 2020
@@ -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
 
Index: pkgsrc/devel/bmake/files/strlist.h
diff -u pkgsrc/devel/bmake/files/strlist.h:1.3 pkgsrc/devel/bmake/files/strlist.h:1.4
--- pkgsrc/devel/bmake/files/strlist.h:1.3      Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/strlist.h  Sun May 24 21:10:17 2020
@@ -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.

Index: pkgsrc/devel/bmake/files/job.c
diff -u pkgsrc/devel/bmake/files/job.c:1.19 pkgsrc/devel/bmake/files/job.c:1.20
--- pkgsrc/devel/bmake/files/job.c:1.19 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/job.c      Sun May 24 21:10:17 2020
@@ -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

Index: pkgsrc/devel/bmake/files/machine.sh
diff -u pkgsrc/devel/bmake/files/machine.sh:1.12 pkgsrc/devel/bmake/files/machine.sh:1.13
--- pkgsrc/devel/bmake/files/machine.sh:1.12    Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/machine.sh Sun May 24 21:10:17 2020
@@ -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
 #
Index: pkgsrc/devel/bmake/files/os.sh
diff -u pkgsrc/devel/bmake/files/os.sh:1.12 pkgsrc/devel/bmake/files/os.sh:1.13
--- pkgsrc/devel/bmake/files/os.sh:1.12 Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/os.sh      Sun May 24 21:10:17 2020
@@ -17,7 +17,7 @@
 #      Simon J. Gerraty <sjg%crufty.net@localhost>
 
 # 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
 #

Index: pkgsrc/devel/bmake/files/make.h
diff -u pkgsrc/devel/bmake/files/make.h:1.10 pkgsrc/devel/bmake/files/make.h:1.11
--- pkgsrc/devel/bmake/files/make.h:1.10        Sun May 24 11:09:43 2020
+++ pkgsrc/devel/bmake/files/make.h     Sun May 24 21:10:17 2020
@@ -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