git: e81eda36a8fe - main - */*: Switch to misc/libuuid and misc/libblkid
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Jun 2025 15:03:09 UTC
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e81eda36a8fe2b02133674d52cd27f38a3b65d8b
commit e81eda36a8fe2b02133674d52cd27f38a3b65d8b
Author: Alexander Shursha <kekek2@ya.ru>
AuthorDate: 2024-12-19 08:08:51 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-06-30 14:57:32 +0000
*/*: Switch to misc/libuuid and misc/libblkid
PR: 221293
PR: 251489
PR: 257070
---
audio/audacity/Makefile | 2 +-
audio/gsequencer/Makefile | 2 +-
audio/ladish/Makefile | 2 +-
audio/lash/Makefile | 2 +-
audio/libgig/Makefile | 3 ++-
audio/linuxsampler/Makefile | 3 ++-
audio/owntone/Makefile | 2 +-
audio/shairport-sync/Makefile | 3 ++-
benchmarks/flowgrind/Makefile | 4 ++--
cad/horizon-eda/Makefile | 2 +-
chinese/fcitx/Makefile | 2 +-
databases/evolution-data-server/Makefile | 2 +-
databases/keydb/Makefile | 3 ++-
databases/proxysql/Makefile | 4 ++--
databases/recutils/Makefile | 4 ++--
databases/xrootd/Makefile | 2 +-
deskutils/bijiben/Makefile | 2 +-
deskutils/presage/Makefile | 4 ++--
deskutils/simpleagenda/Makefile | 3 ++-
devel/RStudio/Makefile | 2 +-
devel/appstream-glib/Makefile | 3 ++-
devel/babeltrace/Makefile | 4 ++--
devel/ignition-common/Makefile | 2 +-
devel/libcrossguid/Makefile | 3 ++-
devel/libdap/Makefile | 2 +-
devel/libewf/Makefile | 3 ++-
devel/libsml/Makefile | 4 ++--
devel/msitools/Makefile | 2 +-
devel/pecl-uuid/Makefile | 3 ++-
devel/util-linux/Makefile | 4 ++--
devel/xeus-cling/Makefile | 4 ++--
devel/xeus-zmq/Makefile | 4 ++--
devel/xeus/Makefile | 3 ++-
filesystems/e2fsprogs-core/Makefile | 11 +++--------
.../e2fsprogs-core/files/patch-misc__Makefile.in | 17 +++++++++++++----
filesystems/e2fsprogs-core/files/unwanted | 8 --------
filesystems/e2fsprogs-core/pkg-plist | 4 +---
filesystems/httpdirfs/Makefile | 2 +-
filesystems/ltfs/Makefile | 3 ++-
filesystems/ntfs/Makefile | 4 ++--
games/endless-sky/Makefile | 3 ++-
games/moonlight-embedded-devel/Makefile | 2 +-
games/moonlight-embedded/Makefile | 2 +-
lang/chez-scheme/Makefile | 3 ++-
lang/io/Makefile | 2 +-
lang/io/Makefile.addons | 2 +-
lang/lfortran/Makefile | 2 +-
lang/pharo/Makefile | 3 ++-
mail/cyrus-imapd310/Makefile | 2 +-
mail/cyrus-imapd312/Makefile | 2 +-
mail/cyrus-imapd32/Makefile | 2 +-
mail/cyrus-imapd34/Makefile | 2 +-
mail/cyrus-imapd36/Makefile | 2 +-
mail/cyrus-imapd38/Makefile | 2 +-
math/cadabra2/Makefile | 2 +-
math/topologic/Makefile | 2 +-
misc/biblesync/Makefile | 4 ++--
misc/ignition-fuel-tools/Makefile | 4 ++--
misc/ola/Makefile | 2 +-
misc/xiphos/Makefile | 2 +-
multimedia/kodi/Makefile | 2 +-
multimedia/obs-studio/Makefile | 2 +-
net-im/profanity/Makefile | 2 +-
net-im/telepathy-gabble/Makefile | 2 +-
net-mgmt/netdata/Makefile | 2 +-
net-mgmt/networkmanager-shim/Makefile | 2 +-
net-mgmt/seafile-client/Makefile | 3 ++-
net-mgmt/seafile-gui/Makefile | 3 ++-
net-mgmt/seafile-server/Makefile | 3 ++-
net-p2p/aeron/Makefile | 2 +-
net/asterisk18/Makefile | 2 +-
net/asterisk20/Makefile | 2 +-
net/asterisk22/Makefile | 2 +-
net/freeswitch/Makefile | 2 +-
net/glusterfs/Makefile | 4 ++--
net/gupnp/Makefile | 2 +-
net/mosquitto/Makefile | 2 +-
net/pacemaker2/Makefile.common | 2 +-
science/bout++/Makefile | 2 +-
science/cdo/Makefile | 2 +-
science/openmodelica/Makefile | 2 +-
science/orthanc/Makefile | 2 +-
science/qbox/Makefile | 3 ++-
security/gvm-libs/Makefile | 2 +-
security/snort3/Makefile | 3 ++-
security/sssd2/Makefile | 2 +-
security/tpm2-tools/Makefile | 4 ++--
security/tpm2-tss/Makefile | 2 +-
shells/schemesh/Makefile | 2 +-
sysutils/cluster-glue/Makefile | 2 +-
sysutils/gdisk/Makefile | 3 ++-
sysutils/passwordsafe/Makefile | 2 +-
sysutils/rsyslog8/Makefile | 2 +-
sysutils/syslog-ng/Makefile | 2 +-
sysutils/u-boot-master/Makefile | 4 ++--
textproc/fcitx5/Makefile | 2 +-
www/davix/Makefile | 2 +-
www/libepc/Makefile | 4 ++--
www/ot-recorder/Makefile | 5 +++--
x11-wm/hyprland/Makefile | 2 +-
x11/budgie-desktop/Makefile | 2 +-
x11/gnome-terminal/Makefile | 5 +++--
102 files changed, 155 insertions(+), 139 deletions(-)
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 4079abadfbad..98968a197464 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -34,7 +34,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libsratom-0.so:audio/sratom \
libsqlite3.so:databases/sqlite3 \
libsuil-0.so:audio/suil \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libwavpack.so:audio/wavpack
USES= cmake compiler:c++20-lang cpe desktop-file-utils gettext \
diff --git a/audio/gsequencer/Makefile b/audio/gsequencer/Makefile
index 3c69463668d0..b98c11c915f2 100644
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libsamplerate.so:audio/libsamplerate \
libsndfile.so:audio/libsndfile \
libsoup-3.0.so:devel/libsoup3 \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libvulkan.so:graphics/vulkan-loader \
libwebkit2gtk-4.0.so:www/webkit2-gtk@40
RUN_DEPENDS= dssi>0:audio/dssi
diff --git a/audio/ladish/Makefile b/audio/ladish/Makefile
index ffe0ae1427c8..a696672c4f53 100644
--- a/audio/ladish/Makefile
+++ b/audio/ladish/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libdbus-1.so:devel/dbus \
libexpat.so:textproc/expat2 \
libjack.so:audio/jack \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= tar:bz2 localbase:ldflags pkgconfig python shebangfix waf
USE_PERL5= configure
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 8cd86337d724..c9855c577862 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libjack.so:audio/jack \
libdssialsacompat.so:audio/libdssialsacompat \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= gmake gnome libtool pathfix pkgconfig
USE_GNOME= gtk20 libxml2 gdkpixbuf cairo
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index d0415f7df889..fd64d0d6df34 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libgig
DISTVERSION= 4.5.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.linuxsampler.org/packages/ # dead?: SF/qsampler/${PORTNAME}/${PORTVERSION}
@@ -11,7 +12,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsndfile.so:audio/libsndfile \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c++11-lib gmake cpe libtool localbase pathfix pkgconfig tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib/libgig
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 8430b0efc6ac..a10905c35497 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -1,5 +1,6 @@
PORTNAME= linuxsampler
DISTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://download.linuxsampler.org/packages/
@@ -17,7 +18,7 @@ BUILD_DEPENDS= lv2>0:audio/lv2 \
p5-XML-Parser>0:textproc/p5-XML-Parser
LIB_DEPENDS= libgig.so:audio/libgig \
libsndfile.so:audio/libsndfile \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= bison compiler:c++14-lang gmake libtool localbase pathfix perl5 \
pkgconfig sqlite:3 tar:bzip2 shebangfix
diff --git a/audio/owntone/Makefile b/audio/owntone/Makefile
index 64ee3ce35813..2212bebb4f07 100644
--- a/audio/owntone/Makefile
+++ b/audio/owntone/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libsodium.so:security/libsodium \
libunistring.so:devel/libunistring \
libprotobuf-c.so:devel/protobuf-c \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= tar:xz localbase libtool iconv:wchar_t pkgconfig gnome gmake \
gperf sqlite gnome pathfix
diff --git a/audio/shairport-sync/Makefile b/audio/shairport-sync/Makefile
index 898913ae045c..64b5a952de60 100644
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@@ -1,5 +1,6 @@
PORTNAME= shairport-sync
DISTVERSION= 4.3.7
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= ehaupt@FreeBSD.org
@@ -45,7 +46,7 @@ AIRPLAY2_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \
libgcrypt.so:security/libgcrypt \
libplist-2.0.so:devel/libplist \
libsodium.so:security/libsodium \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
AIRPLAY2_RUN_DEPENDS= nqptp:net/nqptp
AIRPLAY2_CONFIGURE_ON= --with-airplay-2
AIRPLAY2_SUB_FILES= pkg-message
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
index caa4a6fc7370..5516fa07f450 100644
--- a/benchmarks/flowgrind/Makefile
+++ b/benchmarks/flowgrind/Makefile
@@ -1,7 +1,7 @@
PORTNAME= flowgrind
PORTVERSION= 0.8.2
DISTVERSIONPREFIX= ${PORTNAME}-
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= benchmarks
MAINTAINER= dbaio@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgsl.so:math/gsl \
libxmlrpc.so:net/xmlrpc-c \
libcurl.so:ftp/curl \
libwwwxml.so:www/libwww \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libexpat.so:textproc/expat2
USES= autoreconf ssl
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 9ac7249227da..630a6ac3723a 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libpodofo09.so:graphics/podofo09 \
libspnav.so:misc/libspnav \
libTKDESTEP.so:cad/opencascade \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libzmq.so:net/libzmq4
USES= desktop-file-utils gnome libarchive localbase meson pkgconfig python:build sqlite
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index b4325328cf44..c2c25e00cce5 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \
libXinerama.so:x11/libXinerama \
libXrender.so:x11/libXrender \
libxkbcommon.so:x11/libxkbcommon \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= xdg-open:devel/xdg-utils \
xkeyboard-config>=0:x11/xkeyboard-config
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 0851e4fa27a6..c52ad0f692df 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libsoup-3.0.so:devel/libsoup3 \
libsecret-1.so:security/libsecret \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libvulkan.so:graphics/vulkan-loader \
libgraphene-1.0.so:graphics/graphene
diff --git a/databases/keydb/Makefile b/databases/keydb/Makefile
index a638ccd58ae2..dc6d600eef55 100644
--- a/databases/keydb/Makefile
+++ b/databases/keydb/Makefile
@@ -1,6 +1,7 @@
PORTNAME= keydb
DISTVERSIONPREFIX= v
DISTVERSION= 6.3.4
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= zi@FreeBSD.org
@@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_i386= assertion failed: static_assert(sizeof(long) == sizeof(long long),"")
BROKEN_powerpc= assertion failed: static_assert(sizeof(long) == sizeof(long long),"")
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
liblz4.so:archivers/liblz4 \
libsnappy.so:archivers/snappy \
libzstd.so:archivers/zstd
diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile
index 1a1f045d7791..24a1c73b91d3 100644
--- a/databases/proxysql/Makefile
+++ b/databases/proxysql/Makefile
@@ -1,5 +1,6 @@
PORTNAME= proxysql
PORTVERSION= 2.6.6
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= zi@FreeBSD.org
@@ -18,10 +19,9 @@ BUILD_DEPENDS= aclocal:devel/automake \
ggrep:textproc/gnugrep \
libgcrypt>0:security/libgcrypt \
libtoolize:devel/libtool \
- e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
gnutls>0:security/gnutls
+LIB_DEPENDS= libuuid.so:misc/libuuid
RUN_DEPENDS= libgcrypt>0:security/libgcrypt \
- e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
gnutls>0:security/gnutls
USES= compiler:c++11-lang gmake libtool perl5 python:build shebangfix
diff --git a/databases/recutils/Makefile b/databases/recutils/Makefile
index d28a59c27cd6..3ce645eb8312 100644
--- a/databases/recutils/Makefile
+++ b/databases/recutils/Makefile
@@ -1,6 +1,6 @@
PORTNAME= recutils
DISTVERSION= 1.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= GNU
@@ -10,7 +10,7 @@ WWW= https://www.gnu.org/software/recutils/
LICENSE= GPLv3+
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= charsetfix cpe libtool makeinfo pkgconfig readline
CPE_VENDOR= gnu
diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile
index 852733b788d9..4d17022ac35a 100644
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@@ -19,7 +19,7 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libcurl.so:ftp/curl \
libtinyxml.so:textproc/tinyxml \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
TEST_DEPENDS= cppunit>0:devel/cppunit \
googletest>0:devel/googletest
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 0e6731e01253..e3f2537dce4b 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libtinysparql-3.0.so:devel/tinysparql \
libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
libgoa-1.0.so:net/gnome-online-accounts \
libical.so:devel/libical \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libhandy-1.so:x11-toolkits/libhandy
PORTSCOUT= limitw:1,even
diff --git a/deskutils/presage/Makefile b/deskutils/presage/Makefile
index 81798114daa0..635a36fad642 100644
--- a/deskutils/presage/Makefile
+++ b/deskutils/presage/Makefile
@@ -1,6 +1,6 @@
PORTNAME= presage
DISTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
@@ -15,7 +15,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libtinyxml.so:textproc/tinyxml \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
USES= gmake libtool:build localbase shebangfix python sqlite
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 0ad5bdf80208..8acbe8d3ff64 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -1,5 +1,6 @@
PORTNAME= simpleagenda
PORTVERSION= 0.46
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= deskutils gnustep
DISTNAME= SimpleAgenda-${PORTVERSION}
@@ -11,7 +12,7 @@ WWW= https://mediawiki.gnustep.org/index.php/SimpleAgenda.app
LICENSE= GPLv2
LIB_DEPENDS= libical.so:devel/libical \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= gnustep localbase
GNU_CONFIGURE= yes
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index 0dae4e7b7041..58b11fdf1987 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -33,7 +33,7 @@ LIB_DEPENDS= libR.so:math/R \
libboost_thread.so:devel/boost-libs \
libinotify.so:devel/libinotify \
libsoci_core.so:databases/soci \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libyaml-cpp.so:devel/yaml-cpp
FLAVORS= desktop server
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 13e4afe96186..fdeb77fb53e2 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -1,5 +1,6 @@
PORTNAME= appstream-glib
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/
DIST_SUBDIR= gnome
@@ -15,7 +16,7 @@ BUILD_DEPENDS= gcab:archivers/gcab
LIB_DEPENDS= libcurl.so:ftp/curl \
libjson-glib-1.0.so:devel/json-glib \
libyaml.so:textproc/libyaml \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
RUN_DEPENDS= gcab:archivers/gcab
diff --git a/devel/babeltrace/Makefile b/devel/babeltrace/Makefile
index 14e7d9d0f3e4..833ed99b1b82 100644
--- a/devel/babeltrace/Makefile
+++ b/devel/babeltrace/Makefile
@@ -1,7 +1,7 @@
PORTNAME= babeltrace
PORTVERSION= 1.5.7
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= pizzamig@FreeBSD.org
@@ -17,7 +17,7 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/lgpl-2.1.txt
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpopt.so:devel/popt \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= autoreconf:build bison compiler:c11 gmake gnome libtool \
pathfix pkgconfig
diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile
index 4a33bb341320..c23225e2cb78 100644
--- a/devel/ignition-common/Makefile
+++ b/devel/ignition-common/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \
libfreeimage.so:graphics/freeimage \
libgts.so:graphics/gts \
libtinyxml2.so:textproc/tinyxml2 \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libignition-math6.so:math/ignition-math
USES= cmake compiler:c++17-lang gnome localbase pkgconfig
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
index 95aed48c4da9..4ff5672641a4 100644
--- a/devel/libcrossguid/Makefile
+++ b/devel/libcrossguid/Makefile
@@ -1,6 +1,7 @@
PORTNAME= libcrossguid
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.2-52
+PORTREVISION= 1
DISTVERSIONSUFFIX= -gca1bf4b
PORTEPOCH= 1
CATEGORIES= devel
@@ -15,7 +16,7 @@ WWW= https://github.com/graeme-hill/crossguid
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= cmake compiler:c++17-lang pkgconfig
USE_LDCONFIG= yes
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index fcf65e9cf847..897a935dcca3 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -14,7 +14,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= bison:wrapper charsetfix gmake gnome libtool localbase pathfix ssl
USE_GNOME= libxml2
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index edbfa540c5d3..384be902f385 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libewf
PORTVERSION= 20140816
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/libyal/libewf-legacy/releases/download/${PORTVERSION}/ \
LOCAL/antoine
@@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsmdev.so:devel/libsmdev \
libsmraw.so:devel/libsmraw \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= fuse libtool pathfix pkgconfig python
USE_LDCONFIG= yes
diff --git a/devel/libsml/Makefile b/devel/libsml/Makefile
index db4d1d51a5fb..7dd7efbecff7 100644
--- a/devel/libsml/Makefile
+++ b/devel/libsml/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libsml
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= mail+freebsd@gerritbeine.de
@@ -9,7 +9,7 @@ WWW= https://github.com/volkszaehler/libsml
LICENSE= GPLv3
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= dos2unix gmake
USE_LDCONFIG= yes
diff --git a/devel/msitools/Makefile b/devel/msitools/Makefile
index b607e5900664..c843c6aecae6 100644
--- a/devel/msitools/Makefile
+++ b/devel/msitools/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/copyright
LIB_DEPENDS= libgcab-1.0.so:archivers/gcab \
libgsf-1.so:devel/libgsf \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= bash:shells/bash
TEST_DEPENDS= gsed:textproc/gsed
diff --git a/devel/pecl-uuid/Makefile b/devel/pecl-uuid/Makefile
index 8c82f73d60ac..ab97c07bebe4 100644
--- a/devel/pecl-uuid/Makefile
+++ b/devel/pecl-uuid/Makefile
@@ -1,5 +1,6 @@
PORTNAME= uuid
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= devel pear
MAINTAINER= gasol.wu@gmail.com
@@ -8,7 +9,7 @@ WWW= https://pecl.php.net/package/uuid
LICENSE= LGPL3
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= php:pecl
diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile
index ca51ac292dad..8d7af3357de0 100644
--- a/devel/util-linux/Makefile
+++ b/devel/util-linux/Makefile
@@ -1,6 +1,6 @@
PORTNAME= util-linux
DISTVERSION= 2.39.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION:R}/
@@ -12,7 +12,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= bash:shells/bash
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
RUN_DEPENDS= bash:shells/bash
USES= autoreconf gettext-tools gmake libtool ncurses pkgconfig \
diff --git a/devel/xeus-cling/Makefile b/devel/xeus-cling/Makefile
index 25421dbedcf8..baf71dd0fa66 100644
--- a/devel/xeus-cling/Makefile
+++ b/devel/xeus-cling/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xeus-cling
DISTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
@@ -19,7 +19,7 @@ BUILD_DEPENDS= cppzmq>0:net/cppzmq \
xtl-quant-stack>0:devel/xtl-quant-stack
LIB_DEPENDS= libclingInterpreter.so:lang/cling \
libpugixml.so:textproc/pugixml \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libxeus.so:devel/xeus \
libzmq.so:net/libzmq4
diff --git a/devel/xeus-zmq/Makefile b/devel/xeus-zmq/Makefile
index 0cb2c91958e6..f08381827320 100644
--- a/devel/xeus-zmq/Makefile
+++ b/devel/xeus-zmq/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xeus-zmq
DISTVERSION= 2.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= cppzmq>0:net/cppzmq \
nlohmann-json>0:devel/nlohmann-json \
xtl-quant-stack>0:devel/xtl-quant-stack
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libxeus.so:devel/xeus \
libzmq.so:net/libzmq4
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter-kernel-test>0:devel/py-jupyter-kernel-test@${PY_FLAVOR}
diff --git a/devel/xeus/Makefile b/devel/xeus/Makefile
index 67ef59562f80..964f77af4a72 100644
--- a/devel/xeus/Makefile
+++ b/devel/xeus/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xeus
DISTVERSION= 5.0.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
@@ -11,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \
xtl-quant-stack>0:devel/xtl-quant-stack
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
TEST_DEPENDS= doctest>0:devel/doctest
USES= cmake:testing localbase:ldflags pkgconfig
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 7242cd276287..68660da9c6a8 100644
--- a/filesystems/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -26,13 +26,11 @@ USE_LDCONFIG= ${PREFIX}/lib/e2fsprogs
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-# while we use the system blkid, we need to --enable-libblkid
-# so that the tools get built:
CONFIGURE_ARGS?=--disable-fsck \
--disable-e2initrd-helper \
--disable-libuuid \
--disable-uuidd \
- --enable-libblkid \
+ --disable-libblkid \
--enable-elf-shlibs \
--libdir='${PREFIX}/lib/e2fsprogs/' \
--includedir='${PREFIX}/include/e2fsprogs/' \
@@ -81,8 +79,8 @@ NLS_USES= gettext iconv:build
BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
BASH_CMD= ${LOCALBASE}/bin/bash
-LIB_DEPENDS+= libblkid.so:filesystems/e2fsprogs-libblkid
-LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS+= libblkid.so:filesystems/libblkid \
+ libuuid.so:misc/libuuid
LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind
LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
@@ -317,9 +315,6 @@ post-install:
.endfor
.endif
# remove or relocate files installed by other ports already, or shadowing system files:
- cd ${STAGEDIR}${PREFIX} && \
- ${XARGS} <${FILESDIR}/unwanted ${RM} && \
- ${RMDIR} include/e2fsprogs/blkid
${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
${MKDIR} ${STAGEDIR}${DATADIR}/et/
diff --git a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
index ec0ff218a622..99de5bdc575b 100644
--- a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
+++ b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
@@ -1,6 +1,15 @@
---- misc/Makefile.in.orig 2021-01-29 22:02:31 UTC
+--- misc/Makefile.in.orig 2024-05-21 02:52:47 UTC
+++ misc/Makefile.in
-@@ -38,17 +38,17 @@ MKDIR_P = @MKDIR_P@
+@@ -31,24 +31,24 @@ MKDIR_P = @MKDIR_P@
+ @BLKID_CMT@BLKID_STATIC= blkid.static
+ @BLKID_CMT@BLKID_MAN= blkid.8
+
+-@BLKID_CMT@FINDFS_LINK= findfs
+-@BLKID_CMT@FINDFS_MAN= findfs.8
++FINDFS_LINK= findfs
++FINDFS_MAN= findfs.8
+
+ @FUSE_CMT@FUSE_PROG= fuse2fs
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@@ -23,7 +32,7 @@
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
LPROGS= @E2INITRD_PROG@
-@@ -154,14 +154,14 @@ profiled:
+@@ -156,14 +156,14 @@ mke2fs.conf: $(srcdir)/mke2fs.conf.in
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -41,7 +50,7 @@
> default_profile.c
findsuper: findsuper.o
$(E) " LD $@"
-@@ -612,34 +612,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
+@@ -624,34 +624,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
diff --git a/filesystems/e2fsprogs-core/files/unwanted b/filesystems/e2fsprogs-core/files/unwanted
deleted file mode 100644
index 693deb364915..000000000000
--- a/filesystems/e2fsprogs-core/files/unwanted
+++ /dev/null
@@ -1,8 +0,0 @@
-include/e2fsprogs/blkid/blkid.h
-include/e2fsprogs/blkid/blkid_types.h
-lib/e2fsprogs/libblkid.a
-lib/e2fsprogs/libblkid.so
-lib/e2fsprogs/libblkid.so.1
-lib/e2fsprogs/libblkid.so.1.0
-libdata/pkgconfig/blkid.pc
-man/man3/libblkid.3
diff --git a/filesystems/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist
index 369ce002d590..aa62bd55cd74 100644
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -59,6 +59,7 @@ share/man/man8/e2image.8.gz
share/man/man8/e2label.8.gz
share/man/man8/e2mmpstatus.8.gz
share/man/man8/e2undo.8.gz
+share/man/man8/findfs.8.gz
share/man/man8/mke2fs.8.gz
share/man/man8/mklost+found.8.gz
share/man/man8/resize2fs.8.gz
@@ -69,13 +70,10 @@ share/man/man8/fsck.ext4.8.gz
share/man/man8/mkfs.ext2.8.gz
share/man/man8/mkfs.ext3.8.gz
share/man/man8/mkfs.ext4.8.gz
-share/man/man8/findfs.8.gz
-share/man/man8/blkid.8.gz
share/man/man8/logsave.8.gz
share/man/man8/fsck_ext2fs.8.gz
share/man/man8/e2freefrag.8.gz
sbin/badblocks
-sbin/blkid
sbin/debugfs
sbin/dumpe2fs
sbin/e2freefrag
diff --git a/filesystems/httpdirfs/Makefile b/filesystems/httpdirfs/Makefile
index 6188855548b6..7d6329bca207 100644
--- a/filesystems/httpdirfs/Makefile
+++ b/filesystems/httpdirfs/Makefile
@@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libcurl.so:ftp/curl \
libexpat.so:textproc/expat2 \
libgumbo.so:devel/gumbo \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= fuse:3 meson pkgconfig ssl
USE_GITHUB= yes
diff --git a/filesystems/ltfs/Makefile b/filesystems/ltfs/Makefile
index f38304a8667e..8737dcde852d 100644
--- a/filesystems/ltfs/Makefile
+++ b/filesystems/ltfs/Makefile
@@ -3,6 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 2.4.7
PORTREVISION= 2
DISTVERSIONSUFFIX= -10514
+PORTREVISION= 1
CATEGORIES= filesystems sysutils
MAINTAINER= kbowling@FreeBSD.org
@@ -13,7 +14,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libicudata.so:devel/icu \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= autoreconf compiler:c11 fuse gnome libtool:build pkgconfig \
python shebangfix
diff --git a/filesystems/ntfs/Makefile b/filesystems/ntfs/Makefile
index 2ff33fa98b38..67ec953eabd7 100644
--- a/filesystems/ntfs/Makefile
+++ b/filesystems/ntfs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ntfs
PORTVERSION= 2022.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= filesystems
MASTER_SITES= https://download.tuxera.com/opensource/
PKGNAMEPREFIX= fusefs-
@@ -13,7 +13,7 @@ WWW= https://github.com/tuxera/ntfs-3g
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= fuse pkgconfig iconv libtool localbase:ldflags tar:tgz
USE_LDCONFIG= yes
diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile
index 29ac088b20f7..a9a4903bc122 100644
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -1,5 +1,6 @@
PORTNAME= endless-sky
PORTVERSION= 0.10.10
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= games
@@ -14,7 +15,7 @@ LICENSE_FILE_GPLv3+ = ${WRKSRC}/license.txt
LIB_DEPENDS= libpng.so:graphics/png \
libmad.so:audio/libmad \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USE_GITHUB= yes
diff --git a/games/moonlight-embedded-devel/Makefile b/games/moonlight-embedded-devel/Makefile
index 7ef271e88118..b2e63ec54321 100644
--- a/games/moonlight-embedded-devel/Makefile
+++ b/games/moonlight-embedded-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libexpat.so:textproc/expat2 \
libopus.so:audio/opus \
libudev.so:devel/libudev-devd \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libva.so:multimedia/libva \
libdrm.so:graphics/libdrm \
libwayland-client.so:graphics/wayland
diff --git a/games/moonlight-embedded/Makefile b/games/moonlight-embedded/Makefile
index 8379e4774e08..6815787db550 100644
--- a/games/moonlight-embedded/Makefile
+++ b/games/moonlight-embedded/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libexpat.so:textproc/expat2 \
libopus.so:audio/opus \
libudev.so:devel/libudev-devd \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake localbase:ldflags perl5 pkgconfig sdl ssl tar:xz
USE_LDCONFIG= yes
diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile
index e382680ca7f8..dbe401db5161 100644
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -1,5 +1,6 @@
PORTNAME= chez-scheme
PORTVERSION= 10.2.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= lang
MASTER_SITES= https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64 i386 aarch64 armv7 powerpc
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libossp-uuid.so:misc/ossp-uuid
USES= gmake iconv:lib ncurses
diff --git a/lang/io/Makefile b/lang/io/Makefile
index f0f548f4ffe1..151c6ac1b03e 100644
--- a/lang/io/Makefile
+++ b/lang/io/Makefile
@@ -1,6 +1,6 @@
PORTNAME= io
PORTVERSION= 2017.09.06
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= lang
MAINTAINER= gahr@FreeBSD.org
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index 927429cf8f24..a7339ed1eaab 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -111,7 +111,7 @@ TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib
THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
TOKYOCABINET_LIB_DEPENDS= \
libtokyocabinet.so:databases/tokyocabinet
-UUID_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+UUID_LIB_DEPENDS= libuuid.so:misc/libuuid
VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
YAJL_LIB_DEPENDS= libyajl.so:devel/yajl
diff --git a/lang/lfortran/Makefile b/lang/lfortran/Makefile
index f26e6cc66d7c..c0e73e98ec06 100644
--- a/lang/lfortran/Makefile
+++ b/lang/lfortran/Makefile
@@ -60,7 +60,7 @@ PORTEXAMPLES= *
#LIB_DEPENDS+= libxeus.so:devel/xeus \
# libzmq.so:net/libzmq4 \
# libxeus-zmq.so:devel/xeus-zmq \
-# libuuid.so:misc/e2fsprogs-libuuid
+# libuuid.so:misc/libuuid
CMAKE_OFF+= WITH_XEUS
# BFD:
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index e9cbfdcde9bf..ae8a1f935345 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -2,6 +2,7 @@ PORTNAME= pharo
DISTVERSION= 10.2.0
PORTREVISION= 1
DISTVERSIONSUFFIX= f4c5e2a
+PORTREVISION= 1
CATEGORIES= lang
*** 826 LINES SKIPPED ***