The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=399faa7d3ae8938d73d58c9224123a71a2096947
commit 399faa7d3ae8938d73d58c9224123a71a2096947
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-07 11:44:01 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-07 12:36:59 +0000
share/mk: Use :ts,:[*] to stringify TAG_ARGS
This avoids a situation where we sometimes prepend an empty tag,
leading to arguments like "-T ,package=foo".
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D51785
---
share/mk/bsd.confs.mk | 2 +-
share/mk/bsd.dirs.mk | 2 +-
share/mk/bsd.doc.mk | 2 +-
share/mk/bsd.incs.mk | 2 +-
share/mk/bsd.lib.mk | 2 +-
share/mk/bsd.links.mk | 2 +-
share/mk/bsd.man.mk | 2 +-
share/mk/bsd.prog.mk | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk
index ea702cece28d..77b573c7e42c 100644
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@@ -49,7 +49,7 @@ ${group}TAGS+= package=${PACKAGE:Uutilities}
. endif
. endif
${group}TAGS+= config
-${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
+${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
. endif
diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk
index 317ff61cd604..1f81bda80eab 100644
--- a/share/mk/bsd.dirs.mk
+++ b/share/mk/bsd.dirs.mk
@@ -22,7 +22,7 @@ ${dir}_FLAG= -f ${${dir}_FLAGS}
. if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
${dir}TAGS+= package=${${dir}PACKAGE:Uutilities}
. endif
-${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g}
+${dir}TAG_ARGS= -T ${${dir}TAGS:ts,:[*]}
. endif
installdirs: installdirs-${dir}
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index ea8c68e87d50..675639db7611 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -82,7 +82,7 @@ TRFLAGS+= -t
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities}
.endif
-TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif
DCOMPRESS_EXT?= ${COMPRESS_EXT}
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index df4cf4641141..848ee0aa2ea9 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -37,7 +37,7 @@ ${group}TAGS+=
package=${${group}PACKAGE:Uutilities},dev
${group}TAGS+= package=${PACKAGE:Uutilities},dev
.endif
.endif
-${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
+${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
.endif
_${group}INCS=
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 01dd979af155..3013f32c2b36 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -72,7 +72,7 @@ TAGS+= lib${_libcompat}
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities}
.endif
-TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif
# ELF hardening knobs
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
index 437ffd0d3b34..509520a24a3a 100644
--- a/share/mk/bsd.links.mk
+++ b/share/mk/bsd.links.mk
@@ -7,7 +7,7 @@
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE}
.endif
-TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif
afterinstall: _installlinks
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 3444e9612a20..b21522796845 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -114,7 +114,7 @@ ${__group}TAGS+=
package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}-man
.endif
.endif
-${__group}TAG_ARGS= -T ${${__group}TAGS:[*]:S/ /,/g}
+${__group}TAG_ARGS= -T ${${__group}TAGS:ts,:[*]}
.endif # defined(NO_ROOT)
${__group}INSTALL?= ${INSTALL} ${${__group}TAG_ARGS} \
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index f44556ef9b75..9350d4786cec 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -129,7 +129,7 @@ STRIP?= -s
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities}
.endif
-TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif
.if defined(NO_SHARED) && ${NO_SHARED:tl} != "no"
