svn commit: r365366 - in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk contrib/bmake/mk/sys contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests

Simon J. Gerraty sjg at FreeBSD.org
Sat Sep 5 19:29:43 UTC 2020


Author: sjg
Date: Sat Sep  5 19:29:42 2020
New Revision: 365366
URL: https://svnweb.freebsd.org/changeset/base/365366

Log:
  Update to bmake-20200902
  
  Lots of code refactoring, simplification and cleanup.
  Lots of new unit-tests providing much higher code coverage.
  All courtesy of rillig at netbsd.
  
  Other significant changes:
  
  o new read-only variable .SHELL which provides the path of the shell
    used to run scripts (as defined by  the .SHELL target).
  
  o variable parsing detects more errors.
  
  o new debug option -dl: LINT mode, does the equivalent of := for all
    variable assignments so that file and line number are reported for
    variable parse errors.

Added:
  head/contrib/bmake/enum.c
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/enum.c
  head/contrib/bmake/enum.h
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/enum.h
  head/contrib/bmake/lst.c
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/lst.c
  head/contrib/bmake/mk/dirdeps-cache-update.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/mk/dirdeps-cache-update.mk
  head/contrib/bmake/unit-tests/archive-suffix.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.exp
  head/contrib/bmake/unit-tests/archive-suffix.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.mk
  head/contrib/bmake/unit-tests/archive.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive.exp
  head/contrib/bmake/unit-tests/archive.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive.mk
  head/contrib/bmake/unit-tests/cmd-interrupt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.exp
  head/contrib/bmake/unit-tests/cmd-interrupt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.mk
  head/contrib/bmake/unit-tests/cmdline.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmdline.exp
  head/contrib/bmake/unit-tests/cmdline.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmdline.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-eq.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-eq.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-ge.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-ge.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-gt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-gt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-le.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-le.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-lt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-lt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric-ne.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric-ne.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.mk
  head/contrib/bmake/unit-tests/cond-cmp-numeric.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.exp
  head/contrib/bmake/unit-tests/cond-cmp-numeric.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.mk
  head/contrib/bmake/unit-tests/cond-cmp-string.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.exp
  head/contrib/bmake/unit-tests/cond-cmp-string.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.mk
  head/contrib/bmake/unit-tests/cond-func-commands.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.exp
  head/contrib/bmake/unit-tests/cond-func-commands.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.mk
  head/contrib/bmake/unit-tests/cond-func-defined.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.exp
  head/contrib/bmake/unit-tests/cond-func-defined.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.mk
  head/contrib/bmake/unit-tests/cond-func-empty.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.exp
  head/contrib/bmake/unit-tests/cond-func-empty.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.mk
  head/contrib/bmake/unit-tests/cond-func-exists.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.exp
  head/contrib/bmake/unit-tests/cond-func-exists.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.mk
  head/contrib/bmake/unit-tests/cond-func-make.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.exp
  head/contrib/bmake/unit-tests/cond-func-make.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.mk
  head/contrib/bmake/unit-tests/cond-func-target.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.exp
  head/contrib/bmake/unit-tests/cond-func-target.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.mk
  head/contrib/bmake/unit-tests/cond-func.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func.exp
  head/contrib/bmake/unit-tests/cond-func.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func.mk
  head/contrib/bmake/unit-tests/cond-op-and.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.exp
  head/contrib/bmake/unit-tests/cond-op-and.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.mk
  head/contrib/bmake/unit-tests/cond-op-not.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.exp
  head/contrib/bmake/unit-tests/cond-op-not.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.mk
  head/contrib/bmake/unit-tests/cond-op-or.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.exp
  head/contrib/bmake/unit-tests/cond-op-or.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.mk
  head/contrib/bmake/unit-tests/cond-op-parentheses.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.exp
  head/contrib/bmake/unit-tests/cond-op-parentheses.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.mk
  head/contrib/bmake/unit-tests/cond-op.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op.exp
  head/contrib/bmake/unit-tests/cond-op.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op.mk
  head/contrib/bmake/unit-tests/cond-token-number.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.exp
  head/contrib/bmake/unit-tests/cond-token-number.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.mk
  head/contrib/bmake/unit-tests/cond-token-plain.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.exp
  head/contrib/bmake/unit-tests/cond-token-plain.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.mk
  head/contrib/bmake/unit-tests/cond-token-string.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.exp
  head/contrib/bmake/unit-tests/cond-token-string.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.mk
  head/contrib/bmake/unit-tests/cond-token-var.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.exp
  head/contrib/bmake/unit-tests/cond-token-var.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.mk
  head/contrib/bmake/unit-tests/counter.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/counter.exp
  head/contrib/bmake/unit-tests/counter.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/counter.mk
  head/contrib/bmake/unit-tests/dep-colon.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-colon.exp
  head/contrib/bmake/unit-tests/dep-colon.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-colon.mk
  head/contrib/bmake/unit-tests/dep-double-colon.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.exp
  head/contrib/bmake/unit-tests/dep-double-colon.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.mk
  head/contrib/bmake/unit-tests/dep-exclam.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.exp
  head/contrib/bmake/unit-tests/dep-exclam.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.mk
  head/contrib/bmake/unit-tests/dep-none.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-none.exp
  head/contrib/bmake/unit-tests/dep-none.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-none.mk
  head/contrib/bmake/unit-tests/dep-var.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-var.exp
  head/contrib/bmake/unit-tests/dep-var.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-var.mk
  head/contrib/bmake/unit-tests/dep-wildcards.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.exp
  head/contrib/bmake/unit-tests/dep-wildcards.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.mk
  head/contrib/bmake/unit-tests/dep.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep.exp
  head/contrib/bmake/unit-tests/dep.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep.mk
  head/contrib/bmake/unit-tests/depsrc-exec.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.exp
  head/contrib/bmake/unit-tests/depsrc-exec.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.mk
  head/contrib/bmake/unit-tests/depsrc-ignore.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.exp
  head/contrib/bmake/unit-tests/depsrc-ignore.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.mk
  head/contrib/bmake/unit-tests/depsrc-made.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.exp
  head/contrib/bmake/unit-tests/depsrc-made.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.mk
  head/contrib/bmake/unit-tests/depsrc-make.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.exp
  head/contrib/bmake/unit-tests/depsrc-make.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.mk
  head/contrib/bmake/unit-tests/depsrc-meta.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.exp
  head/contrib/bmake/unit-tests/depsrc-meta.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.mk
  head/contrib/bmake/unit-tests/depsrc-nometa.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.exp
  head/contrib/bmake/unit-tests/depsrc-nometa.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.mk
  head/contrib/bmake/unit-tests/depsrc-nometa_cmp.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.exp
  head/contrib/bmake/unit-tests/depsrc-nometa_cmp.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.mk
  head/contrib/bmake/unit-tests/depsrc-nopath.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.exp
  head/contrib/bmake/unit-tests/depsrc-nopath.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.mk
  head/contrib/bmake/unit-tests/depsrc-notmain.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.exp
  head/contrib/bmake/unit-tests/depsrc-notmain.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.mk
  head/contrib/bmake/unit-tests/depsrc-optional.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.exp
  head/contrib/bmake/unit-tests/depsrc-optional.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.mk
  head/contrib/bmake/unit-tests/depsrc-phony.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.exp
  head/contrib/bmake/unit-tests/depsrc-phony.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.mk
  head/contrib/bmake/unit-tests/depsrc-precious.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.exp
  head/contrib/bmake/unit-tests/depsrc-precious.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.mk
  head/contrib/bmake/unit-tests/depsrc-recursive.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.exp
  head/contrib/bmake/unit-tests/depsrc-recursive.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.mk
  head/contrib/bmake/unit-tests/depsrc-silent.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.exp
  head/contrib/bmake/unit-tests/depsrc-silent.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.mk
  head/contrib/bmake/unit-tests/depsrc-use.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.exp
  head/contrib/bmake/unit-tests/depsrc-use.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.mk
  head/contrib/bmake/unit-tests/depsrc-usebefore-double-colon.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.exp
  head/contrib/bmake/unit-tests/depsrc-usebefore-double-colon.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.mk
  head/contrib/bmake/unit-tests/depsrc-usebefore.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.exp
  head/contrib/bmake/unit-tests/depsrc-usebefore.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.mk
  head/contrib/bmake/unit-tests/depsrc-wait.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.exp
  head/contrib/bmake/unit-tests/depsrc-wait.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.mk
  head/contrib/bmake/unit-tests/depsrc.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc.exp
  head/contrib/bmake/unit-tests/depsrc.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc.mk
  head/contrib/bmake/unit-tests/deptgt-begin.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.exp
  head/contrib/bmake/unit-tests/deptgt-begin.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.mk
  head/contrib/bmake/unit-tests/deptgt-default.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.exp
  head/contrib/bmake/unit-tests/deptgt-default.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.mk
  head/contrib/bmake/unit-tests/deptgt-delete_on_error.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.exp
  head/contrib/bmake/unit-tests/deptgt-delete_on_error.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.mk
  head/contrib/bmake/unit-tests/deptgt-end.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.exp
  head/contrib/bmake/unit-tests/deptgt-end.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.mk
  head/contrib/bmake/unit-tests/deptgt-error.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.exp
  head/contrib/bmake/unit-tests/deptgt-error.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.mk
  head/contrib/bmake/unit-tests/deptgt-ignore.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.exp
  head/contrib/bmake/unit-tests/deptgt-ignore.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.mk
  head/contrib/bmake/unit-tests/deptgt-interrupt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.exp
  head/contrib/bmake/unit-tests/deptgt-interrupt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.mk
  head/contrib/bmake/unit-tests/deptgt-main.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.exp
  head/contrib/bmake/unit-tests/deptgt-main.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.mk
  head/contrib/bmake/unit-tests/deptgt-makeflags.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.exp
  head/contrib/bmake/unit-tests/deptgt-makeflags.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.mk
  head/contrib/bmake/unit-tests/deptgt-no_parallel.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.exp
  head/contrib/bmake/unit-tests/deptgt-no_parallel.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.mk
  head/contrib/bmake/unit-tests/deptgt-nopath.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.exp
  head/contrib/bmake/unit-tests/deptgt-nopath.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.mk
  head/contrib/bmake/unit-tests/deptgt-notparallel.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.exp
  head/contrib/bmake/unit-tests/deptgt-notparallel.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.mk
  head/contrib/bmake/unit-tests/deptgt-objdir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.exp
  head/contrib/bmake/unit-tests/deptgt-objdir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.mk
  head/contrib/bmake/unit-tests/deptgt-order.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.exp
  head/contrib/bmake/unit-tests/deptgt-order.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.mk
  head/contrib/bmake/unit-tests/deptgt-path-suffix.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.exp
  head/contrib/bmake/unit-tests/deptgt-path-suffix.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.mk
  head/contrib/bmake/unit-tests/deptgt-path.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.exp
  head/contrib/bmake/unit-tests/deptgt-path.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.mk
  head/contrib/bmake/unit-tests/deptgt-phony.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.exp
  head/contrib/bmake/unit-tests/deptgt-phony.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.mk
  head/contrib/bmake/unit-tests/deptgt-precious.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.exp
  head/contrib/bmake/unit-tests/deptgt-precious.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.mk
  head/contrib/bmake/unit-tests/deptgt-shell.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.exp
  head/contrib/bmake/unit-tests/deptgt-shell.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.mk
  head/contrib/bmake/unit-tests/deptgt-silent.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.exp
  head/contrib/bmake/unit-tests/deptgt-silent.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.mk
  head/contrib/bmake/unit-tests/deptgt-stale.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.exp
  head/contrib/bmake/unit-tests/deptgt-stale.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.mk
  head/contrib/bmake/unit-tests/deptgt-suffixes.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.exp
  head/contrib/bmake/unit-tests/deptgt-suffixes.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.mk
  head/contrib/bmake/unit-tests/deptgt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt.exp
  head/contrib/bmake/unit-tests/deptgt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt.mk
  head/contrib/bmake/unit-tests/dir-expand-path.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.exp
  head/contrib/bmake/unit-tests/dir-expand-path.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.mk
  head/contrib/bmake/unit-tests/dir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir.exp
  head/contrib/bmake/unit-tests/dir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir.mk
  head/contrib/bmake/unit-tests/directive-elif.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elif.exp
  head/contrib/bmake/unit-tests/directive-elif.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elif.mk
  head/contrib/bmake/unit-tests/directive-elifdef.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.exp
  head/contrib/bmake/unit-tests/directive-elifdef.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.mk
  head/contrib/bmake/unit-tests/directive-elifmake.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.exp
  head/contrib/bmake/unit-tests/directive-elifmake.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.mk
  head/contrib/bmake/unit-tests/directive-elifndef.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.exp
  head/contrib/bmake/unit-tests/directive-elifndef.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.mk
  head/contrib/bmake/unit-tests/directive-elifnmake.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.exp
  head/contrib/bmake/unit-tests/directive-elifnmake.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.mk
  head/contrib/bmake/unit-tests/directive-else.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-else.exp
  head/contrib/bmake/unit-tests/directive-else.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-else.mk
  head/contrib/bmake/unit-tests/directive-endif.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-endif.exp
  head/contrib/bmake/unit-tests/directive-endif.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-endif.mk
  head/contrib/bmake/unit-tests/directive-error.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-error.exp
  head/contrib/bmake/unit-tests/directive-error.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-error.mk
  head/contrib/bmake/unit-tests/directive-export-env.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.exp
  head/contrib/bmake/unit-tests/directive-export-env.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.mk
  head/contrib/bmake/unit-tests/directive-export-literal.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.exp
  head/contrib/bmake/unit-tests/directive-export-literal.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.mk
  head/contrib/bmake/unit-tests/directive-export.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export.exp
  head/contrib/bmake/unit-tests/directive-export.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export.mk
  head/contrib/bmake/unit-tests/directive-for-generating-endif.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.exp
  head/contrib/bmake/unit-tests/directive-for-generating-endif.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.mk
  head/contrib/bmake/unit-tests/directive-for.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for.exp
  head/contrib/bmake/unit-tests/directive-for.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for.mk
  head/contrib/bmake/unit-tests/directive-if.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-if.exp
  head/contrib/bmake/unit-tests/directive-if.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-if.mk
  head/contrib/bmake/unit-tests/directive-ifdef.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.exp
  head/contrib/bmake/unit-tests/directive-ifdef.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.mk
  head/contrib/bmake/unit-tests/directive-ifmake.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.exp
  head/contrib/bmake/unit-tests/directive-ifmake.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.mk
  head/contrib/bmake/unit-tests/directive-ifndef.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.exp
  head/contrib/bmake/unit-tests/directive-ifndef.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.mk
  head/contrib/bmake/unit-tests/directive-ifnmake.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.exp
  head/contrib/bmake/unit-tests/directive-ifnmake.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.mk
  head/contrib/bmake/unit-tests/directive-info.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-info.exp
  head/contrib/bmake/unit-tests/directive-info.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-info.mk
  head/contrib/bmake/unit-tests/directive-undef.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-undef.exp
  head/contrib/bmake/unit-tests/directive-undef.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-undef.mk
  head/contrib/bmake/unit-tests/directive-unexport-env.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.exp
  head/contrib/bmake/unit-tests/directive-unexport-env.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.mk
  head/contrib/bmake/unit-tests/directive-unexport.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.exp
  head/contrib/bmake/unit-tests/directive-unexport.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.mk
  head/contrib/bmake/unit-tests/directive-warning.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-warning.exp
  head/contrib/bmake/unit-tests/directive-warning.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-warning.mk
  head/contrib/bmake/unit-tests/directive.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive.exp
  head/contrib/bmake/unit-tests/directive.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive.mk
  head/contrib/bmake/unit-tests/directives.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directives.exp
  head/contrib/bmake/unit-tests/directives.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directives.mk
  head/contrib/bmake/unit-tests/envfirst.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/envfirst.exp
  head/contrib/bmake/unit-tests/envfirst.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/envfirst.mk
  head/contrib/bmake/unit-tests/export-variants.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/export-variants.exp
  head/contrib/bmake/unit-tests/export-variants.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/export-variants.mk
  head/contrib/bmake/unit-tests/lint.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/lint.exp
  head/contrib/bmake/unit-tests/lint.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/lint.mk
  head/contrib/bmake/unit-tests/make-exported.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/make-exported.exp
  head/contrib/bmake/unit-tests/make-exported.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/make-exported.mk
  head/contrib/bmake/unit-tests/opt-backwards.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.exp
  head/contrib/bmake/unit-tests/opt-backwards.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.mk
  head/contrib/bmake/unit-tests/opt-chdir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.exp
  head/contrib/bmake/unit-tests/opt-chdir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.mk
  head/contrib/bmake/unit-tests/opt-debug-g1.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.exp
  head/contrib/bmake/unit-tests/opt-debug-g1.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.mk
  head/contrib/bmake/unit-tests/opt-debug.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug.exp
  head/contrib/bmake/unit-tests/opt-debug.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug.mk
  head/contrib/bmake/unit-tests/opt-define.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-define.exp
  head/contrib/bmake/unit-tests/opt-define.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-define.mk
  head/contrib/bmake/unit-tests/opt-env.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-env.exp
  head/contrib/bmake/unit-tests/opt-env.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-env.mk
  head/contrib/bmake/unit-tests/opt-file.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-file.exp
  head/contrib/bmake/unit-tests/opt-file.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-file.mk
  head/contrib/bmake/unit-tests/opt-ignore.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.exp
  head/contrib/bmake/unit-tests/opt-ignore.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.mk
  head/contrib/bmake/unit-tests/opt-include-dir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.exp
  head/contrib/bmake/unit-tests/opt-include-dir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.mk
  head/contrib/bmake/unit-tests/opt-jobs-internal.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.exp
  head/contrib/bmake/unit-tests/opt-jobs-internal.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.mk
  head/contrib/bmake/unit-tests/opt-jobs.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.exp
  head/contrib/bmake/unit-tests/opt-jobs.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.mk
  head/contrib/bmake/unit-tests/opt-keep-going.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.exp
  head/contrib/bmake/unit-tests/opt-keep-going.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.mk
  head/contrib/bmake/unit-tests/opt-m-include-dir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.exp
  head/contrib/bmake/unit-tests/opt-m-include-dir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.mk
  head/contrib/bmake/unit-tests/opt-no-action-at-all.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.exp
  head/contrib/bmake/unit-tests/opt-no-action-at-all.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.mk
  head/contrib/bmake/unit-tests/opt-no-action.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.exp
  head/contrib/bmake/unit-tests/opt-no-action.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.mk
  head/contrib/bmake/unit-tests/opt-query.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-query.exp
  head/contrib/bmake/unit-tests/opt-query.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-query.mk
  head/contrib/bmake/unit-tests/opt-raw.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-raw.exp
  head/contrib/bmake/unit-tests/opt-raw.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-raw.mk
  head/contrib/bmake/unit-tests/opt-silent.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-silent.exp
  head/contrib/bmake/unit-tests/opt-silent.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-silent.mk
  head/contrib/bmake/unit-tests/opt-touch.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-touch.exp
  head/contrib/bmake/unit-tests/opt-touch.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-touch.mk
  head/contrib/bmake/unit-tests/opt-tracefile.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.exp
  head/contrib/bmake/unit-tests/opt-tracefile.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.mk
  head/contrib/bmake/unit-tests/opt-var-expanded.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.exp
  head/contrib/bmake/unit-tests/opt-var-expanded.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.mk
  head/contrib/bmake/unit-tests/opt-var-literal.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.exp
  head/contrib/bmake/unit-tests/opt-var-literal.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.mk
  head/contrib/bmake/unit-tests/opt-warnings-as-errors.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.exp
  head/contrib/bmake/unit-tests/opt-warnings-as-errors.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.mk
  head/contrib/bmake/unit-tests/opt-where-am-i.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.exp
  head/contrib/bmake/unit-tests/opt-where-am-i.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.mk
  head/contrib/bmake/unit-tests/opt-x-reduce-exported.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.exp
  head/contrib/bmake/unit-tests/opt-x-reduce-exported.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.mk
  head/contrib/bmake/unit-tests/opt.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt.exp
  head/contrib/bmake/unit-tests/opt.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt.mk
  head/contrib/bmake/unit-tests/recursive.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/recursive.exp
  head/contrib/bmake/unit-tests/recursive.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/recursive.mk
  head/contrib/bmake/unit-tests/sh-dots.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-dots.exp
  head/contrib/bmake/unit-tests/sh-dots.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-dots.mk
  head/contrib/bmake/unit-tests/sh-jobs-error.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.exp
  head/contrib/bmake/unit-tests/sh-jobs-error.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.mk
  head/contrib/bmake/unit-tests/sh-jobs.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.exp
  head/contrib/bmake/unit-tests/sh-jobs.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.mk
  head/contrib/bmake/unit-tests/sh-leading-at.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.exp
  head/contrib/bmake/unit-tests/sh-leading-at.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.mk
  head/contrib/bmake/unit-tests/sh-leading-hyphen.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.exp
  head/contrib/bmake/unit-tests/sh-leading-hyphen.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.mk
  head/contrib/bmake/unit-tests/sh-leading-plus.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.exp
  head/contrib/bmake/unit-tests/sh-leading-plus.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.mk
  head/contrib/bmake/unit-tests/sh-meta-chars.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.exp
  head/contrib/bmake/unit-tests/sh-meta-chars.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.mk
  head/contrib/bmake/unit-tests/sh-multi-line.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.exp
  head/contrib/bmake/unit-tests/sh-multi-line.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.mk
  head/contrib/bmake/unit-tests/sh-single-line.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.exp
  head/contrib/bmake/unit-tests/sh-single-line.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.mk
  head/contrib/bmake/unit-tests/sh.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh.exp
  head/contrib/bmake/unit-tests/sh.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh.mk
  head/contrib/bmake/unit-tests/use-inference.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/use-inference.exp
  head/contrib/bmake/unit-tests/use-inference.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/use-inference.mk
  head/contrib/bmake/unit-tests/var-class-cmdline.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.exp
  head/contrib/bmake/unit-tests/var-class-cmdline.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.mk
  head/contrib/bmake/unit-tests/var-class-env.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-env.exp
  head/contrib/bmake/unit-tests/var-class-env.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-env.mk
  head/contrib/bmake/unit-tests/var-class-global.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-global.exp
  head/contrib/bmake/unit-tests/var-class-global.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-global.mk
  head/contrib/bmake/unit-tests/var-class-local-legacy.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.exp
  head/contrib/bmake/unit-tests/var-class-local-legacy.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.mk
  head/contrib/bmake/unit-tests/var-class-local.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local.exp
  head/contrib/bmake/unit-tests/var-class-local.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local.mk
  head/contrib/bmake/unit-tests/var-class.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class.exp
  head/contrib/bmake/unit-tests/var-class.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class.mk
  head/contrib/bmake/unit-tests/var-op-append.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-append.exp
  head/contrib/bmake/unit-tests/var-op-append.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-append.mk
  head/contrib/bmake/unit-tests/var-op-assign.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.exp
  head/contrib/bmake/unit-tests/var-op-assign.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.mk
  head/contrib/bmake/unit-tests/var-op-default.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-default.exp
  head/contrib/bmake/unit-tests/var-op-default.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-default.mk
  head/contrib/bmake/unit-tests/var-op-expand.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.exp
  head/contrib/bmake/unit-tests/var-op-expand.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.mk
  head/contrib/bmake/unit-tests/var-op-shell.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.exp
  head/contrib/bmake/unit-tests/var-op-shell.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.mk
  head/contrib/bmake/unit-tests/var-op.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op.exp
  head/contrib/bmake/unit-tests/var-op.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op.mk
  head/contrib/bmake/unit-tests/vardebug.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/vardebug.exp
  head/contrib/bmake/unit-tests/vardebug.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/vardebug.mk
  head/contrib/bmake/unit-tests/varfind.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varfind.exp
  head/contrib/bmake/unit-tests/varfind.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varfind.mk
  head/contrib/bmake/unit-tests/varmod-assign.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.exp
  head/contrib/bmake/unit-tests/varmod-assign.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.mk
  head/contrib/bmake/unit-tests/varmod-defined.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.exp
  head/contrib/bmake/unit-tests/varmod-defined.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.mk
  head/contrib/bmake/unit-tests/varmod-exclam-shell.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.exp
  head/contrib/bmake/unit-tests/varmod-exclam-shell.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.mk
  head/contrib/bmake/unit-tests/varmod-extension.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.exp
  head/contrib/bmake/unit-tests/varmod-extension.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.mk
  head/contrib/bmake/unit-tests/varmod-gmtime.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.exp
  head/contrib/bmake/unit-tests/varmod-gmtime.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.mk
  head/contrib/bmake/unit-tests/varmod-hash.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.exp
  head/contrib/bmake/unit-tests/varmod-hash.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.mk
  head/contrib/bmake/unit-tests/varmod-head.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-head.exp
  head/contrib/bmake/unit-tests/varmod-head.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-head.mk
  head/contrib/bmake/unit-tests/varmod-ifelse.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.exp
  head/contrib/bmake/unit-tests/varmod-ifelse.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.mk
  head/contrib/bmake/unit-tests/varmod-l-name-to-value.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.exp
  head/contrib/bmake/unit-tests/varmod-l-name-to-value.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.mk
  head/contrib/bmake/unit-tests/varmod-localtime.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.exp
  head/contrib/bmake/unit-tests/varmod-localtime.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.mk
  head/contrib/bmake/unit-tests/varmod-loop.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.exp
  head/contrib/bmake/unit-tests/varmod-loop.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.mk
  head/contrib/bmake/unit-tests/varmod-match-escape.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.exp
  head/contrib/bmake/unit-tests/varmod-match-escape.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.mk
  head/contrib/bmake/unit-tests/varmod-match.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match.exp
  head/contrib/bmake/unit-tests/varmod-match.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match.mk
  head/contrib/bmake/unit-tests/varmod-no-match.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.exp
  head/contrib/bmake/unit-tests/varmod-no-match.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.mk
  head/contrib/bmake/unit-tests/varmod-order-reverse.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.exp
  head/contrib/bmake/unit-tests/varmod-order-reverse.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.mk
  head/contrib/bmake/unit-tests/varmod-order-shuffle.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.exp
  head/contrib/bmake/unit-tests/varmod-order-shuffle.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.mk
  head/contrib/bmake/unit-tests/varmod-order.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order.exp
  head/contrib/bmake/unit-tests/varmod-order.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order.mk
  head/contrib/bmake/unit-tests/varmod-path.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-path.exp
  head/contrib/bmake/unit-tests/varmod-path.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-path.mk
  head/contrib/bmake/unit-tests/varmod-quote-dollar.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.exp
  head/contrib/bmake/unit-tests/varmod-quote-dollar.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.mk
  head/contrib/bmake/unit-tests/varmod-quote.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.exp
  head/contrib/bmake/unit-tests/varmod-quote.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.mk
  head/contrib/bmake/unit-tests/varmod-range.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-range.exp
  head/contrib/bmake/unit-tests/varmod-range.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-range.mk
  head/contrib/bmake/unit-tests/varmod-remember.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.exp
  head/contrib/bmake/unit-tests/varmod-remember.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.mk
  head/contrib/bmake/unit-tests/varmod-root.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-root.exp
  head/contrib/bmake/unit-tests/varmod-root.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-root.mk
  head/contrib/bmake/unit-tests/varmod-select-words.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.exp
  head/contrib/bmake/unit-tests/varmod-select-words.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.mk
  head/contrib/bmake/unit-tests/varmod-shell.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.exp
  head/contrib/bmake/unit-tests/varmod-shell.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.mk
  head/contrib/bmake/unit-tests/varmod-subst-regex.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.exp
  head/contrib/bmake/unit-tests/varmod-subst-regex.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.mk
  head/contrib/bmake/unit-tests/varmod-subst.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.exp
  head/contrib/bmake/unit-tests/varmod-subst.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.mk
  head/contrib/bmake/unit-tests/varmod-sysv.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.exp
  head/contrib/bmake/unit-tests/varmod-sysv.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.mk
  head/contrib/bmake/unit-tests/varmod-tail.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.exp
  head/contrib/bmake/unit-tests/varmod-tail.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.mk
  head/contrib/bmake/unit-tests/varmod-to-abs.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.exp
  head/contrib/bmake/unit-tests/varmod-to-abs.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.mk
  head/contrib/bmake/unit-tests/varmod-to-lower.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.exp
  head/contrib/bmake/unit-tests/varmod-to-lower.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.mk
  head/contrib/bmake/unit-tests/varmod-to-many-words.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.exp
  head/contrib/bmake/unit-tests/varmod-to-many-words.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.mk
  head/contrib/bmake/unit-tests/varmod-to-one-word.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.exp
  head/contrib/bmake/unit-tests/varmod-to-one-word.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.mk
  head/contrib/bmake/unit-tests/varmod-to-separator.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.exp
  head/contrib/bmake/unit-tests/varmod-to-separator.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.mk
  head/contrib/bmake/unit-tests/varmod-to-upper.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.exp
  head/contrib/bmake/unit-tests/varmod-to-upper.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.mk
  head/contrib/bmake/unit-tests/varmod-undefined.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.exp
  head/contrib/bmake/unit-tests/varmod-undefined.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.mk
  head/contrib/bmake/unit-tests/varmod-unique.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.exp
  head/contrib/bmake/unit-tests/varmod-unique.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.mk
  head/contrib/bmake/unit-tests/varmod.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod.exp
  head/contrib/bmake/unit-tests/varmod.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod.mk
  head/contrib/bmake/unit-tests/varname-dollar.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.exp
  head/contrib/bmake/unit-tests/varname-dollar.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.mk
  head/contrib/bmake/unit-tests/varname-dot-alltargets.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.exp
  head/contrib/bmake/unit-tests/varname-dot-alltargets.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.mk
  head/contrib/bmake/unit-tests/varname-dot-curdir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.exp
  head/contrib/bmake/unit-tests/varname-dot-curdir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.mk
  head/contrib/bmake/unit-tests/varname-dot-includedfromdir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.exp
  head/contrib/bmake/unit-tests/varname-dot-includedfromdir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.mk
  head/contrib/bmake/unit-tests/varname-dot-includedfromfile.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.exp
  head/contrib/bmake/unit-tests/varname-dot-includedfromfile.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.mk
  head/contrib/bmake/unit-tests/varname-dot-includes.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.exp
  head/contrib/bmake/unit-tests/varname-dot-includes.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.mk
  head/contrib/bmake/unit-tests/varname-dot-libs.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.exp
  head/contrib/bmake/unit-tests/varname-dot-libs.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.mk
  head/contrib/bmake/unit-tests/varname-dot-make-dependfile.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.exp
  head/contrib/bmake/unit-tests/varname-dot-make-dependfile.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.mk
  head/contrib/bmake/unit-tests/varname-dot-make-expand_variables.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.exp
  head/contrib/bmake/unit-tests/varname-dot-make-expand_variables.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.mk
  head/contrib/bmake/unit-tests/varname-dot-make-exported.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.exp
  head/contrib/bmake/unit-tests/varname-dot-make-exported.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.mk
  head/contrib/bmake/unit-tests/varname-dot-make-jobs-prefix.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.exp
  head/contrib/bmake/unit-tests/varname-dot-make-jobs-prefix.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.mk
  head/contrib/bmake/unit-tests/varname-dot-make-jobs.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.exp
  head/contrib/bmake/unit-tests/varname-dot-make-jobs.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.mk
  head/contrib/bmake/unit-tests/varname-dot-make-level.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.exp
  head/contrib/bmake/unit-tests/varname-dot-make-level.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.mk
  head/contrib/bmake/unit-tests/varname-dot-make-makefile_preference.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.exp
  head/contrib/bmake/unit-tests/varname-dot-make-makefile_preference.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.mk
  head/contrib/bmake/unit-tests/varname-dot-make-makefiles.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.exp
  head/contrib/bmake/unit-tests/varname-dot-make-makefiles.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-bailiwick.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-bailiwick.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-created.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-created.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-files.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-files.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_filter.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_filter.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_paths.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_paths.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_patterns.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_patterns.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.mk
  head/contrib/bmake/unit-tests/varname-dot-make-meta-prefix.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.exp
  head/contrib/bmake/unit-tests/varname-dot-make-meta-prefix.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.mk
  head/contrib/bmake/unit-tests/varname-dot-make-mode.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.exp
  head/contrib/bmake/unit-tests/varname-dot-make-mode.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.mk
  head/contrib/bmake/unit-tests/varname-dot-make-path_filemon.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.exp
  head/contrib/bmake/unit-tests/varname-dot-make-path_filemon.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.mk
  head/contrib/bmake/unit-tests/varname-dot-make-pid.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.exp
  head/contrib/bmake/unit-tests/varname-dot-make-pid.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.mk
  head/contrib/bmake/unit-tests/varname-dot-make-ppid.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.exp
  head/contrib/bmake/unit-tests/varname-dot-make-ppid.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.mk
  head/contrib/bmake/unit-tests/varname-dot-make-save_dollars.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.exp
  head/contrib/bmake/unit-tests/varname-dot-make-save_dollars.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.mk
  head/contrib/bmake/unit-tests/varname-dot-makeoverrides.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.exp
  head/contrib/bmake/unit-tests/varname-dot-makeoverrides.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.mk
  head/contrib/bmake/unit-tests/varname-dot-newline.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.exp
  head/contrib/bmake/unit-tests/varname-dot-newline.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.mk
  head/contrib/bmake/unit-tests/varname-dot-objdir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.exp
  head/contrib/bmake/unit-tests/varname-dot-objdir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.mk
  head/contrib/bmake/unit-tests/varname-dot-parsedir.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.exp
  head/contrib/bmake/unit-tests/varname-dot-parsedir.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.mk
  head/contrib/bmake/unit-tests/varname-dot-parsefile.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.exp
  head/contrib/bmake/unit-tests/varname-dot-parsefile.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.mk
  head/contrib/bmake/unit-tests/varname-dot-path.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.exp
  head/contrib/bmake/unit-tests/varname-dot-path.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.mk
  head/contrib/bmake/unit-tests/varname-dot-shell.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.exp
  head/contrib/bmake/unit-tests/varname-dot-shell.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.mk
  head/contrib/bmake/unit-tests/varname-dot-targets.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.exp
  head/contrib/bmake/unit-tests/varname-dot-targets.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.mk
  head/contrib/bmake/unit-tests/varname-empty.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-empty.exp
  head/contrib/bmake/unit-tests/varname-empty.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-empty.mk
  head/contrib/bmake/unit-tests/varname-make.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make.exp
  head/contrib/bmake/unit-tests/varname-make.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make.mk
  head/contrib/bmake/unit-tests/varname-make_print_var_on_error.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.exp
  head/contrib/bmake/unit-tests/varname-make_print_var_on_error.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.mk
  head/contrib/bmake/unit-tests/varname-makeflags.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.exp
  head/contrib/bmake/unit-tests/varname-makeflags.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.mk
  head/contrib/bmake/unit-tests/varname-pwd.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.exp
  head/contrib/bmake/unit-tests/varname-pwd.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.mk
  head/contrib/bmake/unit-tests/varname-vpath.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.exp
  head/contrib/bmake/unit-tests/varname-vpath.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.mk
  head/contrib/bmake/unit-tests/varname.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname.exp
  head/contrib/bmake/unit-tests/varname.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname.mk
  head/contrib/bmake/unit-tests/varparse-dynamic.exp
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.exp
  head/contrib/bmake/unit-tests/varparse-dynamic.mk
     - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.mk
