The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1e629ebb15db9ee0cb11a3654d7bcd3046a0df54
commit 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-07 11:43:25 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-07 12:36:59 +0000
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 | 6 +++---
share/syscons/Makefile.inc | 2 +-
share/syscons/fonts/Makefile | 2 --
share/syscons/keymaps/Makefile | 2 --
share/syscons/scrnmaps/Makefile | 2 --
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index aedc414d6a28..3ec4da010577 100644
--- a/share/mk/bsd.files.mk
+++ b/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
diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc
index 07cde30e3d52..d4635b273f40 100644
--- a/share/syscons/Makefile.inc
+++ b/share/syscons/Makefile.inc
@@ -1 +1 @@
-FILESPACKAGE= syscons
+FILESPACKAGE= syscons-data
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index e1b6614b5684..ba3341da87e3 100644
--- a/share/syscons/fonts/Makefile
+++ b/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 \
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 139834abcd2b..bf0099288a19 100644
--- a/share/syscons/keymaps/Makefile
+++ b/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 \
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 8da31ed32be4..ffbd6be3df4d 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/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 \
