diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile index f628c92cb681..84849f62ca2e 100644 --- a/filesystems/libblkid/Makefile +++ b/filesystems/libblkid/Makefile @@ -1,32 +1,33 @@ PORTNAME= libblkid DISTVERSIONPREFIX= v DISTVERSION= 2.41 CATEGORIES= filesystems MAINTAINER= arrowd@FreeBSD.org COMMENT= Library to identify block devices (disks) as to their content WWW= https://github.com/util-linux/util-linux LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause USES= bison meson pkgconfig tar:xz USE_GITHUB= yes 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 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 @@ -1,59 +1,67 @@ --- meson.build.orig 2025-03-18 12:50:51 UTC +++ meson.build @@ -861,7 +861,7 @@ conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : fals prefix : '#include ') conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : false) -build_plymouth_support = (not build_plymouth_support.disabled() and +build_plymouth_support = (not build_plymouth_support.disabled() and have_tiocglcktrmios and have_sock_cloexec and have_sock_nonblock and @@ -1870,14 +1870,7 @@ endif bashcompletions += ['zramctl'] endif -exe = executable( - 'prlimit', - prlimit_sources, - include_directories : includes, - link_with : [lib_common, - lib_smartcols], - install_dir : usrbin_exec_dir, - install : true) +exe = disabler() if not is_disabler(exe) exes += exe manadocs += prlimit_manadocs @@ -1993,15 +1986,7 @@ endif bashcompletions += ['swapoff'] endif -exe = executable( - 'lscpu', - lscpu_sources, - include_directories : includes, - link_with : [lib_common, - lib_smartcols], - dependencies : [rtas_libs], - install_dir : usrbin_exec_dir, - install : true) +exe = disabler() if not is_disabler(exe) exes += exe manadocs += lscpu_manadocs @@ -2023,13 +2008,7 @@ endif bashcompletions += ['chcpu'] endif -exe = executable( - 'wdctl', - wdctl_sources, - include_directories : includes, - link_with : [lib_common, - lib_smartcols], - install : true) +exe = disabler() 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 @@ -1,29 +1,28 @@ bin/column bin/fincore bin/renice bin/setpgid bin/setsid include/blkid/blkid.h include/libsmartcols/libsmartcols.h lib/libblkid.a lib/libblkid.so lib/libblkid.so.1 lib/libblkid.so.1.1.0 lib/libsmartcols.a lib/libsmartcols.so lib/libsmartcols.so.1 lib/libsmartcols.so.1.1.0 libdata/pkgconfig/blkid.pc libdata/pkgconfig/smartcols.pc sbin/blkid sbin/readprofile sbin/wipefs %%MANPAGES%%share/man/man1/column.1.gz %%MANPAGES%%share/man/man1/fincore.1.gz %%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 @@ -1,31 +1,32 @@ PORTNAME= libuuid DISTVERSIONPREFIX= v 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 LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause USES= bison meson pkgconfig tar:xz USE_GITHUB= yes 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 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 ) +