Deleted:
  head/contrib/bmake/lst.lib/Makefile
  head/contrib/bmake/lst.lib/lstAppend.c
  head/contrib/bmake/lst.lib/lstAtEnd.c
  head/contrib/bmake/lst.lib/lstAtFront.c
  head/contrib/bmake/lst.lib/lstClose.c
  head/contrib/bmake/lst.lib/lstConcat.c
  head/contrib/bmake/lst.lib/lstDatum.c
  head/contrib/bmake/lst.lib/lstDeQueue.c
  head/contrib/bmake/lst.lib/lstDestroy.c
  head/contrib/bmake/lst.lib/lstDupl.c
  head/contrib/bmake/lst.lib/lstEnQueue.c
  head/contrib/bmake/lst.lib/lstFind.c
  head/contrib/bmake/lst.lib/lstFindFrom.c
  head/contrib/bmake/lst.lib/lstFirst.c
  head/contrib/bmake/lst.lib/lstForEach.c
  head/contrib/bmake/lst.lib/lstForEachFrom.c
  head/contrib/bmake/lst.lib/lstInit.c
  head/contrib/bmake/lst.lib/lstInsert.c
  head/contrib/bmake/lst.lib/lstInt.h
  head/contrib/bmake/lst.lib/lstIsAtEnd.c
  head/contrib/bmake/lst.lib/lstIsEmpty.c
  head/contrib/bmake/lst.lib/lstLast.c
  head/contrib/bmake/lst.lib/lstMember.c
  head/contrib/bmake/lst.lib/lstNext.c
  head/contrib/bmake/lst.lib/lstOpen.c
  head/contrib/bmake/lst.lib/lstPrev.c
  head/contrib/bmake/lst.lib/lstRemove.c
  head/contrib/bmake/lst.lib/lstReplace.c
  head/contrib/bmake/lst.lib/lstSucc.c
  head/contrib/bmake/sprite.h
  head/contrib/bmake/unit-tests/modorder.exp
  head/contrib/bmake/unit-tests/modorder.mk
