Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed

after r298107

Summary of changes:

- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
  namespacing is kept with FILES appropriately, and that this shouldn't need
  to be repeated if the namespace changes -- only the definition of PACKAGE
  needs to be changed
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
  `tests`. In the event we get to the point where things can be split up
  enough in the base system, it would make more sense to group the tests
  with the blocks they're a part of, e.g. byacc with byacc-tests, etc
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
  previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
  bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
  ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk.
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
  and lib/libc/tests/net/getaddrinfo
- Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup)

Document the proposed changes in share/examples/tests/tests/... via examples
so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of
replacing FILES. share/mk/bsd.README didn't seem like the appropriate method
of communicating that info.

MFC after: never probably
X-MFC with: r298107
PR: 209114
Relnotes: yes
Tested with: buildworld, installworld, checkworld; buildworld, packageworld
Sponsored by: EMC / Isilon Storage Division

49 files changed, 278 insertions, 390 deletions

diff --git a/usr.bin/bmake/tests/Makefile b/usr.bin/bmake/tests/Makefile
index ee3dcf2f3968..6c343dac5900 100644
--- a/usr.bin/bmake/tests/Makefile
+++ b/usr.bin/bmake/tests/Makefile
@@ -1,13 +1,9 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTSDIR=	${TESTSBASE}/usr.bin/bmake
 
-FILESDIR=	${TESTSDIR}
-FILES=		common.sh
-FILES+=		test-new.mk
+${PACKAGE}FILES+=	common.sh
+${PACKAGE}FILES+=	test-new.mk
 
 TESTS_SUBDIRS=	archives
 TESTS_SUBDIRS+=	basic
diff --git a/usr.bin/bmake/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile
index c8914b94942f..f80ffc2e8989 100644
--- a/usr.bin/bmake/tests/archives/Makefile
+++ b/usr.bin/bmake/tests/archives/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives
 
 TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index 5ef093f61708..99a2093b5f7b 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,35 +1,33 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.status.3
-FILES+=		expected.status.4
-FILES+=		expected.status.5
-FILES+=		expected.status.6
-FILES+=		expected.status.7
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stderr.3
-FILES+=		expected.stderr.4
-FILES+=		expected.stderr.5
-FILES+=		expected.stderr.6
-FILES+=		expected.stderr.7
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		expected.stdout.3
-FILES+=		expected.stdout.4
-FILES+=		expected.stdout.5
-FILES+=		expected.stdout.6
-FILES+=		expected.stdout.7
-FILES+=		libtest.a
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.status.2
+${PACKAGE}FILES+=	expected.status.3
+${PACKAGE}FILES+=	expected.status.4
+${PACKAGE}FILES+=	expected.status.5
+${PACKAGE}FILES+=	expected.status.6
+${PACKAGE}FILES+=	expected.status.7
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stderr.2
+${PACKAGE}FILES+=	expected.stderr.3
+${PACKAGE}FILES+=	expected.stderr.4
+${PACKAGE}FILES+=	expected.stderr.5
+${PACKAGE}FILES+=	expected.stderr.6
+${PACKAGE}FILES+=	expected.stderr.7
+${PACKAGE}FILES+=	expected.stdout.1
+${PACKAGE}FILES+=	expected.stdout.2
+${PACKAGE}FILES+=	expected.stdout.3
+${PACKAGE}FILES+=	expected.stdout.4
+${PACKAGE}FILES+=	expected.stdout.5
+${PACKAGE}FILES+=	expected.stdout.6
+${PACKAGE}FILES+=	expected.stdout.7
+${PACKAGE}FILES+=	libtest.a
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 0b9db19071fd..baf3e440c3cc 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,35 +1,33 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.status.3
-FILES+=		expected.status.4
-FILES+=		expected.status.5
-FILES+=		expected.status.6
-FILES+=		expected.status.7
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stderr.3
-FILES+=		expected.stderr.4
-FILES+=		expected.stderr.5
-FILES+=		expected.stderr.6
-FILES+=		expected.stderr.7
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		expected.stdout.3
-FILES+=		expected.stdout.4
-FILES+=		expected.stdout.5
-FILES+=		expected.stdout.6
-FILES+=		expected.stdout.7
-FILES+=		libtest.a
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.status.2
+${PACKAGE}FILES+=	expected.status.3
+${PACKAGE}FILES+=	expected.status.4
+${PACKAGE}FILES+=	expected.status.5
+${PACKAGE}FILES+=	expected.status.6
+${PACKAGE}FILES+=	expected.status.7
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stderr.2
+${PACKAGE}FILES+=	expected.stderr.3
+${PACKAGE}FILES+=	expected.stderr.4
+${PACKAGE}FILES+=	expected.stderr.5
+${PACKAGE}FILES+=	expected.stderr.6
+${PACKAGE}FILES+=	expected.stderr.7
+${PACKAGE}FILES+=	expected.stdout.1
+${PACKAGE}FILES+=	expected.stdout.2
+${PACKAGE}FILES+=	expected.stdout.3
+${PACKAGE}FILES+=	expected.stdout.4
+${PACKAGE}FILES+=	expected.stdout.5
+${PACKAGE}FILES+=	expected.stdout.6
+${PACKAGE}FILES+=	expected.stdout.7
+${PACKAGE}FILES+=	libtest.a
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index b76bdc19164e..2dbfa64e1b82 100644
--- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,35 +1,32 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.status.3
-FILES+=		expected.status.4
-FILES+=		expected.status.5
-FILES+=		expected.status.6
-FILES+=		expected.status.7
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stderr.3
-FILES+=		expected.stderr.4
-FILES+=		expected.stderr.5
-FILES+=		expected.stderr.6
-FILES+=		expected.stderr.7
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		expected.stdout.3
-FILES+=		expected.stdout.4
-FILES+=		expected.stdout.5
-FILES+=		expected.stdout.6
-FILES+=		expected.stdout.7
-FILES+=		libtest.a
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.status.2
+${PACKAGE}FILES+=	expected.status.3
+${PACKAGE}FILES+=	expected.status.4
+${PACKAGE}FILES+=	expected.status.5
+${PACKAGE}FILES+=	expected.status.6
+${PACKAGE}FILES+=	expected.status.7
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stderr.2
+${PACKAGE}FILES+=	expected.stderr.3
+${PACKAGE}FILES+=	expected.stderr.4
+${PACKAGE}FILES+=	expected.stderr.5
+${PACKAGE}FILES+=	expected.stderr.6
+${PACKAGE}FILES+=	expected.stderr.7
+${PACKAGE}FILES+=	expected.stdout.1
+${PACKAGE}FILES+=	expected.stdout.2
+${PACKAGE}FILES+=	expected.stdout.3
+${PACKAGE}FILES+=	expected.stdout.4
+${PACKAGE}FILES+=	expected.stdout.5
+${PACKAGE}FILES+=	expected.stdout.6
+${PACKAGE}FILES+=	expected.stdout.7
+${PACKAGE}FILES+=	libtest.a
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile
index 1164a44674bd..56dfb33901c0 100644
--- a/usr.bin/bmake/tests/basic/Makefile
+++ b/usr.bin/bmake/tests/basic/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic
 
 TESTS_SUBDIRS=	t0 t1 t2 t3
diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index d1ee84d9a5b3..0f82a6491218 100644
--- a/usr.bin/bmake/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 3faeffab7764..b4bdb25aac52 100644
--- a/usr.bin/bmake/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index 6d7b6b494c43..1f0f7f95fa68 100644
--- a/usr.bin/bmake/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index 2b268e92f506..05532f3824d9 100644
--- a/usr.bin/bmake/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile
index 5b3bab7b76fd..2c91bbba23ea 100644
--- a/usr.bin/bmake/tests/execution/Makefile
+++ b/usr.bin/bmake/tests/execution/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution
 
 TESTS_SUBDIRS=	ellipsis empty joberr plus
diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index abc8b9e496e9..e3008fad6fe1 100644
--- a/usr.bin/bmake/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index 282814036f20..3a9390c65549 100644
--- a/usr.bin/bmake/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index 7056afdb1653..8eeaa82e68a4 100644
--- a/usr.bin/bmake/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index c5e42bd385a4..884b991721d1 100644
--- a/usr.bin/bmake/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile
index ca0c99f1aa4c..13b570ea64db 100644
--- a/usr.bin/bmake/tests/shell/Makefile
+++ b/usr.bin/bmake/tests/shell/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell
 
 TESTS_SUBDIRS=	builtin meta path path_select replace select
diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index 713e8256315d..d603c46b8f06 100644
--- a/usr.bin/bmake/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		sh
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.status.2
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stderr.2
+${PACKAGE}FILES+=	expected.stdout.1
+${PACKAGE}FILES+=	expected.stdout.2
+${PACKAGE}FILES+=	sh
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index 4b14289a9b1b..f7cab6c3bae6 100644
--- a/usr.bin/bmake/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		sh
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.status.2
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stderr.2
+${PACKAGE}FILES+=	expected.stdout.1
+${PACKAGE}FILES+=	expected.stdout.2
+${PACKAGE}FILES+=	sh
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index 8b1ce86794b2..6dbb8728df4a 100644
--- a/usr.bin/bmake/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		sh
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		sh
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index acc63395abc5..7fecfd327e50 100644
--- a/usr.bin/bmake/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		shell
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		shell
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index b0f21ab5e747..980b99c95c8e 100644
--- a/usr.bin/bmake/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		shell
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		shell
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index e62701000031..1695c881d3ad 100644
--- a/usr.bin/bmake/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,19 +1,17 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile
index 0839dfab3742..60ec86e7e5ee 100644
--- a/usr.bin/bmake/tests/suffixes/Makefile
+++ b/usr.bin/bmake/tests/suffixes/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes
 
 TESTS_SUBDIRS=	basic src_wild1 src_wild2
diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index d917de0c0f21..bbfc150a6925 100644
--- a/usr.bin/bmake/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,17 +1,15 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		TEST1.a
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES=		Makefile.test
+${PACKAGE}FILES+=		TEST1.a
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index 621ec60ce75d..cfcfdca987a8 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		TEST1.a
-FILES+=		TEST2.a
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		TEST1.a
+${PACKAGE}FILES+=		TEST2.a
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index a1c65351933b..d66ca354c443 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		TEST1.a
-FILES+=		TEST2.a
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		TEST1.a
+${PACKAGE}FILES+=		TEST2.a
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile
index 2dd0df5995ce..3cd89f84428f 100644
--- a/usr.bin/bmake/tests/syntax/Makefile
+++ b/usr.bin/bmake/tests/syntax/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax
 
 TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
index e790b942f6d2..d29b8307ea1c 100644
--- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 0ba16a788c12..b41c752f861b 100644
--- a/usr.bin/bmake/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,28 +1,26 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.status.3
-FILES+=		expected.status.4
-FILES+=		expected.status.5
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stderr.3
-FILES+=		expected.stderr.4
-FILES+=		expected.stderr.5
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		expected.stdout.3
-FILES+=		expected.stdout.4
-FILES+=		expected.stdout.5
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.status.3
+${PACKAGE}FILES+=		expected.status.4
+${PACKAGE}FILES+=		expected.status.5
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stderr.3
+${PACKAGE}FILES+=		expected.stderr.4
+${PACKAGE}FILES+=		expected.stderr.5
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		expected.stdout.3
+${PACKAGE}FILES+=		expected.stdout.4
+${PACKAGE}FILES+=		expected.stdout.5
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 3e56b2b76a8e..eae22ec84e0c 100644
--- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,19 +1,17 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index cb57bbc71efe..c48e1759af9a 100644
--- a/usr.bin/bmake/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,19 +1,17 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile
index 8dccb0359d7c..90d90f1ddbd4 100644
--- a/usr.bin/bmake/tests/sysmk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk
 
 TESTS_SUBDIRS=	t0 t1 t2
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 87e6827d57fd..0522432e666b 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 2a6fc75df7e8..22048078844b 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index d31d5619f65e..f38383c4e893 100644
--- a/usr.bin/bmake/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index e7620a5afce3..ef40ab9a968c 100644
--- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
-FILESDIR=		${TESTSDIR}
-FILES=			sys.mk.test
-FILESNAME_sys.mk.test=	sys.mk
+${PACKAGE}FILES+=	sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test=	sys.mk
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index a66fb25cb87e..eb01f5de1315 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		cleanup
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		cleanup
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index bf3991a63bf3..7c2e61927ecf 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index fac186f0d8a3..4d3282345516 100644
--- a/usr.bin/bmake/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index dc46dd8b3e74..dea788d288b3 100644
--- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
-FILESDIR=		${TESTSDIR}
-FILES=			sys.mk.test
-FILESNAME_sys.mk.test=	sys.mk
+${PACKAGE}FILES+=		sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test=	sys.mk
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index 5ce319487925..36d05750553b 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		cleanup
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		cleanup
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 9b0526ff333d..7d1c68e637bd 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 1c6bad0b9779..734c7d8802a0 100644
--- a/usr.bin/bmake/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 7aec6561e77a..f35c07c45829 100644
--- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
-FILESDIR=		${TESTSDIR}
-FILES=			sys.mk.test
-FILESNAME_sys.mk.test=	sys.mk
+${PACKAGE}FILES+=	sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test=	sys.mk
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile
index 56615dfb0efe..e010718e65a4 100644
--- a/usr.bin/bmake/tests/variables/Makefile
+++ b/usr.bin/bmake/tests/variables/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables
 
 TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
index 5841047477e5..f4bd3244edbe 100644
--- a/usr.bin/bmake/tests/variables/modifier_M/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stdout.1
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index b35881a4afb6..364ff1198c38 100644
--- a/usr.bin/bmake/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,22 +1,20 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.status.3
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stderr.3
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
-FILES+=		expected.stdout.3
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.status.3
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stderr.3
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		expected.stdout.3
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index f52507f202f4..cd9cb511bdfa 100644
--- a/usr.bin/bmake/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,19 +1,17 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.status.2
-FILES+=		expected.stderr.1
-FILES+=		expected.stderr.2
-FILES+=		expected.stdout.1
-FILES+=		expected.stdout.2
+${PACKAGE}FILES+=		Makefile.test
+${PACKAGE}FILES+=		expected.status.1
+${PACKAGE}FILES+=		expected.status.2
+${PACKAGE}FILES+=		expected.stderr.1
+${PACKAGE}FILES+=		expected.stderr.2
+${PACKAGE}FILES+=		expected.stdout.1
+${PACKAGE}FILES+=		expected.stdout.2
 
 .include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index 4b845d71db75..50a8ff7bd59f 100644
--- a/usr.bin/bmake/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test
 
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
+${PACKAGE}FILES+=	Makefile.test
+${PACKAGE}FILES+=	expected.status.1
+${PACKAGE}FILES+=	expected.stderr.1
+${PACKAGE}FILES+=	expected.stdout.1
 
 .include <bsd.test.mk>