bsd.files.mk: Fix FILESPACKAGE

Because TAGS may already have a package tag, assigning TAGS to
FILESTAGS causes the value of FILESPACKAGE to be ignored.

Only assign tags other than package, and take the default package from
${PACKAGE}, which matches the behaviour of bsd.confs.mk and bsd.man.mk.

This fixes several files that were wrongly installed in utilities,
including /usr/share/examples/sendmail/mailer.conf and some files
in /usr/share/nls.

The fix trips a bug in share/syscons where Makefile.inc was setting
FILESPACKAGE to the wrong package, but the problem was hidden because
the subdirectories set PACKAGE explicitly.  Fix this by setting the
correct FILESPACKAGE in Makefile.inc and removing the PACKAGEs.

Reviewed by:		manu
Differential Revision:	https://reviews.freebsd.org/D51784

share/mk/bsd.files.mk

@@ -39,14 +39,14 @@ STAGE_SETS+=	${group:C,[/*],_,g}
 
 .if ${group} == "FILES"
 FILESPACKAGE?=	${PACKAGE:Uutilities}
-FILESTAGS+=	${TAGS}
+FILESTAGS+=	${TAGS:Npackage=*}
 .endif
 
 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
+${group}TAGS+=		package=${${group}PACKAGE:U${PACKAGE:Uutilities}}
 .endif
-${group}TAG_ARGS=	-T ${${group}TAGS:[*]:S/ /,/g}
+${group}TAG_ARGS=	-T ${${group}TAGS:ts,:[*]}
 .endif
 
 

share/syscons/Makefile.inc

@@ -1 +1 @@
-FILESPACKAGE=	syscons
+FILESPACKAGE=	syscons-data

share/syscons/fonts/Makefile

@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \

share/syscons/keymaps/Makefile

@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
 	bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \

share/syscons/scrnmaps/Makefile

@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 SCRMAPS = armscii8-2haik8.scm \
 	  iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \
 	  iso-8859-7_to_cp437.scm \