Modified:
  head/contrib/bmake/ChangeLog
  head/contrib/bmake/FILES
  head/contrib/bmake/LICENSE
  head/contrib/bmake/Makefile
  head/contrib/bmake/VERSION
  head/contrib/bmake/arch.c
  head/contrib/bmake/bmake.1
  head/contrib/bmake/bmake.cat1
  head/contrib/bmake/bsd.after-import.mk
  head/contrib/bmake/buf.c
  head/contrib/bmake/buf.h
  head/contrib/bmake/compat.c
  head/contrib/bmake/cond.c
  head/contrib/bmake/dir.c
  head/contrib/bmake/dir.h
  head/contrib/bmake/for.c
  head/contrib/bmake/hash.c
  head/contrib/bmake/hash.h
  head/contrib/bmake/job.c
  head/contrib/bmake/job.h
  head/contrib/bmake/lst.h
  head/contrib/bmake/main.c
  head/contrib/bmake/make-bootstrap.sh.in
  head/contrib/bmake/make-conf.h
  head/contrib/bmake/make.1
  head/contrib/bmake/make.c
  head/contrib/bmake/make.h
  head/contrib/bmake/make_malloc.c
  head/contrib/bmake/make_malloc.h
  head/contrib/bmake/meta.c
  head/contrib/bmake/metachar.c
  head/contrib/bmake/metachar.h
  head/contrib/bmake/mk/ChangeLog
  head/contrib/bmake/mk/FILES
  head/contrib/bmake/mk/README
  head/contrib/bmake/mk/auto.dep.mk
  head/contrib/bmake/mk/auto.obj.mk
  head/contrib/bmake/mk/autoconf.mk
  head/contrib/bmake/mk/autodep.mk
  head/contrib/bmake/mk/compiler.mk
  head/contrib/bmake/mk/cython.mk
  head/contrib/bmake/mk/dirdeps-options.mk
  head/contrib/bmake/mk/dirdeps-targets.mk
  head/contrib/bmake/mk/dirdeps.mk
  head/contrib/bmake/mk/dpadd.mk
  head/contrib/bmake/mk/files.mk
  head/contrib/bmake/mk/gendirdeps.mk
  head/contrib/bmake/mk/host-target.mk
  head/contrib/bmake/mk/host.libnames.mk
  head/contrib/bmake/mk/inc.mk
  head/contrib/bmake/mk/init.mk
  head/contrib/bmake/mk/install-mk
  head/contrib/bmake/mk/install-new.mk
  head/contrib/bmake/mk/java.mk
  head/contrib/bmake/mk/lib.mk
  head/contrib/bmake/mk/libnames.mk
  head/contrib/bmake/mk/libs.mk
  head/contrib/bmake/mk/links.mk
  head/contrib/bmake/mk/manifest.mk
  head/contrib/bmake/mk/meta.autodep.mk
  head/contrib/bmake/mk/meta.stage.mk
  head/contrib/bmake/mk/meta.subdir.mk
  head/contrib/bmake/mk/meta.sys.mk
  head/contrib/bmake/mk/meta2deps.py
  head/contrib/bmake/mk/meta2deps.sh
  head/contrib/bmake/mk/mk-files.txt
  head/contrib/bmake/mk/mkopt.sh
  head/contrib/bmake/mk/obj.mk
  head/contrib/bmake/mk/options.mk
  head/contrib/bmake/mk/own.mk
  head/contrib/bmake/mk/prlist.mk
  head/contrib/bmake/mk/prog.mk
  head/contrib/bmake/mk/progs.mk
  head/contrib/bmake/mk/rst2htm.mk
  head/contrib/bmake/mk/scripts.mk
  head/contrib/bmake/mk/srctop.mk
  head/contrib/bmake/mk/stage-install.sh
  head/contrib/bmake/mk/sys.clean-env.mk
  head/contrib/bmake/mk/sys.debug.mk
  head/contrib/bmake/mk/sys.dependfile.mk
  head/contrib/bmake/mk/sys.mk
  head/contrib/bmake/mk/sys.vars.mk
  head/contrib/bmake/mk/sys/AIX.mk
  head/contrib/bmake/mk/sys/Darwin.mk
  head/contrib/bmake/mk/sys/Generic.mk
  head/contrib/bmake/mk/sys/HP-UX.mk
  head/contrib/bmake/mk/sys/IRIX.mk
  head/contrib/bmake/mk/sys/Linux.mk
  head/contrib/bmake/mk/sys/NetBSD.mk
  head/contrib/bmake/mk/sys/OSF1.mk
  head/contrib/bmake/mk/sys/OpenBSD.mk
  head/contrib/bmake/mk/sys/SunOS.mk
  head/contrib/bmake/mk/sys/UnixWare.mk
  head/contrib/bmake/mk/target-flags.mk
  head/contrib/bmake/mk/warnings.mk
  head/contrib/bmake/mk/whats.mk
  head/contrib/bmake/mk/yacc.mk
  head/contrib/bmake/nonints.h
  head/contrib/bmake/os.sh
  head/contrib/bmake/parse.c
  head/contrib/bmake/str.c
  head/contrib/bmake/strlist.c
  head/contrib/bmake/strlist.h
  head/contrib/bmake/suff.c
  head/contrib/bmake/targ.c
  head/contrib/bmake/trace.c
  head/contrib/bmake/unit-tests/Makefile
  head/contrib/bmake/unit-tests/cond-late.exp
  head/contrib/bmake/unit-tests/cond-late.mk
  head/contrib/bmake/unit-tests/cond-short.mk
  head/contrib/bmake/unit-tests/export-all.mk
  head/contrib/bmake/unit-tests/export.exp
  head/contrib/bmake/unit-tests/export.mk
  head/contrib/bmake/unit-tests/forloop.mk
  head/contrib/bmake/unit-tests/impsrc.exp
  head/contrib/bmake/unit-tests/impsrc.mk
  head/contrib/bmake/unit-tests/include-main.mk
  head/contrib/bmake/unit-tests/moderrs.exp
  head/contrib/bmake/unit-tests/moderrs.mk
  head/contrib/bmake/unit-tests/modmatch.exp
  head/contrib/bmake/unit-tests/modmatch.mk
  head/contrib/bmake/unit-tests/modmisc.exp
  head/contrib/bmake/unit-tests/modmisc.mk
  head/contrib/bmake/unit-tests/modts.exp
  head/contrib/bmake/unit-tests/modts.mk
  head/contrib/bmake/unit-tests/phony-end.exp
  head/contrib/bmake/unit-tests/posix1.mk
  head/contrib/bmake/unit-tests/sysv.exp
  head/contrib/bmake/unit-tests/sysv.mk
  head/contrib/bmake/unit-tests/unexport-env.mk
  head/contrib/bmake/unit-tests/unexport.mk
  head/contrib/bmake/unit-tests/varmisc.exp
  head/contrib/bmake/unit-tests/varmisc.mk
  head/contrib/bmake/unit-tests/varmod-edge.exp
  head/contrib/bmake/unit-tests/varmod-edge.mk
  head/contrib/bmake/util.c
  head/contrib/bmake/var.c
  head/usr.bin/bmake/Makefile
  head/usr.bin/bmake/Makefile.config
  head/usr.bin/bmake/unit-tests/Makefile
