summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/gsequencer/Makefile2
-rw-r--r--audio/ladish/Makefile2
-rw-r--r--audio/lash/Makefile2
-rw-r--r--audio/libgig/Makefile3
-rw-r--r--audio/linuxsampler/Makefile3
-rw-r--r--audio/owntone/Makefile2
-rw-r--r--audio/shairport-sync/Makefile3
-rw-r--r--benchmarks/flowgrind/Makefile4
-rw-r--r--cad/horizon-eda/Makefile2
-rw-r--r--chinese/fcitx/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/keydb/Makefile3
-rw-r--r--databases/proxysql/Makefile4
-rw-r--r--databases/recutils/Makefile4
-rw-r--r--databases/xrootd/Makefile2
-rw-r--r--deskutils/bijiben/Makefile2
-rw-r--r--deskutils/presage/Makefile4
-rw-r--r--deskutils/simpleagenda/Makefile3
-rw-r--r--devel/RStudio/Makefile2
-rw-r--r--devel/appstream-glib/Makefile3
-rw-r--r--devel/babeltrace/Makefile4
-rw-r--r--devel/ignition-common/Makefile2
-rw-r--r--devel/libcrossguid/Makefile3
-rw-r--r--devel/libdap/Makefile2
-rw-r--r--devel/libewf/Makefile3
-rw-r--r--devel/libsml/Makefile4
-rw-r--r--devel/msitools/Makefile2
-rw-r--r--devel/pecl-uuid/Makefile3
-rw-r--r--devel/util-linux/Makefile4
-rw-r--r--devel/xeus-cling/Makefile4
-rw-r--r--devel/xeus-zmq/Makefile4
-rw-r--r--devel/xeus/Makefile3
-rw-r--r--filesystems/e2fsprogs-core/Makefile11
-rw-r--r--filesystems/e2fsprogs-core/files/patch-misc__Makefile.in17
-rw-r--r--filesystems/e2fsprogs-core/files/unwanted8
-rw-r--r--filesystems/e2fsprogs-core/pkg-plist4
-rw-r--r--filesystems/httpdirfs/Makefile2
-rw-r--r--filesystems/ltfs/Makefile3
-rw-r--r--filesystems/ntfs/Makefile4
-rw-r--r--games/endless-sky/Makefile3
-rw-r--r--games/moonlight-embedded-devel/Makefile2
-rw-r--r--games/moonlight-embedded/Makefile2
-rw-r--r--lang/chez-scheme/Makefile3
-rw-r--r--lang/io/Makefile2
-rw-r--r--lang/io/Makefile.addons2
-rw-r--r--lang/lfortran/Makefile2
-rw-r--r--lang/pharo/Makefile3
-rw-r--r--mail/cyrus-imapd310/Makefile2
-rw-r--r--mail/cyrus-imapd312/Makefile2
-rw-r--r--mail/cyrus-imapd32/Makefile2
-rw-r--r--mail/cyrus-imapd34/Makefile2
-rw-r--r--mail/cyrus-imapd36/Makefile2
-rw-r--r--mail/cyrus-imapd38/Makefile2
-rw-r--r--math/cadabra2/Makefile2
-rw-r--r--math/topologic/Makefile2
-rw-r--r--misc/biblesync/Makefile4
-rw-r--r--misc/ignition-fuel-tools/Makefile4
-rw-r--r--misc/ola/Makefile2
-rw-r--r--misc/xiphos/Makefile2
-rw-r--r--multimedia/kodi/Makefile2
-rw-r--r--multimedia/obs-studio/Makefile2
-rw-r--r--net-im/profanity/Makefile2
-rw-r--r--net-im/telepathy-gabble/Makefile2
-rw-r--r--net-mgmt/netdata/Makefile2
-rw-r--r--net-mgmt/networkmanager-shim/Makefile2
-rw-r--r--net-mgmt/seafile-client/Makefile3
-rw-r--r--net-mgmt/seafile-gui/Makefile3
-rw-r--r--net-mgmt/seafile-server/Makefile3
-rw-r--r--net-p2p/aeron/Makefile2
-rw-r--r--net/asterisk18/Makefile2
-rw-r--r--net/asterisk20/Makefile2
-rw-r--r--net/asterisk22/Makefile2
-rw-r--r--net/freeswitch/Makefile2
-rw-r--r--net/glusterfs/Makefile4
-rw-r--r--net/gupnp/Makefile2
-rw-r--r--net/mosquitto/Makefile2
-rw-r--r--net/pacemaker2/Makefile.common2
-rw-r--r--science/bout++/Makefile2
-rw-r--r--science/cdo/Makefile2
-rw-r--r--science/openmodelica/Makefile2
-rw-r--r--science/orthanc/Makefile2
-rw-r--r--science/qbox/Makefile3
-rw-r--r--security/gvm-libs/Makefile2
-rw-r--r--security/snort3/Makefile3
-rw-r--r--security/sssd2/Makefile2
-rw-r--r--security/tpm2-tools/Makefile4
-rw-r--r--security/tpm2-tss/Makefile2
-rw-r--r--shells/schemesh/Makefile2
-rw-r--r--sysutils/cluster-glue/Makefile2
-rw-r--r--sysutils/gdisk/Makefile3
-rw-r--r--sysutils/passwordsafe/Makefile2
-rw-r--r--sysutils/rsyslog8/Makefile2
-rw-r--r--sysutils/syslog-ng/Makefile2
-rw-r--r--sysutils/u-boot-master/Makefile4
-rw-r--r--textproc/fcitx5/Makefile2
-rw-r--r--www/davix/Makefile2
-rw-r--r--www/libepc/Makefile4
-rw-r--r--www/ot-recorder/Makefile5
-rw-r--r--x11-wm/hyprland/Makefile2
-rw-r--r--x11/budgie-desktop/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile5
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
MASTER_SITES= http://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/
DISTNAME= PharoVM-${DISTVERSION}-${DISTVERSIONSUFFIX}-Linux-x86_64-c-src
@@ -18,7 +19,7 @@ LIB_DEPENDS= libffi.so:devel/libffi \
libfreetype.so:print/freetype2 \
libpixman-1.so:x11/pixman \
libpng.so:graphics/png \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake ssl
CMAKE_ARGS= -DFLAVOUR=CoInterpreter \
diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index a9785593e39f..772adce58b89 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 310
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
diff --git a/mail/cyrus-imapd312/Makefile b/mail/cyrus-imapd312/Makefile
index 96991ddfc022..cd12ebbffaae 100644
--- a/mail/cyrus-imapd312/Makefile
+++ b/mail/cyrus-imapd312/Makefile
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 312
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index f5589ebab3f5..2eca05ae90db 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -17,7 +17,7 @@ BROKEN_riscv64= fails to build: lib/chartable.c: Error 1
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[013-] cyrus-imapd3[013-]-http
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index fb56b6cecbb9..5d1d7454870d 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 34
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-35-] cyrus-imapd3[0-35-]-http
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 6e958f2752e9..a0f6f0fd62e6 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 36
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index 858c1a2168ab..79bae82629d3 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 38
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 279e1505993d..268437200047 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ${PY_BOOST} \
libpcrecpp.so:devel/pcre \
libjsoncpp.so:devel/jsoncpp \
libgmp.so:math/gmp \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
diff --git a/math/topologic/Makefile b/math/topologic/Makefile
index 54d328a7e2b7..641f4d4b436e 100644
--- a/math/topologic/Makefile
+++ b/math/topologic/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libtbb.so:devel/onetbb \
libTKernel.so:cad/opencascade \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake compiler:c++14-lang localbase:ldflags
USE_LDCONFIG= ${PREFIX}/lib/TopologicCore
diff --git a/misc/biblesync/Makefile b/misc/biblesync/Makefile
index ea83f0d8a342..6dbc2e8b89e8 100644
--- a/misc/biblesync/Makefile
+++ b/misc/biblesync/Makefile
@@ -1,6 +1,6 @@
PORTNAME= biblesync
DISTVERSION= 2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MAINTAINER= ports@FreeBSD.org
@@ -10,7 +10,7 @@ WWW= https://github.com/karlkleinpaste/biblesync
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= cmake compiler:c++11-lang gettext-runtime
diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile
index 3ac572a9bfec..8d45c394f176 100644
--- a/misc/ignition-fuel-tools/Makefile
+++ b/misc/ignition-fuel-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ignition-fuel-tools
DISTVERSION= 1.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
@@ -15,7 +15,7 @@ BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake
LIB_DEPENDS= libcurl.so:ftp/curl \
libignition-common3.so:devel/ignition-common \
libjsoncpp.so:devel/jsoncpp \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libyaml.so:textproc/libyaml \
libzip.so:archivers/libzip
diff --git a/misc/ola/Makefile b/misc/ola/Makefile
index 05ba68b1a7c6..20ccfb3ce699 100644
--- a/misc/ola/Makefile
+++ b/misc/ola/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libavahi-common.so:net/avahi-app \
libftdi1.so:devel/libftdi1 \
libmicrohttpd.so:www/libmicrohttpd \
libprotobuf.so:devel/protobuf3 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
TEST_DEPENDS= cppunit>0:devel/cppunit
USES= bison gmake libtool localbase pkgconfig
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 1c562ee71eb6..9bf258e34a65 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libbiblesync.so:misc/biblesync \
libicui18n.so:devel/icu \
libsoup-2.4.so:devel/libsoup \
libsword.so:misc/sword \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libwebkit2gtk-4.0.so:www/webkit2-gtk@40
# gettext is always needed, even if NLS is off
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 7dc636add345..d4652c81303c 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -49,7 +49,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
libtinyxml.so:textproc/tinyxml \
libtinyxml2.so:textproc/tinyxml2 \
libudfread.so:multimedia/libudfread \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= autoreconf:build cmake:noninja compiler:c++17-lang cpe \
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 8f393fd07957..ad963adb6e1d 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -51,7 +51,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libxcb-render-util.so:x11/xcb-util-renderutil \
libxcb-util.so:x11/xcb-util \
libxkbcommon.so:x11/libxkbcommon \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libva.so:multimedia/libva
USES= cmake compiler:c++17-lang desktop-file-utils gl gnome lua luajit \
diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile
index 01b2a2150527..ab91661c52c1 100644
--- a/net-im/profanity/Makefile
+++ b/net-im/profanity/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libcurl.so:ftp/curl \
libotr.so:security/libotr \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libgpgme.so:security/gpgme \
libassuan.so:security/libassuan \
libgpg-error.so:security/libgpg-error \
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 86cda8c2303e..1d6c2d6a34a2 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus \
libgnutls.so:security/gnutls \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libloudmouth-1.so:net-im/loudmouth
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
libnice-gst1>=0:net-im/libnice-gst1
diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index 8d8907e24ca3..718e8fc26113 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \
liblz4.so:archivers/liblz4 \
libpcre2-8.so:devel/pcre2 \
libprotobuf.so:devel/protobuf \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libuv.so:devel/libuv \
libyaml.so:textproc/libyaml \
libzstd.so:archivers/zstd
diff --git a/net-mgmt/networkmanager-shim/Makefile b/net-mgmt/networkmanager-shim/Makefile
index 73231e6e76b1..6c739f88b545 100644
--- a/net-mgmt/networkmanager-shim/Makefile
+++ b/net-mgmt/networkmanager-shim/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libndp.so:net/libndp \
libudev.so:devel/libudev-devd \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= gnome meson perl5 pkgconfig
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
index 13982855b98e..f84547836629 100644
--- a/net-mgmt/seafile-client/Makefile
+++ b/net-mgmt/seafile-client/Makefile
@@ -1,6 +1,7 @@
PORTNAME= seafile-client
DISTVERSIONPREFIX= v
DISTVERSION= 9.0.6
+PORTREVISION= 1
CATEGORIES= net-mgmt
MAINTAINER= ultima@FreeBSD.org
@@ -14,7 +15,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libcurl.so:ftp/curl \
libinotify.so:devel/libinotify \
libevent.so:devel/libevent \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libjansson.so:devel/jansson \
libwebsockets.so:net/libwebsockets
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index 02b1645bddc2..a243bab043c3 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -1,6 +1,7 @@
PORTNAME= seafile-gui
DISTVERSIONPREFIX= v
DISTVERSION= 9.0.6
+PORTREVISION= 1
CATEGORIES= net-mgmt devel
MAINTAINER= ultima@FreeBSD.org
@@ -15,7 +16,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libsqlite3.so:databases/sqlite3 \
libjansson.so:devel/jansson \
libevent.so:devel/libevent \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c++11-lang cmake gnome pkgconfig qt:5 shebangfix ssl
SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 6447e010f535..53b17396a48b 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -1,6 +1,7 @@
PORTNAME= seafile-server
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAFILE_VER}
+PORTREVISION= 1
DISTVERSIONSUFFIX= -server
CATEGORIES= net-mgmt
@@ -17,7 +18,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libcurl.so:ftp/curl \
libinotify.so:devel/libinotify \
libevent.so:devel/libevent \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libjansson.so:devel/jansson \
libjwt.so:www/libjwt \
libonig.so:devel/oniguruma
diff --git a/net-p2p/aeron/Makefile b/net-p2p/aeron/Makefile
index 29e494e63b97..e2c7c3d9da9c 100644
--- a/net-p2p/aeron/Makefile
+++ b/net-p2p/aeron/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= aarch64 amd64 # limited in aeron-client/src/main/c/concurrent/aeron_atomic.h
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid # only for uuid_generate
+LIB_DEPENDS= libuuid.so:misc/libuuid # only for uuid_generate
TEST_DEPENDS= googletest>0:devel/googletest
USES= cmake:testing localbase:ldflags
diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
index d83a10a54416..0ed359f32cfc 100644
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -18,7 +18,7 @@ WWW= https://www.asterisk.org
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libjansson.so:devel/jansson
USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \
diff --git a/net/asterisk20/Makefile b/net/asterisk20/Makefile
index 12e54451bc17..f70792a6ddbf 100644
--- a/net/asterisk20/Makefile
+++ b/net/asterisk20/Makefile
@@ -21,7 +21,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \
ncurses pkgconfig shebangfix sqlite ssl
diff --git a/net/asterisk22/Makefile b/net/asterisk22/Makefile
index e91fbb08754c..9c89dabec6c3 100644
--- a/net/asterisk22/Makefile
+++ b/net/asterisk22/Makefile
@@ -21,7 +21,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \
ncurses pkgconfig shebangfix sqlite ssl
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 335f689246ed..5d243aea8075 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -34,7 +34,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
libjbig.so:graphics/jbigkit \
libshout.so:audio/libshout \
libtiff.so:graphics/tiff \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libmariadb.so:databases/mariadb-connector-c \
libspandsp.so:comms/spandsp \
libsofia-sip-ua.so:net/sofia-sip
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index e9cd04424e2a..3b6cb250e1d8 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= glusterfs
PORTVERSION= 8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
@@ -23,7 +23,7 @@ RUN_DEPENDS= bash:shells/bash
LIB_DEPENDS= libargp.so:devel/argp-standalone \
libcurl.so:ftp/curl \
liburcu-bp.so:sysutils/liburcu \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= autoreconf bison compiler:c11 cpe gettext gnome libtool pkgconfig python \
readline shebangfix sqlite ssl
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 3cdf30b4ad3d..e14e3c8164fa 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= glib>=2.69:devel/glib20 \
libsoup3>=2.99.0:devel/libsoup3
LIB_DEPENDS= libgssdp-1.6.so:net/gssdp \
libsoup-3.0.so:devel/libsoup3 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c11 cpe gnome meson pkgconfig python:run shebangfix tar:xz
USE_GNOME= glib20 introspection:build libxml2
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index a6a44946ac04..f7426ef180a5 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -11,7 +11,7 @@ LICENSE= EPL
BUILD_DEPENDS= xsltproc:textproc/libxslt \
docbook-xsl>0:textproc/docbook-xsl
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libcjson.so:devel/libcjson
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common
index 434f980a4bf8..8af689ef080c 100644
--- a/net/pacemaker2/Makefile.common
+++ b/net/pacemaker2/Makefile.common
@@ -13,7 +13,7 @@ BUILD_DEPENDS= bash:shells/bash \
LIB_DEPENDS= libgnutls.so:security/gnutls \
libltdl.so:devel/libltdl \
libqb.so:devel/libqb \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libxml2.so:textproc/libxml2 \
libxslt.so:textproc/libxslt
RUN_DEPENDS= bash:shells/bash \
diff --git a/science/bout++/Makefile b/science/bout++/Makefile
index 2eb36e82ec9e..cfd0c4f3794d 100644
--- a/science/bout++/Makefile
+++ b/science/bout++/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= gmake:devel/gmake
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libfmt.so:devel/libfmt \
libopenblas.so:math/openblas \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}natsort>=8.1.0:devel/py-natsort@${PY_FLAVOR} \
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 3544e890ac51..104e0e8da897 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -59,7 +59,7 @@ SZIP_LIB_DEPENDS= libsz.so:science/libaec
UDUNITS_CONFIGURE_WITH= udunits2
UDUNITS_LIB_DEPENDS= libudunits2.so:science/udunits
UUID_CONFIGURE_OFF= ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
-UUID_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+UUID_LIB_DEPENDS= libuuid.so:misc/libuuid
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile
index cc1aaa4b5574..1e3c9b9aefcc 100644
--- a/science/openmodelica/Makefile
+++ b/science/openmodelica/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libcurl.so:ftp/curl \
libicuuc.so:devel/icu \
libosg.so:graphics/osg \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= bash:shells/bash \
gmake:devel/gmake
diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
index 427f97a463fd..3338981975fa 100644
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \
libprotobuf.so:devel/protobuf \
libpugixml.so:textproc/pugixml \
libtiff.so:graphics/tiff \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake gnome iconv jpeg lua python:build sqlite ssl
USE_GNOME= libxml2
diff --git a/science/qbox/Makefile b/science/qbox/Makefile
index 6eaf55eb80d3..6c76aa7980fe 100644
--- a/science/qbox/Makefile
+++ b/science/qbox/Makefile
@@ -1,6 +1,7 @@
PORTNAME= qbox
DISTVERSIONPREFIX= rel
DISTVERSION= 1_78_4
+PORTREVISION= 1
CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org
@@ -16,7 +17,7 @@ LIB_DEPENDS= libblas.so:math/blas \
liblapack.so:math/lapack \
libmpicxx.so:net/mpich \
libscalapack.so:math/scalapack \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libxerces-c.so:textproc/xerces-c3
USES= compiler:c++11-lang gmake iconv:wchar_t localbase:ldflags
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index 9196b191731d..f7a8987caa7c 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libnet.so:net/libnet \
libpaho-mqtt3a.so:net/libpaho-mqtt3 \
libssh.so:security/libssh \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libjson-glib-1.0.so:devel/json-glib \
libcurl.so:ftp/curl
RUN_DEPENDS= doxygen>0:devel/doxygen
diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index de56987b3447..50ff68cab2c4 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,5 +1,6 @@
PORTNAME= snort
DISTVERSION= 3.8.1.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
PKGNAMESUFFIX= 3
@@ -17,7 +18,7 @@ LIB_DEPENDS= libdaq.so:net/libdaq \
libhwloc.so:devel/hwloc2 \
libpcap.so:net/libpcap \
libpcre2-8.so:devel/pcre2 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake compiler:c++14-lang cpe iconv localbase luajit pathfix pkgconfig \
shebangfix ssl
diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile
index 3c4f642a401b..04b48c69e53d 100644
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -45,7 +45,7 @@ LIB_DEPENDS= libcares.so:dns/c-ares \
libtdb.so:${SAMBA_TDB_PORT} \
libtevent.so:${SAMBA_TEVENT_PORT} \
libunistring.so:devel/libunistring \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= adcli:net-mgmt/adcli \
cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
diff --git a/security/tpm2-tools/Makefile b/security/tpm2-tools/Makefile
index 42aa7da55eeb..99cb1ffb5ab0 100644
--- a/security/tpm2-tools/Makefile
+++ b/security/tpm2-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tpm2-tools
DISTVERSION= 5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= https://github.com/tpm2-software/tpm2-tools/releases/download/${DISTVERSION}/
@@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE
LIB_DEPENDS= libtss2-esys.so:security/tpm2-tss \
libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c11 gmake libtool pkgconfig ssl
diff --git a/security/tpm2-tss/Makefile b/security/tpm2-tss/Makefile
index 8d60a2b418bc..8f66557b4259 100644
--- a/security/tpm2-tss/Makefile
+++ b/security/tpm2-tss/Makefile
@@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE
LIB_DEPENDS= libjson-c.so:devel/json-c \
libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c11 gmake libtool pkgconfig ssl
USE_LDCONFIG= yes
diff --git a/shells/schemesh/Makefile b/shells/schemesh/Makefile
index 56d37eab2345..9f59b504d76a 100644
--- a/shells/schemesh/Makefile
+++ b/shells/schemesh/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= chez-scheme:lang/chez-scheme
RUN_DEPENDS= chez-scheme:lang/chez-scheme
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= gmake ncurses
diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile
index c0965bed5a7d..1d8287832a8d 100644
--- a/sysutils/cluster-glue/Makefile
+++ b/sysutils/cluster-glue/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libltdl.so:devel/libltdl \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libnet.so:net/libnet
USES= autoreconf gettext gmake gnome libtool localbase perl5 pkgconfig python shebangfix \
diff --git a/sysutils/gdisk/Makefile b/sysutils/gdisk/Makefile
index 983387cb1d7b..091eba81aafa 100644
--- a/sysutils/gdisk/Makefile
+++ b/sysutils/gdisk/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gdisk
PORTVERSION= 1.0.10
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION}
DISTNAME= gptfdisk-${PORTVERSION}
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le
LIB_DEPENDS= libpopt.so:devel/popt \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= localbase:ldflags
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 2adee78c1098..cc0229210bba 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -10,7 +10,7 @@ WWW= https://pwsafe.org
LICENSE= ART20
LIB_DEPENDS= libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libxerces-c.so:textproc/xerces-c3 \
libqrencode.so:graphics/libqrencode
BUILD_DEPENDS= zip:archivers/zip
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index b6af2312b2a5..b55f5350b536 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB= multi
LIB_DEPENDS= libestr.so:devel/libestr \
libfastjson.so:devel/libfastjson \
liblogging-rfc3195.so:devel/liblogging \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libcurl.so:ftp/curl
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 0e7e6111a17a..9f2e78f54779 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libivykis.so:devel/ivykis
USES= autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index a09d24cc588b..5b687c1ae68e 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -24,8 +24,8 @@ BUILD_DEPENDS+= gsed:textproc/gsed \
BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER}
# For mkeficapsule
-BUILD_DEPENDS+= e2fsprogs-libuuid>=0:misc/e2fsprogs-libuuid \
- gnutls>=0:security/gnutls
+BUILD_DEPENDS+= gnutls>=0:security/gnutls
+LIB_DEPENDS+= libuuid.so:misc/libuuid
USES= bison compiler:c11 gmake python:build pkgconfig shebangfix ssl \
tar:bz2
diff --git a/textproc/fcitx5/Makefile b/textproc/fcitx5/Makefile
index 41e16b906df9..647149e03489 100644
--- a/textproc/fcitx5/Makefile
+++ b/textproc/fcitx5/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libexpat.so:textproc/expat2 \
libfmt.so:devel/libfmt \
libjson-c.so:devel/json-c \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libuv.so:devel/libuv \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
diff --git a/www/davix/Makefile b/www/davix/Makefile
index 1236ea4435f8..ad2a437e6171 100644
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -13,7 +13,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
TEST_DEPENDS= googletest>0:devel/googletest
USES= cmake:testing compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 221ba8dddd11..96e7deb0c492 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libepc
PORTVERSION= 0.4.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= GNOME
@@ -11,7 +11,7 @@ WWW= https://live.gnome.org/libepc/
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libfribidi.so:converters/fribidi \
libsoup-2.4.so:devel/libsoup \
libgnutls.so:security/gnutls \
diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile
index c2efd62aff63..c257bf259209 100644
--- a/www/ot-recorder/Makefile
+++ b/www/ot-recorder/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ot-recorder
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= dvl@FreeBSD.org
@@ -10,7 +11,6 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= curl>0:ftp/curl \
- e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
libconfig>0:devel/libconfig \
lmdb>0:databases/lmdb \
mosquitto>0:net/mosquitto \
@@ -19,7 +19,8 @@ BUILD_DEPENDS= curl>0:ftp/curl \
LIB_DEPENDS= libconfig.so:devel/libconfig \
libcurl.so:ftp/curl \
liblmdb.so:databases/lmdb \
- libmosquitto.so:net/mosquitto
+ libmosquitto.so:net/mosquitto \
+ libuuid.so:misc/libuuid
USES= gmake
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 6e020ec322bd..ba3046d2cb9e 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \
libhyprgraphics.so:graphics/hyprgraphics \
libdrm.so:graphics/libdrm \
libwayland-server.so:graphics/wayland \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libaquamarine.so:x11-toolkits/aquamarine \
libhyprcursor.so:x11/hyprcursor \
libinput.so:x11/libinput \
diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile
index e00eda5e489c..3127f6592fb1 100644
--- a/x11/budgie-desktop/Makefile
+++ b/x11/budgie-desktop/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \
zenity>0:x11/zenity
LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \
libpeas-1.0.so:devel/libpeas1 \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libnotify.so:devel/libnotify \
libaccountsservice.so:sysutils/accountsservice \
libpulse.so:audio/pulseaudio \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index e73464891fd9..ef57fbb46f44 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gnome-terminal
DISTVERSION= 3.54.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -15,8 +16,8 @@ BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \
gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
itstool:textproc/itstool
LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
- libuuid.so:misc/e2fsprogs-libuuid \
- libhandy-1.so:x11-toolkits/libhandy
+ libhandy-1.so:x11-toolkits/libhandy \
+ libuuid.so:misc/libuuid
RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
USES= cpe gettext gnome localbase meson pkgconfig python \