git: 4fe60704ca37 - stable/15 - METALOG: Order keyword entries

The branch stable/15 has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=4fe60704ca377fde39e4576638189d6b74a38e0c

commit 4fe60704ca377fde39e4576638189d6b74a38e0c
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-01-26 20:19:44 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-02-03 02:28:03 +0000

    METALOG: Order keyword entries
    
    To facilitate comparison with mtree -C generated output, keep the
    keywords ordered.
    
    No functional change intended.
    
    Reviewed by:    imp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D54872
    
    (cherry picked from commit fe962e33d86f888b496b17251c8bedebf92be8ee)
---
 lib/libc/gen/Makefile.inc       | 6 +++---
 share/man/Makefile              | 4 ++--
 sys/conf/kmod.mk                | 2 +-
 sys/modules/Makefile            | 2 +-
 usr.sbin/services_mkdb/Makefile | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index b274874973a3..3e68f8400c5c 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -587,8 +587,8 @@ install-passwd: .PHONY
 	${PWD_MKDB_CMD} -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT) && defined(METALOG)
 	( \
-		echo ".${DISTBASE}/etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
-		echo ".${DISTBASE}/etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
-		echo ".${DISTBASE}/etc/passwd type=file mode=0644 uname=root gname=wheel"; \
+		echo ".${DISTBASE}/etc/pwd.db type=file uname=root gname=wheel mode=0644"; \
+		echo ".${DISTBASE}/etc/spwd.db type=file uname=root gname=wheel mode=0600"; \
+		echo ".${DISTBASE}/etc/passwd type=file uname=root gname=wheel mode=0644"; \
 	) | cat -l >> ${METALOG}
 .endif
diff --git a/share/man/Makefile b/share/man/Makefile
index 51e560e199a5..9a8054f0651a 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -10,13 +10,13 @@ makedb:
 .if ${MK_MAN_UTILS} != "no"
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${BINDIR}/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${BINDIR}/man/mandoc.db type=file uname=root gname=wheel mode=0644" | \
 		cat -l >> ${METALOG}
 .endif
 .if ${MK_OPENSSL} != "no"
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${BINDIR}/openssl/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${BINDIR}/openssl/man/mandoc.db type=file uname=root gname=wheel mode=0644" | \
 		cat -l >> ${METALOG}
 .endif
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6e20dce0653f..00335f24e2e4 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -383,7 +383,7 @@ afterinstall: _kldxref
 _kldxref: .PHONY
 	${KLDXREF_CMD} ${DESTDIR}${KMODDIR}
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \
 	    cat -l >> ${METALOG}
 .endif
 .endif
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 924ddd880000..27b96d68a94c 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -957,7 +957,7 @@ SUBDIR:= ${SUBDIR:N${reject}}
 afterinstall: .PHONY
 	${KLDXREF_CMD} ${DESTDIR}${KMODDIR}
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \
 	    cat -l >> ${METALOG}
 .endif
 .endif
diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile
index c1c7ca0bfcff..175b190d4982 100644
--- a/usr.sbin/services_mkdb/Makefile
+++ b/usr.sbin/services_mkdb/Makefile
@@ -15,7 +15,7 @@ afterinstallconfig:
 	${SERVICES_MKDB_CMD} ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
 		${DESTDIR}/etc/services
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}/var/db/services.db type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}/var/db/services.db type=file uname=root gname=wheel mode=0644" | \
 		cat -l >> ${METALOG}
 .endif
 .endif