Directory Properties:
  head/contrib/bmake/   (props changed)

Modified: head/contrib/bmake/ChangeLog
==============================================================================
--- head/contrib/bmake/ChangeLog	Sat Sep  5 19:03:34 2020	(r365365)
+++ head/contrib/bmake/ChangeLog	Sat Sep  5 19:29:42 2020	(r365366)
@@ -1,3 +1,243 @@
+2020-09-02  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200902
+	Merge with NetBSD make, pick up
+	o use make_stat to ensure no confusion over valid fields
+	returned by cached_stat
+	o var.c: make VarQuote const-correct
+	o add unit tests for .for
+
+2020-09-01  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200901
+	Merge with NetBSD make, pick up
+	o rename Hash_Table fields
+	o make data types in Dir_HasWildcards more precise
+
+2020-08-31  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200831
+	Merge with NetBSD make, pick up
+	o suff.c: fix unbalanced Lst_Open/Lst_Close in SuffFindCmds
+	o lst.c: Lst_Open renable assert that list isn't open
+	o unit test for .TARGET dependent flags
+	o var.c: fix aliasing bug in VarUniq
+	o more unit tests for :u
+
+2020-08-30  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200830
+	Merge with NetBSD make, pick up
+	o allow for strict type checking for Boolean
+	o Var_Parse never returns NULL
+	o Var_Subst never returns NULL
+	o Lst_Find now takes boolean match function
+	o rename Lst_Memeber to Lst_FindDatum
+	o rename LstNode functions to match their type
+	o rename GNode.iParents to implicitParents
+	o fix assertion failure for .SUFFIXES in archives
+	o compat.c: clean up documentation for CompatInterrupt and Compat_Run
+	remove unreachable code from CompatRunCommand
+	o main.c: simplify getBoolean
+	o stc.c: replace brk_string with simpler Str_Words
+	o suff.c: add debug macros
+
+2020-08-28  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200828
+	Merge with NetBSD make, pick up
+	o lst.c: inline LstIsValid and LstNodeIsValid
+	o remove trailing S from Lst function names after migration complete
+	o more comment cleanup/clarification
+	o suff.c: clean up suffix handling
+	o more unit tests
+
+2020-08-26  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200826
+	Merge with NetBSD make, pick up
+	o enum.c: distinguish between bitsets containing flags and
+	ordinary enums
+	o var.c: fix error message for ::!= modifier with shell error
+	o fix bugs in -DCLEANUP mode
+
+2020-08-24  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200824
+	Merge with NetBSD make, pick up
+	o in debug mode, print GNode details in symbols
+
+2020-08-23  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200823
+	Merge with NetBSD make, pick up
+	o lst.c: more asserts,
+	make args to Lst_Find match others.
+	o var.c: pass flags to VarAdd
+	o arch.c: use Buffer
+	o str.c: brk_string return size_t for nwords
+	o more unit tests
+
+2020-08-22  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION):
+	Merge with NetBSD make, pick up
+	o var.c: support for read-only variables eg .SHELL
+	being the shell used to run scripts.
+	o lst.c: more simplification
+	o more documentation and style cleanup
+	o more unit tests
+	o ensure unit-test/Makefile is run by TEST_MAKE
+	o reduce duplication of header inclusion
+
+2020-08-21  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200821
+	Merge with NetBSD make, pick up
+	o lst.c: revert invalid assertion - but document it
+	o dir.c: split Dir_Init into two functions
+
+2020-08-20  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* lst.c: needs inttypes.h on Linux
+
+	* VERSION (_MAKE_VERSION): 20200820
+	Merge with NetBSD make, pick up
+	o make.1: clarify some passages
+	o var.c: more cleanup, clarify comments
+	o make_malloc.c: remove unreachable code
+	o cond.c: make CondGetString easier to debug
+	o simplify list usage
+	o unit-tests: more
+
+2020-08-16  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200816
+	Merge with NetBSD make, pick up
+	o refactor unit-tests to be more fine grained
+	  not all tests moved yet
+
+2020-08-14  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200814
+	Merge with NetBSD make, pick up
+	o more str_concat variants
+	o more enums for flags
+	o var.c: cleanup for higher warnings level
+
+2020-08-10  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200810
+	Merge with NetBSD make, pick up
+	o more unit tests
+	o general comment and style cleanup
+
+2020-08-08  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200808
+	Merge with NetBSD make, pick up
+	o enum.[ch]: streamline, enums for use in flags and debug output
+	o cond.c: cleanup
+	o var.c: reduce duplicate code for modifiers
+	debug logging for Var_Parse
+	more detailed debug output
+	o more unit tests
+
+2020-08-06  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* unit-tests/Makefile: -r for recursive and include Makefile.inc
+	so I can run tests in meta mode
+	supress extra noise if in meta mode
+
+	* VERSION (_MAKE_VERSION): 20200806
+	Merge with NetBSD make, pick up
+	o parse.c: remove VARE_WANTRES for LINT
+	we just want to check parsing (for now).
+
+2020-08-05  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200805
+	Merge with NetBSD make, pick up
+	o make.1: Rework the description of dependence operators
+
+2020-08-03  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200803
+	Merge with NetBSD make, pick up
+	o revert some C99 usage, for max portability
+	o unit-tests/lint
+
+2020-08-02  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200802
+	Merge with NetBSD make, pick up
+	o more unit tests
+
+2020-08-01  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* Remove NetBSD specific plumbing from unit-tests/Makefile
+
+	* VERSION (_MAKE_VERSION): 20200801
+	Merge with NetBSD make, pick up
+	o make Var_Value return const
+	o size_t for buf sizes
+	o optimize some buffer operations - avoid strlen
+
+2020-07-31  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200731
+	Merge with NetBSD make, pick up
+	o var.c: fix undefinded behavior for incomplete :t modifier
+	  fixes unit-test/moderrs on Ubuntu
+	o parse.c: When parsing variable assignments other than :=
+	  if DEBUG(LINT) test substition of value, so we get a file and
+	  line number in the resulting error.
+	o dir.c: fix parsing of nested braces in dependency lines
+	  add unit-tests
+
+2020-07-30  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200730
+	Merge with NetBSD make, pick up
+	o var.c: minor cleanup
+	o unit-tests: more tests to improve code coverage
+
+2020-07-28  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200728
+	Merge with NetBSD make, pick up
+	o var.c: more optimizations
+
+2020-07-26  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200726
+	Merge with NetBSD make, pick up
+	o collapse lsd.lib into lst.c - reduce code size and allow inlining
+	o lots of function comment updates
+	o var.c: more optimizations
+	o make return of Var_Parse const
+
+2020-07-20  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200720
+	Merge with NetBSD make, pick up
+	o DEBUG_HASH report stats at end and tone down the noise
+	o var.c: each flag type gets its own prefix.
+	move SysV string matching to var.c
+	make ampersand in ${VAR:from=to&} an ordinary character
+	cleanup and simplify implementation of modifiers
+	o make.1: move documentation for assignment modifiers
+
+2020-07-18  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20200718
+	Merge with NetBSD make, pick up
+	o DEBUG_HASH to see how well the hash tables are working
+
+2020-07-11  Simon J Gerraty  <sjg at beast.crufty.net>
+
+	* bsd.after-import.mk: make sure we update unit-tests/Makefile
+
 2020-07-10  Simon J Gerraty  <sjg at beast.crufty.net>
 
 	* configure.in: use AC_INCLUDES_DEFAULT rather than AC_HEADER_STDC

