diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile index 3367ae62ac6b..d1c45e495970 100644 --- a/filesystems/libblkid/Makefile +++ b/filesystems/libblkid/Makefile @@ -1,34 +1,33 @@ PORTNAME= libblkid DISTVERSIONPREFIX= v -DISTVERSION= 2.41.1 -PORTREVISION= 2 +DISTVERSION= 2.42.1 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 # disable all Meson features because the project has gazillion of them and we only need few MESON_ARGS= --auto-features=disabled \ -Dallow-32bit-time=true \ -Db_lundef=false \ -Dbuild-libblkid=enabled \ -Dbuild-libsmartcols=disabled \ -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/distinfo b/filesystems/libblkid/distinfo index 3723891011d8..7527ba31831f 100644 --- a/filesystems/libblkid/distinfo +++ b/filesystems/libblkid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751103248 -SHA256 (util-linux-util-linux-v2.41.1_GH0.tar.gz) = 61a9785cbf04091286ec2bbfb78e87c35e6380f084f38115a4677b90b9ad4437 -SIZE (util-linux-util-linux-v2.41.1_GH0.tar.gz) = 16084246 +TIMESTAMP = 1780148244 +SHA256 (util-linux-util-linux-v2.42.1_GH0.tar.gz) = 138a3bd9049afa5eeeea73f1e9c0ed7bddf3e55ba4ec29924965a932ec738f01 +SIZE (util-linux-util-linux-v2.42.1_GH0.tar.gz) = 18086672 diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build index f64f68b47e8f..ab2031e21035 100644 --- a/filesystems/libblkid/files/patch-meson.build +++ b/filesystems/libblkid/files/patch-meson.build @@ -1,67 +1,58 @@ --- 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 ') - 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 @@ -1868,14 +1868,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 @@ -1991,15 +1984,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 @@ -2021,13 +2006,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 @@ -4024,7 +4003,6 @@ run_target( depends : exes) -manadocs += lib_tcolors_manadocs if build_libblkid manadocs += lib_blkid_manadocs endif