Final pass through to fix 'tests' packaging.

Sponsored by:	The FreeBSD Foundation

lib/libc/tests/tls/dso/Makefile

@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE= tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 

tests/sys/geom/class/uzip/Makefile

@@ -8,7 +8,6 @@ PACKAGE=	tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 IMAGE=		1.img
 ZIMAGE=		${IMAGE}.uzip
@@ -33,9 +32,11 @@ FILESNAME_conf.sh=	conf.sh
 FILES+=		${UZIMAGE}
 FILESDIR=	${TESTSDIR}
 
-FILESGROUPS=	FILES etalon
+FILESGROUPS+=	FILES etalon
 etalon+=	etalon/etalon.txt
 etalonDIR=	${TESTSDIR}/etalon
+FILESPACKAGE=	${PACKAGE}
+etalonPACKAGE=	${PACKAGE}
 
 TAP_TESTS_SH+=	1_test