Modified: head/contrib/bmake/FILES
==============================================================================
--- head/contrib/bmake/FILES	Sat Sep  5 19:03:34 2020	(r365365)
+++ head/contrib/bmake/FILES	Sat Sep  5 19:29:42 2020	(r365366)
@@ -23,6 +23,8 @@ configure.in
 dir.c
 dir.h
 dirname.c
+enum.c
+enum.h
 filemon/filemon.h
 filemon/filemon_dev.c
 filemon/filemon_ktrace.c
@@ -34,36 +36,8 @@ hash.h
 install-sh
 job.c
 job.h
+lst.c
 lst.h
-lst.lib/Makefile
-lst.lib/lstAppend.c
-lst.lib/lstAtEnd.c
-lst.lib/lstAtFront.c
-lst.lib/lstClose.c
-lst.lib/lstConcat.c
-lst.lib/lstDatum.c
-lst.lib/lstDeQueue.c
-lst.lib/lstDestroy.c
-lst.lib/lstDupl.c
-lst.lib/lstEnQueue.c
-lst.lib/lstFind.c
-lst.lib/lstFindFrom.c
-lst.lib/lstFirst.c
-lst.lib/lstForEach.c
-lst.lib/lstForEachFrom.c
-lst.lib/lstInit.c
-lst.lib/lstInsert.c
-lst.lib/lstInt.h
-lst.lib/lstIsAtEnd.c
-lst.lib/lstIsEmpty.c
-lst.lib/lstLast.c
-lst.lib/lstMember.c
-lst.lib/lstNext.c
-lst.lib/lstOpen.c
-lst.lib/lstPrev.c
-lst.lib/lstRemove.c
-lst.lib/lstReplace.c
-lst.lib/lstSucc.c
 machine.sh
 main.c
 make-bootstrap.sh.in
