git: db056622d645 - main - */*libuuid, */*libblkid: build MANPAGES by default as before.

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db056622d6457f10c143e3f13312fdd737841c35

commit db056622d6457f10c143e3f13312fdd737841c35
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-06-28 08:45:12 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-06-30 15:00:31 +0000

    */*libuuid, */*libblkid: build MANPAGES by default as before.
    
    in libuuid, also replace mkdir --parents GNUism by POSIX mkdir -p
    to avoid MANPAGES build issue.
    
    While here, clean up with portfmt/portclippy.
    
    PR:             251489
---
 filesystems/libblkid/Makefile                             |  9 +++++----
 filesystems/libblkid/files/patch-meson.build              |  8 ++++++++
 filesystems/libblkid/files/patch-tools_poman-translate.sh | 11 +++++++++++
 filesystems/libblkid/pkg-plist                            |  1 -
 misc/libuuid/Makefile                                     |  9 +++++----
 misc/libuuid/files/patch-tools_poman-translate.sh         | 11 +++++++++++
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile
index f628c92cb681..84849f62ca2e 100644
--- a/filesystems/libblkid/Makefile
+++ b/filesystems/libblkid/Makefile
@@ -17,16 +17,17 @@ GH_ACCOUNT=	util-linux
 GH_PROJECT=	util-linux
 
 USE_LDCONFIG=	yes
-OPTIONS_SUB=	yes
 # disable all Meson features because the project has gazillion of them and we only need few
 MESON_ARGS=	--auto-features=disabled \
-		-Db_lundef=false \
-		-Dprogram-tests=false \
 		-Dallow-32bit-time=true \
+		-Db_lundef=false \
 		-Dbuild-libblkid=enabled \
-		-Dbuild-libsmartcols=enabled # dependency of libblkid
+		-Dbuild-libsmartcols=enabled \
+		-Dprogram-tests=false # dependency of libblkid
 
 OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=		yes
 MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 
 .include <bsd.port.mk>
diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build
index 757fff747c84..ba004eb9d977 100644
--- a/filesystems/libblkid/files/patch-meson.build
+++ b/filesystems/libblkid/files/patch-meson.build
@@ -57,3 +57,11 @@
  if not is_disabler(exe)
    exes += exe
    manadocs += wdctl_manadocs
+@@ -4026,7 +4005,6 @@ run_target(
+   depends : exes)
+ 
+ 
+-manadocs += lib_tcolors_manadocs
+ if build_libblkid
+   manadocs += lib_blkid_manadocs + lib_smartcols_manadocs
+ endif
diff --git a/filesystems/libblkid/files/patch-tools_poman-translate.sh b/filesystems/libblkid/files/patch-tools_poman-translate.sh
new file mode 100644
index 000000000000..ed558d9f2d9a
--- /dev/null
+++ b/filesystems/libblkid/files/patch-tools_poman-translate.sh
@@ -0,0 +1,11 @@
+--- tools/poman-translate.sh.orig	2025-03-18 12:50:51 UTC
++++ tools/poman-translate.sh
+@@ -82,7 +82,7 @@ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asci
+ mapfile -t LOCALES < <( awk '/\[po4a_langs\]/ {for (i=2; i<=NF; i++) print $i}' "$PO4ACFG" )
+ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asciidoc\]/ {print $2;}' "$PO4ACFG" )
+ 
+-mkdir --parents "$DESTDIR"
++mkdir -p "$DESTDIR"
+ 
+ DESTDIR=$( OLDPWD=- CDPATH='' cd -P -- "$DESTDIR" && pwd )
+ 
diff --git a/filesystems/libblkid/pkg-plist b/filesystems/libblkid/pkg-plist
index 31f9a10f43fe..bac365512776 100644
--- a/filesystems/libblkid/pkg-plist
+++ b/filesystems/libblkid/pkg-plist
@@ -23,7 +23,6 @@ sbin/wipefs
 %%MANPAGES%%share/man/man1/renice.1.gz
 %%MANPAGES%%share/man/man3/libblkid.3.gz
 %%MANPAGES%%share/man/man5/scols-filter.5.gz
-%%MANPAGES%%share/man/man5/terminal-colors.d.5.gz
 %%MANPAGES%%share/man/man8/blkid.8.gz
 %%MANPAGES%%share/man/man8/readprofile.8.gz
 %%MANPAGES%%share/man/man8/wipefs.8.gz
diff --git a/misc/libuuid/Makefile b/misc/libuuid/Makefile
index 5eb883649987..8ace78be042d 100644
--- a/misc/libuuid/Makefile
+++ b/misc/libuuid/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	2.41
 CATEGORIES=	misc
 
 MAINTAINER=	arrowd@FreeBSD.org
-COMMENT=	Library that generates and parses 128-bit Universally Unique IDs (UUIDs)
+COMMENT=	Library to generate or parse 128-bit Universally Unique IDs (UUIDs)
 WWW=		https://github.com/util-linux/util-linux
 
 LICENSE=	BSD3CLAUSE
@@ -17,15 +17,16 @@ GH_ACCOUNT=	util-linux
 GH_PROJECT=	util-linux
 
 USE_LDCONFIG=	yes
-OPTIONS_SUB=	yes
 # disable all Meson features because the project has gazillion of them and we only need one
 MESON_ARGS=	--auto-features=disabled \
-		-Ddefault_library=both \
-		-Dbuild-libuuid=enabled \
 		-Dallow-32bit-time=true \
+		-Dbuild-libuuid=enabled \
+		-Ddefault_library=both \
 		-Dprogram-tests=false
 
 OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=		yes
 MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 
 .include <bsd.port.mk>
diff --git a/misc/libuuid/files/patch-tools_poman-translate.sh b/misc/libuuid/files/patch-tools_poman-translate.sh
new file mode 100644
index 000000000000..ed558d9f2d9a
--- /dev/null
+++ b/misc/libuuid/files/patch-tools_poman-translate.sh
@@ -0,0 +1,11 @@
+--- tools/poman-translate.sh.orig	2025-03-18 12:50:51 UTC
++++ tools/poman-translate.sh
+@@ -82,7 +82,7 @@ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asci
+ mapfile -t LOCALES < <( awk '/\[po4a_langs\]/ {for (i=2; i<=NF; i++) print $i}' "$PO4ACFG" )
+ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asciidoc\]/ {print $2;}' "$PO4ACFG" )
+ 
+-mkdir --parents "$DESTDIR"
++mkdir -p "$DESTDIR"
+ 
+ DESTDIR=$( OLDPWD=- CDPATH='' cd -P -- "$DESTDIR" && pwd )
+