The branch stable/14 has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4f295cd38b0a59d56bfdebb10346e2e91ebf7c19
commit 4f295cd38b0a59d56bfdebb10346e2e91ebf7c19
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-07 11:43:25 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-23 00:10:12 +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.
In stable/14, this creates a new FreeBSD-examples package, so add an
entry to Makefile.packages.
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D51784
(cherry picked from commit 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54)
---
release/packages/Makefile.package | 2 ++
share/mk/bsd.files.mk | 6 +++---
share/syscons/Makefile.inc | 3 +--
share/syscons/fonts/Makefile | 3 ---
share/syscons/keymaps/Makefile | 3 ---
share/syscons/scrnmaps/Makefile | 3 ---
6 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/release/packages/Makefile.package
b/release/packages/Makefile.package
index 0f7cec0fb5a1..b1b735c61c84 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -61,6 +61,8 @@ efi-tools_COMMENT= UEFI Utilities
efi-tools_DESC= UEFI Utilities
elftoolchain_COMMENT= ElfToolchain programs and libraries
elftoolchain_DESC= ElfToolchain programs and libraries
+examples_COMMENT= Examples in /usr/share/examples
+examples_DESC= Examples in /usr/share/examples
fetch_COMMENT= Fetch Utility
fetch_DESC= Fetch Utility
ftp_COMMENT= FTP Utilities
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index a330a8dddbbd..c074362ae7f4 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 0b22547cec2f..d4635b273f40 100644
--- a/share/syscons/Makefile.inc
+++ b/share/syscons/Makefile.inc
@@ -1,2 +1 @@
-
-FILESPACKAGE= syscons
+FILESPACKAGE= syscons-data
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 8dfd012c9103..ba3341da87e3 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,6 +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 a8aaa08c47d3..bf0099288a19 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,6 +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 b7e94fd16293..ffbd6be3df4d 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,6 +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 \