@@ -88,7 +62,6 @@ ranlib.h
 realpath.c
 setenv.c
 sigcompat.c
-sprite.h
 str.c
 stresep.c
 strlcpy.c
@@ -100,22 +73,234 @@ trace.c
 trace.h
 unit-tests/Makefile
 unit-tests/Makefile.config.in
+unit-tests/archive.exp
+unit-tests/archive.mk
+unit-tests/archive-suffix.exp
+unit-tests/archive-suffix.mk
+unit-tests/cmd-interrupt.exp
+unit-tests/cmd-interrupt.mk
+unit-tests/cmdline.exp
+unit-tests/cmdline.mk
 unit-tests/comment.exp
 unit-tests/comment.mk
+unit-tests/cond-cmp-numeric-eq.exp
+unit-tests/cond-cmp-numeric-eq.mk
+unit-tests/cond-cmp-numeric-ge.exp
+unit-tests/cond-cmp-numeric-ge.mk
+unit-tests/cond-cmp-numeric-gt.exp
+unit-tests/cond-cmp-numeric-gt.mk
+unit-tests/cond-cmp-numeric-le.exp
+unit-tests/cond-cmp-numeric-le.mk
+unit-tests/cond-cmp-numeric-lt.exp
+unit-tests/cond-cmp-numeric-lt.mk
+unit-tests/cond-cmp-numeric-ne.exp
+unit-tests/cond-cmp-numeric-ne.mk
+unit-tests/cond-cmp-numeric.exp
+unit-tests/cond-cmp-numeric.mk
+unit-tests/cond-cmp-string.exp
+unit-tests/cond-cmp-string.mk
+unit-tests/cond-func.exp
+unit-tests/cond-func.mk
+unit-tests/cond-func-commands.exp
+unit-tests/cond-func-commands.mk
+unit-tests/cond-func-defined.exp
+unit-tests/cond-func-defined.mk
+unit-tests/cond-func-empty.exp
+unit-tests/cond-func-empty.mk
+unit-tests/cond-func-exists.exp
+unit-tests/cond-func-exists.mk
+unit-tests/cond-func-make.exp
+unit-tests/cond-func-make.mk
+unit-tests/cond-func-target.exp
+unit-tests/cond-func-target.mk
+unit-tests/cond-late.exp
+unit-tests/cond-late.mk
+unit-tests/cond-op-and.exp
+unit-tests/cond-op-and.mk
+unit-tests/cond-op-not.exp
+unit-tests/cond-op-not.mk
+unit-tests/cond-op-or.exp
+unit-tests/cond-op-or.mk
+unit-tests/cond-op-parentheses.exp
+unit-tests/cond-op-parentheses.mk
+unit-tests/cond-op.exp
+unit-tests/cond-op.mk
+unit-tests/cond-short.exp
+unit-tests/cond-short.mk
+unit-tests/cond-token-number.exp
+unit-tests/cond-token-number.mk
+unit-tests/cond-token-plain.exp
+unit-tests/cond-token-plain.mk
+unit-tests/cond-token-string.exp
+unit-tests/cond-token-string.mk
+unit-tests/cond-token-var.exp
+unit-tests/cond-token-var.mk
 unit-tests/cond1.exp
 unit-tests/cond1.mk
 unit-tests/cond2.exp
 unit-tests/cond2.mk
-unit-tests/cond-late.mk
-unit-tests/cond-late.exp
-unit-tests/cond-short.mk
-unit-tests/cond-short.exp
+unit-tests/counter.exp
+unit-tests/counter.mk
+unit-tests/dep-colon.exp
+unit-tests/dep-colon.mk
+unit-tests/dep-double-colon.exp
+unit-tests/dep-double-colon.mk
+unit-tests/dep-exclam.exp
+unit-tests/dep-exclam.mk
+unit-tests/dep-none.exp
+unit-tests/dep-none.mk
+unit-tests/dep-var.exp
+unit-tests/dep-var.mk
+unit-tests/dep-wildcards.exp
+unit-tests/dep-wildcards.mk
+unit-tests/dep.exp
+unit-tests/dep.mk
+unit-tests/depsrc-exec.exp
+unit-tests/depsrc-exec.mk
+unit-tests/depsrc-ignore.exp
+unit-tests/depsrc-ignore.mk
+unit-tests/depsrc-made.exp
+unit-tests/depsrc-made.mk
+unit-tests/depsrc-make.exp
+unit-tests/depsrc-make.mk
+unit-tests/depsrc-meta.exp
+unit-tests/depsrc-meta.mk
+unit-tests/depsrc-nometa.exp
+unit-tests/depsrc-nometa.mk
+unit-tests/depsrc-nometa_cmp.exp
+unit-tests/depsrc-nometa_cmp.mk
+unit-tests/depsrc-nopath.exp
+unit-tests/depsrc-nopath.mk
+unit-tests/depsrc-notmain.exp
+unit-tests/depsrc-notmain.mk
+unit-tests/depsrc-optional.exp
+unit-tests/depsrc-optional.mk
+unit-tests/depsrc-phony.exp
+unit-tests/depsrc-phony.mk
+unit-tests/depsrc-precious.exp
+unit-tests/depsrc-precious.mk
+unit-tests/depsrc-recursive.exp
+unit-tests/depsrc-recursive.mk
+unit-tests/depsrc-silent.exp
+unit-tests/depsrc-silent.mk
+unit-tests/depsrc-use.exp
+unit-tests/depsrc-use.mk
+unit-tests/depsrc-usebefore.exp
+unit-tests/depsrc-usebefore.mk
+unit-tests/depsrc-usebefore-double-colon.exp
+unit-tests/depsrc-usebefore-double-colon.mk
+unit-tests/depsrc-wait.exp
+unit-tests/depsrc-wait.mk
+unit-tests/depsrc.exp
+unit-tests/depsrc.mk
+unit-tests/deptgt-begin.exp
+unit-tests/deptgt-begin.mk
+unit-tests/deptgt-default.exp
+unit-tests/deptgt-default.mk
+unit-tests/deptgt-delete_on_error.exp
+unit-tests/deptgt-delete_on_error.mk
+unit-tests/deptgt-end.exp
+unit-tests/deptgt-end.mk
+unit-tests/deptgt-error.exp
+unit-tests/deptgt-error.mk
+unit-tests/deptgt-ignore.exp
+unit-tests/deptgt-ignore.mk
+unit-tests/deptgt-interrupt.exp
+unit-tests/deptgt-interrupt.mk
+unit-tests/deptgt-main.exp
+unit-tests/deptgt-main.mk
+unit-tests/deptgt-makeflags.exp
+unit-tests/deptgt-makeflags.mk
+unit-tests/deptgt-no_parallel.exp
+unit-tests/deptgt-no_parallel.mk
+unit-tests/deptgt-nopath.exp
+unit-tests/deptgt-nopath.mk
+unit-tests/deptgt-notparallel.exp
+unit-tests/deptgt-notparallel.mk
+unit-tests/deptgt-objdir.exp
+unit-tests/deptgt-objdir.mk
+unit-tests/deptgt-order.exp
+unit-tests/deptgt-order.mk
+unit-tests/deptgt-path-suffix.exp
+unit-tests/deptgt-path-suffix.mk
+unit-tests/deptgt-path.exp
+unit-tests/deptgt-path.mk
+unit-tests/deptgt-phony.exp
+unit-tests/deptgt-phony.mk
+unit-tests/deptgt-precious.exp
+unit-tests/deptgt-precious.mk
+unit-tests/deptgt-shell.exp
+unit-tests/deptgt-shell.mk
+unit-tests/deptgt-silent.exp
+unit-tests/deptgt-silent.mk
+unit-tests/deptgt-stale.exp
+unit-tests/deptgt-stale.mk
+unit-tests/deptgt-suffixes.exp
+unit-tests/deptgt-suffixes.mk
+unit-tests/deptgt.exp
+unit-tests/deptgt.mk
+unit-tests/dir.exp
+unit-tests/dir.mk
+unit-tests/dir-expand-path.exp
+unit-tests/dir-expand-path.mk
+unit-tests/directive-elif.exp
+unit-tests/directive-elif.mk
+unit-tests/directive-elifdef.exp
+unit-tests/directive-elifdef.mk
+unit-tests/directive-elifmake.exp
+unit-tests/directive-elifmake.mk
+unit-tests/directive-elifndef.exp
+unit-tests/directive-elifndef.mk
+unit-tests/directive-elifnmake.exp
+unit-tests/directive-elifnmake.mk
+unit-tests/directive-else.exp
+unit-tests/directive-else.mk
+unit-tests/directive-endif.exp
+unit-tests/directive-endif.mk
+unit-tests/directive-error.exp
+unit-tests/directive-error.mk
+unit-tests/directive-export-env.exp
+unit-tests/directive-export-env.mk
+unit-tests/directive-export-literal.exp
+unit-tests/directive-export-literal.mk
+unit-tests/directive-export.exp
+unit-tests/directive-export.mk
+unit-tests/directive-for.exp
+unit-tests/directive-for.mk
+unit-tests/directive-for-generating-endif.exp
+unit-tests/directive-for-generating-endif.mk
+unit-tests/directive-if.exp
+unit-tests/directive-if.mk
+unit-tests/directive-ifdef.exp
+unit-tests/directive-ifdef.mk
+unit-tests/directive-ifmake.exp
+unit-tests/directive-ifmake.mk
+unit-tests/directive-ifndef.exp
+unit-tests/directive-ifndef.mk
+unit-tests/directive-ifnmake.exp
+unit-tests/directive-ifnmake.mk
+unit-tests/directive-info.exp
+unit-tests/directive-info.mk
+unit-tests/directive-undef.exp
+unit-tests/directive-undef.mk
+unit-tests/directive-unexport-env.exp
+unit-tests/directive-unexport-env.mk
+unit-tests/directive-unexport.exp
+unit-tests/directive-unexport.mk
+unit-tests/directive-warning.exp
+unit-tests/directive-warning.mk
+unit-tests/directive.exp
+unit-tests/directive.mk
+unit-tests/directives.exp
+unit-tests/directives.mk
 unit-tests/dollar.exp
 unit-tests/dollar.mk
 unit-tests/doterror.exp
 unit-tests/doterror.mk
 unit-tests/dotwait.exp
 unit-tests/dotwait.mk
