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

7 files changed, 53 insertions, 68 deletions

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>