diff options
Diffstat (limited to 'filesystems/libblkid')
| -rw-r--r-- | filesystems/libblkid/Makefile | 3 | ||||
| -rw-r--r-- | filesystems/libblkid/files/patch-libblkid_meson.build | 13 | ||||
| -rw-r--r-- | filesystems/libblkid/files/patch-meson.build | 12 | ||||
| -rw-r--r-- | filesystems/libblkid/pkg-plist | 19 |
4 files changed, 21 insertions, 26 deletions
diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile index ee9533315f77..077bc2158912 100644 --- a/filesystems/libblkid/Makefile +++ b/filesystems/libblkid/Makefile @@ -1,6 +1,7 @@ PORTNAME= libblkid DISTVERSIONPREFIX= v DISTVERSION= 2.41.1 +PORTREVISION= 1 CATEGORIES= filesystems MAINTAINER= arrowd@FreeBSD.org @@ -22,7 +23,7 @@ MESON_ARGS= --auto-features=disabled \ -Dallow-32bit-time=true \ -Db_lundef=false \ -Dbuild-libblkid=enabled \ - -Dbuild-libsmartcols=enabled \ + -Dbuild-libsmartcols=disabled \ -Dprogram-tests=false # dependency of libblkid OPTIONS_DEFINE= MANPAGES diff --git a/filesystems/libblkid/files/patch-libblkid_meson.build b/filesystems/libblkid/files/patch-libblkid_meson.build new file mode 100644 index 000000000000..c1b100f4ab72 --- /dev/null +++ b/filesystems/libblkid/files/patch-libblkid_meson.build @@ -0,0 +1,13 @@ +--- libblkid/meson.build.orig 2025-06-24 07:55:28 UTC ++++ libblkid/meson.build +@@ -141,10 +141,8 @@ libblkid_link_args = [] + libblkid_link_depends = [] + libblkid_link_args = [] + +-if cc.has_link_argument('-Wl,--version-script=@0@'.format(libblkid_sym_path)) + libblkid_link_depends += [libblkid_sym] + libblkid_link_args += ['-Wl,--version-script=@0@'.format(libblkid_sym_path)] +-endif + + lib_blkid = both_libraries( + 'blkid', diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build index ba004eb9d977..f64f68b47e8f 100644 --- a/filesystems/libblkid/files/patch-meson.build +++ b/filesystems/libblkid/files/patch-meson.build @@ -1,4 +1,4 @@ ---- meson.build.orig 2025-03-18 12:50:51 UTC +--- meson.build.orig 2025-06-24 07:55:28 UTC +++ meson.build @@ -861,7 +861,7 @@ conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : fals prefix : '#include <sys/socket.h>') @@ -9,7 +9,7 @@ have_tiocglcktrmios and have_sock_cloexec and have_sock_nonblock and -@@ -1870,14 +1870,7 @@ endif +@@ -1868,14 +1868,7 @@ endif bashcompletions += ['zramctl'] endif @@ -25,7 +25,7 @@ if not is_disabler(exe) exes += exe manadocs += prlimit_manadocs -@@ -1993,15 +1986,7 @@ endif +@@ -1991,15 +1984,7 @@ endif bashcompletions += ['swapoff'] endif @@ -42,7 +42,7 @@ if not is_disabler(exe) exes += exe manadocs += lscpu_manadocs -@@ -2023,13 +2008,7 @@ endif +@@ -2021,13 +2006,7 @@ endif bashcompletions += ['chcpu'] endif @@ -57,11 +57,11 @@ if not is_disabler(exe) exes += exe manadocs += wdctl_manadocs -@@ -4026,7 +4005,6 @@ run_target( +@@ -4024,7 +4003,6 @@ run_target( depends : exes) -manadocs += lib_tcolors_manadocs if build_libblkid - manadocs += lib_blkid_manadocs + lib_smartcols_manadocs + manadocs += lib_blkid_manadocs endif diff --git a/filesystems/libblkid/pkg-plist b/filesystems/libblkid/pkg-plist index bac365512776..9e9f9a5aea60 100644 --- a/filesystems/libblkid/pkg-plist +++ b/filesystems/libblkid/pkg-plist @@ -1,28 +1,9 @@ -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/man8/blkid.8.gz -%%MANPAGES%%share/man/man8/readprofile.8.gz -%%MANPAGES%%share/man/man8/wipefs.8.gz |