+unit-tests/envfirst.exp
+unit-tests/envfirst.mk
 unit-tests/error.exp
 unit-tests/error.mk
 unit-tests/escape.exp
@@ -124,6 +309,8 @@ unit-tests/export-all.exp
 unit-tests/export-all.mk
 unit-tests/export-env.exp
 unit-tests/export-env.mk
+unit-tests/export-variants.exp
+unit-tests/export-variants.mk
 unit-tests/export.exp
 unit-tests/export.mk
 unit-tests/forloop.exp
@@ -138,6 +325,10 @@ unit-tests/include-main.exp
 unit-tests/include-main.mk
 unit-tests/include-sub.mk
 unit-tests/include-subsub.mk
+unit-tests/lint.exp
+unit-tests/lint.mk
+unit-tests/make-exported.exp
+unit-tests/make-exported.mk
 unit-tests/misc.exp
 unit-tests/misc.mk
 unit-tests/moderrs.exp
@@ -146,12 +337,62 @@ unit-tests/modmatch.exp
 unit-tests/modmatch.mk
 unit-tests/modmisc.exp
 unit-tests/modmisc.mk
-unit-tests/modorder.exp
-unit-tests/modorder.mk
 unit-tests/modts.exp
 unit-tests/modts.mk
 unit-tests/modword.exp
 unit-tests/modword.mk
+unit-tests/opt-backwards.exp
+unit-tests/opt-backwards.mk
+unit-tests/opt-chdir.exp
+unit-tests/opt-chdir.mk
+unit-tests/opt-debug.exp
+unit-tests/opt-debug.mk
+unit-tests/opt-debug-g1.exp
+unit-tests/opt-debug-g1.mk
+unit-tests/opt-define.exp
+unit-tests/opt-define.mk
+unit-tests/opt-env.exp
+unit-tests/opt-env.mk
+unit-tests/opt-file.exp
+unit-tests/opt-file.mk
+unit-tests/opt-ignore.exp
+unit-tests/opt-ignore.mk
+unit-tests/opt-include-dir.exp
+unit-tests/opt-include-dir.mk
+unit-tests/opt-jobs-internal.exp
+unit-tests/opt-jobs-internal.mk
+unit-tests/opt-jobs.exp
+unit-tests/opt-jobs.mk
+unit-tests/opt-keep-going.exp
+unit-tests/opt-keep-going.mk
+unit-tests/opt-m-include-dir.exp
+unit-tests/opt-m-include-dir.mk
+unit-tests/opt-no-action-at-all.exp
+unit-tests/opt-no-action-at-all.mk
+unit-tests/opt-no-action.exp
+unit-tests/opt-no-action.mk
+unit-tests/opt-query.exp
+unit-tests/opt-query.mk
+unit-tests/opt-raw.exp
+unit-tests/opt-raw.mk
+unit-tests/opt-silent.exp
+unit-tests/opt-silent.mk
+unit-tests/opt-touch.exp
+unit-tests/opt-touch.mk
+unit-tests/opt-tracefile.exp
+unit-tests/opt-tracefile.mk
+unit-tests/opt-var-expanded.exp
+unit-tests/opt-var-expanded.mk
+unit-tests/opt-var-literal.exp
+unit-tests/opt-var-literal.mk
+unit-tests/opt-warnings-as-errors.exp
+unit-tests/opt-warnings-as-errors.mk
+unit-tests/opt-where-am-i.exp
+unit-tests/opt-where-am-i.mk
+unit-tests/opt-x-reduce-exported.exp
+unit-tests/opt-x-reduce-exported.mk
+unit-tests/opt.exp
+unit-tests/opt.mk
 unit-tests/order.exp
 unit-tests/order.mk
 unit-tests/phony-end.exp
@@ -162,6 +403,28 @@ unit-tests/posix1.exp
 unit-tests/posix1.mk
 unit-tests/qequals.exp
 unit-tests/qequals.mk
+unit-tests/recursive.exp
+unit-tests/recursive.mk
+unit-tests/sh-dots.exp
+unit-tests/sh-dots.mk
+unit-tests/sh-jobs-error.exp
+unit-tests/sh-jobs-error.mk
+unit-tests/sh-jobs.exp
+unit-tests/sh-jobs.mk
+unit-tests/sh-leading-at.exp
+unit-tests/sh-leading-at.mk
+unit-tests/sh-leading-hyphen.exp
+unit-tests/sh-leading-hyphen.mk
+unit-tests/sh-leading-plus.exp
+unit-tests/sh-leading-plus.mk
+unit-tests/sh-meta-chars.exp
+unit-tests/sh-meta-chars.mk
+unit-tests/sh-multi-line.exp
+unit-tests/sh-multi-line.mk
+unit-tests/sh-single-line.exp
+unit-tests/sh-single-line.mk
+unit-tests/sh.exp
+unit-tests/sh.mk
 unit-tests/suffixes.exp
 unit-tests/suffixes.mk
 unit-tests/sunshcmd.exp
@@ -174,12 +437,204 @@ unit-tests/unexport-env.exp
 unit-tests/unexport-env.mk
 unit-tests/unexport.exp
 unit-tests/unexport.mk
+unit-tests/use-inference.exp
+unit-tests/use-inference.mk
+unit-tests/var-class-cmdline.exp
+unit-tests/var-class-cmdline.mk
+unit-tests/var-class-env.exp
+unit-tests/var-class-env.mk
+unit-tests/var-class-global.exp
+unit-tests/var-class-global.mk
+unit-tests/var-class-local-legacy.exp
+unit-tests/var-class-local-legacy.mk
+unit-tests/var-class-local.exp
+unit-tests/var-class-local.mk
+unit-tests/var-class.exp
+unit-tests/var-class.mk
+unit-tests/var-op-append.exp
+unit-tests/var-op-append.mk
+unit-tests/var-op-assign.exp
+unit-tests/var-op-assign.mk
+unit-tests/var-op-default.exp
+unit-tests/var-op-default.mk
+unit-tests/var-op-expand.exp
+unit-tests/var-op-expand.mk
+unit-tests/var-op-shell.exp
+unit-tests/var-op-shell.mk
+unit-tests/var-op.exp
+unit-tests/var-op.mk
 unit-tests/varcmd.exp
 unit-tests/varcmd.mk
+unit-tests/vardebug.exp
+unit-tests/vardebug.mk
+unit-tests/varfind.exp
+unit-tests/varfind.mk
 unit-tests/varmisc.exp
 unit-tests/varmisc.mk
+unit-tests/varmod-assign.exp
+unit-tests/varmod-assign.mk
+unit-tests/varmod-defined.exp
+unit-tests/varmod-defined.mk
 unit-tests/varmod-edge.exp
 unit-tests/varmod-edge.mk
+unit-tests/varmod-exclam-shell.exp
+unit-tests/varmod-exclam-shell.mk
+unit-tests/varmod-extension.exp
+unit-tests/varmod-extension.mk
+unit-tests/varmod-gmtime.exp
+unit-tests/varmod-gmtime.mk
+unit-tests/varmod-hash.exp
+unit-tests/varmod-hash.mk
+unit-tests/varmod-head.exp
+unit-tests/varmod-head.mk
+unit-tests/varmod-ifelse.exp
+unit-tests/varmod-ifelse.mk
+unit-tests/varmod-l-name-to-value.exp
+unit-tests/varmod-l-name-to-value.mk
+unit-tests/varmod-localtime.exp
+unit-tests/varmod-localtime.mk
+unit-tests/varmod-loop.exp
+unit-tests/varmod-loop.mk
+unit-tests/varmod-match-escape.exp
+unit-tests/varmod-match-escape.mk
+unit-tests/varmod-match.exp
+unit-tests/varmod-match.mk
+unit-tests/varmod-no-match.exp
+unit-tests/varmod-no-match.mk
+unit-tests/varmod-order-reverse.exp
+unit-tests/varmod-order-reverse.mk
+unit-tests/varmod-order-shuffle.exp
+unit-tests/varmod-order-shuffle.mk
+unit-tests/varmod-order.exp
+unit-tests/varmod-order.mk
+unit-tests/varmod-path.exp
+unit-tests/varmod-path.mk
+unit-tests/varmod-quote-dollar.exp
+unit-tests/varmod-quote-dollar.mk
+unit-tests/varmod-quote.exp
+unit-tests/varmod-quote.mk
+unit-tests/varmod-range.exp
+unit-tests/varmod-range.mk
+unit-tests/varmod-remember.exp
+unit-tests/varmod-remember.mk
+unit-tests/varmod-root.exp
+unit-tests/varmod-root.mk
+unit-tests/varmod-select-words.exp
+unit-tests/varmod-select-words.mk
+unit-tests/varmod-shell.exp
+unit-tests/varmod-shell.mk
+unit-tests/varmod-subst-regex.exp
+unit-tests/varmod-subst-regex.mk
+unit-tests/varmod-subst.exp
+unit-tests/varmod-subst.mk
+unit-tests/varmod-sysv.exp
+unit-tests/varmod-sysv.mk
+unit-tests/varmod-tail.exp
+unit-tests/varmod-tail.mk
+unit-tests/varmod-to-abs.exp
+unit-tests/varmod-to-abs.mk
+unit-tests/varmod-to-lower.exp
+unit-tests/varmod-to-lower.mk
+unit-tests/varmod-to-many-words.exp
+unit-tests/varmod-to-many-words.mk
+unit-tests/varmod-to-one-word.exp
+unit-tests/varmod-to-one-word.mk
+unit-tests/varmod-to-separator.exp
+unit-tests/varmod-to-separator.mk
+unit-tests/varmod-to-upper.exp
+unit-tests/varmod-to-upper.mk
+unit-tests/varmod-undefined.exp
+unit-tests/varmod-undefined.mk
+unit-tests/varmod-unique.exp
+unit-tests/varmod-unique.mk
+unit-tests/varmod.exp
+unit-tests/varmod.mk
+unit-tests/varname-dollar.exp
+unit-tests/varname-dollar.mk
+unit-tests/varname-dot-alltargets.exp
+unit-tests/varname-dot-alltargets.mk
+unit-tests/varname-dot-curdir.exp
+unit-tests/varname-dot-curdir.mk
+unit-tests/varname-dot-includes.exp
+unit-tests/varname-dot-includes.mk
+unit-tests/varname-dot-includedfromdir.exp
+unit-tests/varname-dot-includedfromdir.mk
+unit-tests/varname-dot-includedfromfile.exp
+unit-tests/varname-dot-includedfromfile.mk
+unit-tests/varname-dot-libs.exp
+unit-tests/varname-dot-libs.mk
+unit-tests/varname-dot-make-dependfile.exp
+unit-tests/varname-dot-make-dependfile.mk
+unit-tests/varname-dot-make-expand_variables.exp
+unit-tests/varname-dot-make-expand_variables.mk
+unit-tests/varname-dot-make-exported.exp
+unit-tests/varname-dot-make-exported.mk
+unit-tests/varname-dot-make-jobs-prefix.exp
+unit-tests/varname-dot-make-jobs-prefix.mk
+unit-tests/varname-dot-make-jobs.exp
+unit-tests/varname-dot-make-jobs.mk
+unit-tests/varname-dot-make-level.exp
+unit-tests/varname-dot-make-level.mk
+unit-tests/varname-dot-make-makefile_preference.exp
+unit-tests/varname-dot-make-makefile_preference.mk
+unit-tests/varname-dot-make-makefiles.exp
+unit-tests/varname-dot-make-makefiles.mk
+unit-tests/varname-dot-make-meta-bailiwick.exp
+unit-tests/varname-dot-make-meta-bailiwick.mk
+unit-tests/varname-dot-make-meta-created.exp
+unit-tests/varname-dot-make-meta-created.mk
+unit-tests/varname-dot-make-meta-files.exp
+unit-tests/varname-dot-make-meta-files.mk
+unit-tests/varname-dot-make-meta-ignore_filter.exp
+unit-tests/varname-dot-make-meta-ignore_filter.mk
+unit-tests/varname-dot-make-meta-ignore_paths.exp
+unit-tests/varname-dot-make-meta-ignore_paths.mk
+unit-tests/varname-dot-make-meta-ignore_patterns.exp
+unit-tests/varname-dot-make-meta-ignore_patterns.mk
+unit-tests/varname-dot-make-meta-prefix.exp
+unit-tests/varname-dot-make-meta-prefix.mk
+unit-tests/varname-dot-make-mode.exp
+unit-tests/varname-dot-make-mode.mk
+unit-tests/varname-dot-make-path_filemon.exp
+unit-tests/varname-dot-make-path_filemon.mk
+unit-tests/varname-dot-make-pid.exp
+unit-tests/varname-dot-make-pid.mk
+unit-tests/varname-dot-make-ppid.exp
+unit-tests/varname-dot-make-ppid.mk
+unit-tests/varname-dot-make-save_dollars.exp
+unit-tests/varname-dot-make-save_dollars.mk
+unit-tests/varname-dot-makeoverrides.exp
+unit-tests/varname-dot-makeoverrides.mk
+unit-tests/varname-dot-newline.exp
+unit-tests/varname-dot-newline.mk
+unit-tests/varname-dot-objdir.exp
+unit-tests/varname-dot-objdir.mk
+unit-tests/varname-dot-parsedir.exp
+unit-tests/varname-dot-parsedir.mk
+unit-tests/varname-dot-parsefile.exp
+unit-tests/varname-dot-parsefile.mk
+unit-tests/varname-dot-path.exp
+unit-tests/varname-dot-path.mk
+unit-tests/varname-dot-shell.exp
+unit-tests/varname-dot-shell.mk
+unit-tests/varname-dot-targets.exp
+unit-tests/varname-dot-targets.mk
+unit-tests/varname-empty.exp
+unit-tests/varname-empty.mk
+unit-tests/varname-make.exp
+unit-tests/varname-make.mk
+unit-tests/varname-make_print_var_on_error.exp
+unit-tests/varname-make_print_var_on_error.mk
+unit-tests/varname-makeflags.exp
+unit-tests/varname-makeflags.mk
+unit-tests/varname-pwd.exp
+unit-tests/varname-pwd.mk
+unit-tests/varname-vpath.exp
+unit-tests/varname-vpath.mk
+unit-tests/varname.exp
+unit-tests/varname.mk
+unit-tests/varparse-dynamic.exp
+unit-tests/varparse-dynamic.mk
 unit-tests/varquote.exp
 unit-tests/varquote.mk
 unit-tests/varshell.exp

Modified: head/contrib/bmake/LICENSE
==============================================================================
--- head/contrib/bmake/LICENSE	Sat Sep  5 19:03:34 2020	(r365365)
+++ head/contrib/bmake/LICENSE	Sat Sep  5 19:29:42 2020	(r365366)
@@ -0,0 +1,60 @@
+The individual files in this distribution are copyright their
+original contributors or assignees.
+Including:
+
+    Copyright (c) 1993-2020, Simon J Gerraty
+    Copyright (c) 2020, Roland Illig <rillig at NetBSD.org>
+    Copyright (c) 2009-2016, Juniper Networks, Inc.
+    Copyright (c) 2009, John Birrell.
+    Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
+    Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+    Copyright (c) 1989 by Berkeley Softworks
+    Copyright (c) 1988, 1989, 1990, 1992, 1993
+    	The Regents of the University of California.
+    Copyright (c) 1988, 1989 by Adam de Boor
+
+With the exception of the GNU configure script, which states:
+
+    # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+    #
+    # This configure script is free software; the Free Software Foundation
+    # gives unlimited permission to copy, distribute and modify it.
+
+The license for this distribution is considered to be:
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+example (from https://opensource.org/licenses/BSD-3-Clause):
+
+    Copyright <YEAR> <COPYRIGHT HOLDER>
+    
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    3. Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+        

Modified: head/contrib/bmake/Makefile
==============================================================================
--- head/contrib/bmake/Makefile	Sat Sep  5 19:03:34 2020	(r365365)
+++ head/contrib/bmake/Makefile	Sat Sep  5 19:29:42 2020	(r365366)
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.107 2020/06/07 21:18:46 sjg Exp $
+#	$Id: Makefile,v 1.112 2020/08/28 16:26:17 sjg Exp $
 
 PROG=	bmake
 
@@ -8,9 +8,11 @@ SRCS= \
 	compat.c \
 	cond.c \
 	dir.c \
+	enum.c \
 	for.c \
 	hash.c \
 	job.c \
+	lst.c \
 	main.c \
 	make.c \
 	make_malloc.c \
@@ -25,36 +27,6 @@ SRCS= \
 	util.c \
 	var.c
 
-# from lst.lib/
-SRCS+= \
-	lstAppend.c \
-	lstAtEnd.c \
-	lstAtFront.c \
-	lstClose.c \
-	lstConcat.c \
-	lstDatum.c \
-	lstDeQueue.c \
-	lstDestroy.c \
-	lstDupl.c \
-	lstEnQueue.c \
-	lstFind.c \
-	lstFindFrom.c \
-	lstFirst.c \
-	lstForEach.c \
-	lstForEachFrom.c \
-	lstInit.c \
-	lstInsert.c \
-	lstIsAtEnd.c \
-	lstIsEmpty.c \
-	lstLast.c \
-	lstMember.c \
-	lstNext.c \
-	lstOpen.c \
-	lstPrev.c \
-	lstRemove.c \
-	lstReplace.c \
-	lstSucc.c
-
 .-include "VERSION"
 .-include "Makefile.inc"
 
@@ -97,7 +69,6 @@ COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H:
 .endif				# USE_FILEMON
 
 .PATH:	${srcdir}
-.PATH:	${srcdir}/lst.lib
 
 .if make(obj) || make(clean)
 SUBDIR+= unit-tests
@@ -109,7 +80,7 @@ SUBDIR+= unit-tests
 # list of OS's which are derrived from BSD4.4
 BSD44_LIST= NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig
 # we are...
-OS!= uname -s
+OS := ${.MAKE.OS:U${uname -s:L:sh}}
 # are we 4.4BSD ?
 isBSD44:=${BSD44_LIST:M${OS}}
 
@@ -237,5 +208,8 @@ install-mk:
 # end-delete2

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-head mailing list