Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F107752533
D23312.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
77 KB
Referenced Files
None
Subscribers
None
D23312.diff
View Options
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,6 +1,7 @@
PORTNAME= audacity
DISTVERSIONPREFIX= Audacity-
DISTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES+= https://github.com/${PORTNAME}/${PORTNAME}-manual/releases/download/v${DISTVERSION}/:manual
DISTFILES+= ${PORTNAME}-manual-${DISTVERSION}.tar.gz:manual
@@ -33,7 +34,7 @@
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
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gsequencer
DISTVERSION= 6.16.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= yuri@FreeBSD.org
@@ -25,7 +25,7 @@
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-gtk3
RUN_DEPENDS= dssi>0:audio/dssi
diff --git a/audio/ladish/Makefile b/audio/ladish/Makefile
--- a/audio/ladish/Makefile
+++ b/audio/ladish/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ladish
DISTVERSION= 1.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -g4dcd67d7
CATEGORIES= audio
MASTER_SITES= https://dl.ladish.org/ladish/
@@ -14,7 +15,7 @@
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
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lash
PORTVERSION= 0.5.4
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= audio
MASTER_SITES= SAVANNAH
@@ -15,7 +15,7 @@
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 gdkpixbuf2 cairo
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libgig
DISTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.linuxsampler.org/packages/ # dead?: SF/qsampler/${PORTNAME}/${PORTVERSION}
@@ -11,7 +12,7 @@
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
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -1,5 +1,6 @@
PORTNAME= linuxsampler
DISTVERSION= 2.3.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://download.linuxsampler.org/packages/
@@ -16,7 +17,7 @@
BUILD_DEPENDS= lv2>0:audio/lv2
LIB_DEPENDS= libgig.so:audio/libgig \
libsndfile.so:audio/libsndfile \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= bison:wrapper compiler:c++14-lang gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib/linuxsampler
diff --git a/audio/owntone/Makefile b/audio/owntone/Makefile
--- a/audio/owntone/Makefile
+++ b/audio/owntone/Makefile
@@ -1,6 +1,6 @@
PORTNAME= owntone
DISTVERSION= 28.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/
@@ -26,7 +26,7 @@
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
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@@ -1,5 +1,6 @@
PORTNAME= shairport-sync
DISTVERSION= 4.3.5
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= ehaupt@FreeBSD.org
@@ -45,7 +46,7 @@
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
--- 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 @@
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
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,7 +1,7 @@
PORTNAME= horizon-eda
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= cad
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -28,7 +28,7 @@
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
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fcitx
PORTVERSION= 4.2.9.9
+PORTREVISION= 1
CATEGORIES= chinese x11
MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \
http://download.fcitx-im.org/data/:data
@@ -29,7 +30,7 @@
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/keydb/Makefile b/databases/keydb/Makefile
--- 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 @@
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
--- 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 @@
${LOCALBASE}/bin/grep: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
--- 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 @@
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
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xrootd
DISTVERSION= 5.6.9
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= https://xrootd.slac.stanford.edu/download/v${DISTVERSION}/
@@ -17,7 +18,7 @@
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libcurl.so:ftp/curl \
libtinyxml.so:textproc/tinyxml \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake:testing compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig readline shebangfix ssl
SHEBANG_GLOB= *.sh
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bijiben
PORTVERSION= 40.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
DIST_SUBDIR= gnome
@@ -20,7 +20,7 @@
libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
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/gnote/Makefile b/deskutils/gnote/Makefile
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gnote
PORTVERSION= 42.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
@@ -15,7 +15,7 @@
LIB_DEPENDS= libenchant.so:textproc/enchant \
libgtkspell3-3.so:textproc/gtkspell3 \
libsecret-1.so:security/libsecret \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
PORTSCOUT= limitw:1,even
diff --git a/deskutils/presage/Makefile b/deskutils/presage/Makefile
--- 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 @@
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
--- 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 @@
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
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -4,7 +4,7 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
DISTVERSION= 2022.12.0+353
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -31,7 +31,7 @@
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
--- 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 @@
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
--- 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= ${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
--- a/devel/ignition-common/Makefile
+++ b/devel/ignition-common/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ignition-common
DISTVERSION= 3.0.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
@@ -16,7 +16,7 @@
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
--- 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 @@
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
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libdap
DISTVERSION= 3.21.0-27
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://www.opendap.org/pub/source/ \
LOCAL/sunpoet
@@ -13,7 +14,7 @@
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
--- 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 @@
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
--- 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 @@
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
--- a/devel/msitools/Makefile
+++ b/devel/msitools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= msitools
DISTVERSION= 0.101
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -17,7 +17,7 @@
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
USES= bison gnome meson perl5 pkgconfig shebangfix tar:xz vala:build
diff --git a/devel/pecl-uuid/Makefile b/devel/pecl-uuid/Makefile
--- 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 @@
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
--- 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_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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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/Makefile b/filesystems/Makefile
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -20,7 +20,6 @@
SUBDIR += dsbmd
SUBDIR += e2fsprogs
SUBDIR += e2fsprogs-core
- SUBDIR += e2fsprogs-libblkid
SUBDIR += e2tools
SUBDIR += encfs
SUBDIR += exfat
@@ -44,6 +43,7 @@
SUBDIR += jmtpfs
SUBDIR += kio-fuse
SUBDIR += libbde
+ SUBDIR += libblkid
SUBDIR += libfsapfs
SUBDIR += libfsext
SUBDIR += libfsfat
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
--- a/filesystems/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -1,6 +1,6 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.47.1
-PORTREVISION?= 0 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
+PORTREVISION?= 1 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -26,13 +26,11 @@
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 @@
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
@@ -313,9 +311,6 @@
.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
--- 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
--- 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
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -59,6 +59,7 @@
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/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/e2fsprogs-libblkid/Makefile b/filesystems/e2fsprogs-libblkid/Makefile
deleted file mode 100644
--- a/filesystems/e2fsprogs-libblkid/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTREVISION= 0
-CATEGORIES= filesystems misc devel
-PKGNAMESUFFIX= -libblkid
-
-COMMENT= Blkid library from e2fsprogs package
-
-LICENSE= LGPL20+
-_no_license_file= sorry
-
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
-
-CONFIGURE_ARGS= --enable-elf-shlibs --disable-libuuid --enable-libblkid
-
-MASTERDIR= ${.CURDIR}/../../filesystems/e2fsprogs-core
-MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib
-USE_LDCONFIG= yes
-ALL_TARGET= libs
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install install-shlibs
-INSTALL_WRKSRC= ${WRKSRC}/lib/blkid
-
-PKGDIR= ${.CURDIR}
-
-pre-build:
- ${MKDIR} ${WRKSRC}/lib/blkid/elfshared
- cd ${WRKSRC}/util && ${MAKE_CMD} subst
-
-post-build:
- cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check
-
-.include "${MASTERDIR}/Makefile"
diff --git a/filesystems/e2fsprogs-libblkid/pkg-descr b/filesystems/e2fsprogs-libblkid/pkg-descr
deleted file mode 100644
--- a/filesystems/e2fsprogs-libblkid/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Block device identification library from the e2fsprogs package.
diff --git a/filesystems/e2fsprogs-libblkid/pkg-plist b/filesystems/e2fsprogs-libblkid/pkg-plist
deleted file mode 100644
--- a/filesystems/e2fsprogs-libblkid/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/blkid/blkid.h
-include/blkid/blkid_types.h
-lib/libblkid.so.1.0
-lib/libblkid.so.1
-lib/libblkid.so
-lib/libblkid.a
-libdata/pkgconfig/blkid.pc
-share/man/man3/libblkid.3.gz
diff --git a/filesystems/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile
--- a/filesystems/e2fsprogs/Makefile
+++ b/filesystems/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= e2fsprogs
CATEGORIES= filesystems sysutils
PORTVERSION= 1.47.1
-PORTREVISION= 0
+PORTREVISION= 1
BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core
RUN_DEPENDS= ${BUILD_DEPENDS}
DISTFILES= # empty
diff --git a/filesystems/httpdirfs/Makefile b/filesystems/httpdirfs/Makefile
--- a/filesystems/httpdirfs/Makefile
+++ b/filesystems/httpdirfs/Makefile
@@ -1,5 +1,6 @@
PORTNAME= httpdirfs
DISTVERSION= 1.2.7
+PORTREVISION= 1
CATEGORIES= filesystems
PKGNAMEPREFIX= fusefs-
@@ -15,7 +16,7 @@
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/libblkid/Makefile b/filesystems/libblkid/Makefile
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/Makefile
@@ -0,0 +1,30 @@
+PORTNAME= libblkid
+PORTVERSION= 1.1.0
+CATEGORIES= filesystems
+
+MAINTAINER= kekek2@ya.ru
+COMMENT= Library generates and parses 128-bit Universally Unique IDs (UUIDs)
+WWW= https://git.kernel.org/cgit/utils/util-linux/util-linux.git
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause
+
+USES= bison meson pkgconfig tar:xz
+
+USE_GITHUB= yes
+GH_ACCOUNT= util-linux
+GH_PROJECT= util-linux
+GH_TAGNAME= e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320
+
+USE_LDCONFIG= yes
+OPTIONS_SUB= yes
+# disable all Meson features because the project has gazillion of them and we only need one
+MESON_ARGS= --auto-features=disabled -Dbuild-libblkid=enabled -Dprogram-tests=false \
+ -Db_lundef=false
+
+OPTIONS_DEFINE= MANPAGES
+MANPAGES_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
+
+UTIL_LINUX_VERSION= 2.40.2
+
+.include <bsd.port.mk>
diff --git a/filesystems/libblkid/distinfo b/filesystems/libblkid/distinfo
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1735405720
+SHA256 (util-linux-util-linux-1.1.0-e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320_GH0.tar.gz) = 824606af01f06c785a65042e9ab8e33157d1fdbeb7cf8c87a3b3ace563adab6c
+SIZE (util-linux-util-linux-1.1.0-e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320_GH0.tar.gz) = 14973699
diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/files/patch-meson.build
@@ -0,0 +1,83 @@
+https://github.com/util-linux/util-linux/pull/3316
+
+
+--- meson.build.orig 2024-12-06 09:03:41 UTC
++++ meson.build
+@@ -367,15 +367,19 @@ endif
+ lib_crypt = cc.find_library('crypt', required : get_option('build-sulogin'))
+ endif
+
++pam_req = get_option('build-login').enabled() or \
++ get_option('build-chfn-chsh').enabled() or \
++ get_option('build-su').enabled() or \
++ get_option('build-runuser').enabled()
+ lib_pam = cc.find_library(
+ 'pam',
+ disabler : true,
+- required : get_option('build-login').enabled() or \
+- get_option('build-chfn-chsh').enabled() or \
+- get_option('build-su').enabled() or \
+- get_option('build-runuser').enabled())
++ required : pam_req)
+ if lib_pam.found()
+- lib_pam_misc = cc.find_library('pam_misc')
++ lib_pam_misc = cc.find_library(
++ 'pam_misc',
++ disabler : true,
++ required : pam_req)
+ lib_pam = [lib_pam, lib_pam_misc]
+ else
+ lib_pam_misc = declare_dependency()
+@@ -803,7 +807,7 @@ have = cc.compiles(code, name : 'using __progname')
+ }
+ '''
+ have = cc.compiles(code, name : 'using __progname')
+-conf.set('HAVE___PROGNAME', have ? 1 : false)
++conf.set('HAVE___PROGNAME', false)
+
+ have_pty = conf.get('HAVE_PTY_H').to_string() == '1' \
+ and conf.get('HAVE_SYS_SIGNALFD_H').to_string() == '1'
+@@ -1211,11 +1215,12 @@ exe = executable(
+ include_directories : includes,
+ link_with : lib_common,
+ install_dir : usrbin_exec_dir,
+- install : true)
++ install : opt,
++ build_by_default : opt)
+ if opt and not is_disabler(exe)
+-exes += exe
+-manadocs += ['text-utils/bits.1.adoc']
+-bashcompletions += ['bits']
++ exes += exe
++ manadocs += ['text-utils/bits.1.adoc']
++ bashcompletions += ['bits']
+ endif
+
+ opt = not get_option('build-col').require(is_glibc).disabled()
+@@ -3080,14 +3085,16 @@ endif
+
+ ############################################################
+
++opt = not get_option('build-findfs').disabled()
+ exe = executable(
+ 'findfs',
+ findfs_sources,
+ include_directories : includes,
+ dependencies : [blkid_dep],
+ install_dir : sbindir,
+- install : true)
+-if not is_disabler(exe)
++ install : opt,
++ build_by_default : opt)
++if opt and not is_disabler(exe)
+ exes += exe
+ manadocs += ['misc-utils/findfs.8.adoc']
+ bashcompletions += ['findfs']
+@@ -3922,7 +3929,6 @@ run_target(
+ depends : exes)
+
+
+-manadocs += ['lib/terminal-colors.d.5.adoc']
+ if build_libblkid
+ manadocs += ['libblkid/libblkid.3.adoc']
+ endif
diff --git a/filesystems/libblkid/files/patch-meson__options.txt b/filesystems/libblkid/files/patch-meson__options.txt
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/files/patch-meson__options.txt
@@ -0,0 +1,11 @@
+--- meson_options.txt.orig 2024-12-06 09:03:41 UTC
++++ meson_options.txt
+@@ -255,6 +255,8 @@ option('build-hexdump', type : 'feature',
+ description : 'build pylibmount')
+ option('build-hexdump', type : 'feature',
+ description : 'build hexdump')
++option('build-findfs', type : 'feature',
++ description : 'build findfs')
+
+ # static programs
+
diff --git a/filesystems/libblkid/pkg-descr b/filesystems/libblkid/pkg-descr
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/pkg-descr
@@ -0,0 +1,5 @@
+The libblkid library is used to identify block devices (disks) as to their
+content (e.g., filesystem type) as well as extracting additional information
+such as filesystem labels/volume names, unique identifiers/serial numbers.
+A common use is to allow use of LABEL= and UUID= tags instead of hard-coding
+specific block device names into configuration files.
diff --git a/filesystems/libblkid/pkg-plist b/filesystems/libblkid/pkg-plist
new file mode 100644
--- /dev/null
+++ b/filesystems/libblkid/pkg-plist
@@ -0,0 +1,9 @@
+include/blkid/blkid.h
+lib/libblkid.a
+lib/libblkid.so
+lib/libblkid.so.1
+lib/libblkid.so.1.1.0
+libdata/pkgconfig/blkid.pc
+sbin/blkid
+%%MANPAGES%%share/man/man3/libblkid.3.gz
+%%MANPAGES%%share/man/man8/blkid.8.gz
diff --git a/filesystems/ltfs/Makefile b/filesystems/ltfs/Makefile
--- a/filesystems/ltfs/Makefile
+++ b/filesystems/ltfs/Makefile
@@ -2,6 +2,7 @@
DISTVERSIONPREFIX= v
DISTVERSION= 2.4.7
DISTVERSIONSUFFIX= -10514
+PORTREVISION= 1
CATEGORIES= filesystems sysutils
MAINTAINER= kbowling@FreeBSD.org
@@ -13,7 +14,7 @@
LIB_DEPENDS= libicudata.so:devel/icu \
libpkg.so:${PKG_ORIGIN} \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= autoreconf compiler:c11 fuse gnome libtool:build pkgconfig \
python shebangfix ssl
diff --git a/filesystems/ntfs/Makefile b/filesystems/ntfs/Makefile
--- 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 @@
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
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -1,5 +1,6 @@
PORTNAME= endless-sky
PORTVERSION= 0.10.4
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= games
@@ -14,7 +15,7 @@
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
--- a/games/moonlight-embedded-devel/Makefile
+++ b/games/moonlight-embedded-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= moonlight-embedded-devel
DISTVERSION= 2.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= https://github.com/armin-25689/moonlight-embedded/releases/download/v${DISTVERSION}/
@@ -21,7 +21,7 @@
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
--- a/games/moonlight-embedded/Makefile
+++ b/games/moonlight-embedded/Makefile
@@ -1,6 +1,6 @@
PORTNAME= moonlight-embedded
DISTVERSION= 2.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= https://github.com/moonlight-stream/moonlight-embedded/releases/download/v${DISTVERSION}/
@@ -20,7 +20,7 @@
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
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -1,5 +1,6 @@
PORTNAME= chez-scheme
PORTVERSION= 10.1.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= lang
MASTER_SITES= https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
@@ -14,7 +15,7 @@
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
--- 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
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -111,7 +111,7 @@
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
--- a/lang/lfortran/Makefile
+++ b/lang/lfortran/Makefile
@@ -58,7 +58,7 @@
#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
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -1,6 +1,7 @@
PORTNAME= pharo
DISTVERSION= 10.2.0
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
@@ -17,7 +18,7 @@
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
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
DISTVERSION= 3.10.0
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@
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
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.2.12
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
@@ -17,7 +17,7 @@
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
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.4.9
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@
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
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.6.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@
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
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.8.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@
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
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cadabra2
DISTVERSION= 2.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -20,7 +20,7 @@
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
--- a/math/topologic/Makefile
+++ b/math/topologic/Makefile
@@ -1,7 +1,7 @@
PORTNAME= topologic
DISTVERSIONPREFIX= v
DISTVERSION= 6.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMESUFFIX= -space-modeling-library
@@ -14,7 +14,7 @@
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/Makefile b/misc/Makefile
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -95,7 +95,6 @@
SUBDIR += dtach
SUBDIR += dvorak7min
SUBDIR += dynomite
- SUBDIR += e2fsprogs-libuuid
SUBDIR += ecflow
SUBDIR += edfbrowser
SUBDIR += edflib
@@ -245,6 +244,7 @@
SUBDIR += libsupertone
SUBDIR += libsweep-lidar
SUBDIR += libutf
+ SUBDIR += libuuid
SUBDIR += libxdf
SUBDIR += lifelines
SUBDIR += lightgbm
diff --git a/misc/biblesync/Makefile b/misc/biblesync/Makefile
--- 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 @@
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/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile
deleted file mode 100644
--- a/misc/e2fsprogs-libuuid/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-PORTREVISION= 0
-CATEGORIES= misc devel
-PKGNAMESUFFIX= -libuuid
-
-COMMENT= UUID library from e2fsprogs package
-
-LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${INSTALL_WRKSRC}/COPYING
-
-CONFIGURE_ARGS= --enable-elf-shlibs --enable-libuuid
-
-OPTIONS_EXCLUDE= NLS
-MASTERDIR= ${.CURDIR}/../../filesystems/e2fsprogs-core
-MAKE_ARGS= LIB_SUBDIRS=lib/uuid
-USE_LDCONFIG= yes
-ALL_TARGET= libs
-INSTALL_TARGET= install install-shlibs
-INSTALL_WRKSRC= ${WRKSRC}/lib/uuid
-FILESDIR= ${.CURDIR}/files
-USE_RC_SUBR= uuidd
-
-PKGDIR= ${.CURDIR}
-
-post-patch::
- ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \
- -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \
- ${WRKSRC}/lib/uuid/*.[ch]
-
-pre-build:
- ${MKDIR} ${WRKSRC}/lib/uuid/elfshared
- cd ${WRKSRC}/util && ${MAKE_CMD} subst
-
-# ulimit guards against runaway tests
-# failure to launch uuidd is fine (one might be running, or we may lack
-# privileges); if it works, it'll quit after 50 seconds
-post-build:
- cd ${WRKSRC}/misc && ${MAKE_CMD} uuidgen uuidgen.1 uuidd uuidd.8
- cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${MAKE_CMD} check )
-
-post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/misc/uuidgen.1 ${STAGEDIR}${PREFIX}/share/man/man1/
- ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidd ${STAGEDIR}${PREFIX}/sbin/
- ${INSTALL_MAN} ${WRKSRC}/misc/uuidd.8 ${STAGEDIR}${PREFIX}/share/man/man8/
- ${MKDIR} ${STAGEDIR}/var/run/libuuid
-
-.include "${MASTERDIR}/Makefile"
diff --git a/misc/e2fsprogs-libuuid/files/uuidd.in b/misc/e2fsprogs-libuuid/files/uuidd.in
deleted file mode 100644
--- a/misc/e2fsprogs-libuuid/files/uuidd.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# rcNG script to start uuidd at boot-time on rcNG-enabled systems,
-# such as FreeBSD. Note: Starting uuidd at boot-time is not strictly
-# necessary, the library will - as of 1.41.5 - silently launch an
-# instance of uuidd that exits after 300 seconds; for most accurate
-# time-based uuids generated from unprivileged user accounts it may be
-# useful to run it system-wide.
-#
-# (C) 2008, 2009 by Matthias Andree.
-# Licensed under the modified (= 2-clause) BSD license.
-
-# PROVIDE: uuidd
-# REQUIRE: FILESYSTEMS ldconfig
-# BEFORE: DAEMON
-
-. /etc/rc.subr
-
-name="uuidd"
-rcvar=uuidd_enable
-command="%%PREFIX%%/sbin/uuidd"
-procname="${command}"
-
-: ${uuidd_enable="NO"}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/misc/e2fsprogs-libuuid/pkg-descr b/misc/e2fsprogs-libuuid/pkg-descr
deleted file mode 100644
--- a/misc/e2fsprogs-libuuid/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-UUID library from the e2fsprogs package.
diff --git a/misc/e2fsprogs-libuuid/pkg-plist b/misc/e2fsprogs-libuuid/pkg-plist
deleted file mode 100644
--- a/misc/e2fsprogs-libuuid/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-bin/uuidgen
-include/uuid/uuid.h
-lib/libuuid.so.1.2
-lib/libuuid.so.1
-lib/libuuid.so
-lib/libuuid.a
-libdata/pkgconfig/uuid.pc
-share/man/man1/uuidgen.1.gz
-share/man/man3/uuid.3.gz
-share/man/man3/uuid_clear.3.gz
-share/man/man3/uuid_compare.3.gz
-share/man/man3/uuid_copy.3.gz
-share/man/man3/uuid_generate.3.gz
-share/man/man3/uuid_is_null.3.gz
-share/man/man3/uuid_parse.3.gz
-share/man/man3/uuid_time.3.gz
-share/man/man3/uuid_unparse.3.gz
-share/man/man3/uuid_generate_random.3.gz
-share/man/man3/uuid_generate_time.3.gz
-share/man/man8/uuidd.8.gz
-sbin/uuidd
-@dir /var/run/libuuid
diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile
--- 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 @@
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/libuuid/Makefile b/misc/libuuid/Makefile
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/Makefile
@@ -0,0 +1,29 @@
+PORTNAME= libuuid
+PORTVERSION= 1.3.0
+CATEGORIES= misc
+
+MAINTAINER= kekek2@ya.ru
+COMMENT= Library generates and parses 128-bit Universally Unique IDs (UUIDs)
+WWW= https://git.kernel.org/cgit/utils/util-linux/util-linux.git
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause
+
+USES= bison meson pkgconfig tar:xz
+
+USE_GITHUB= yes
+GH_ACCOUNT= util-linux
+GH_PROJECT= util-linux
+GH_TAGNAME= e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320
+
+USE_LDCONFIG= yes
+OPTIONS_SUB= yes
+# disable all Meson features because the project has gazillion of them and we only need one
+MESON_ARGS= --auto-features=disabled -Dbuild-libuuid=enabled -Dprogram-tests=false
+
+OPTIONS_DEFINE= MANPAGES
+MANPAGES_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
+
+UTIL_LINUX_VERSION= 2.40.2
+
+.include <bsd.port.mk>
diff --git a/misc/libuuid/distinfo b/misc/libuuid/distinfo
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1735405886
+SHA256 (util-linux-util-linux-1.3.0-e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320_GH0.tar.gz) = 824606af01f06c785a65042e9ab8e33157d1fdbeb7cf8c87a3b3ace563adab6c
+SIZE (util-linux-util-linux-1.3.0-e78bcb49ae9fba2f4d17a69e8a7b59d27c59a320_GH0.tar.gz) = 14973699
diff --git a/misc/libuuid/files/patch-meson.build b/misc/libuuid/files/patch-meson.build
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/files/patch-meson.build
@@ -0,0 +1,74 @@
+https://github.com/util-linux/util-linux/pull/3316
+
+
+--- meson.build.orig 2024-12-06 09:03:41 UTC
++++ meson.build
+@@ -367,15 +367,19 @@ endif
+ lib_crypt = cc.find_library('crypt', required : get_option('build-sulogin'))
+ endif
+
++pam_req = get_option('build-login').enabled() or \
++ get_option('build-chfn-chsh').enabled() or \
++ get_option('build-su').enabled() or \
++ get_option('build-runuser').enabled()
+ lib_pam = cc.find_library(
+ 'pam',
+ disabler : true,
+- required : get_option('build-login').enabled() or \
+- get_option('build-chfn-chsh').enabled() or \
+- get_option('build-su').enabled() or \
+- get_option('build-runuser').enabled())
++ required : pam_req)
+ if lib_pam.found()
+- lib_pam_misc = cc.find_library('pam_misc')
++ lib_pam_misc = cc.find_library(
++ 'pam_misc',
++ disabler : true,
++ required : pam_req)
+ lib_pam = [lib_pam, lib_pam_misc]
+ else
+ lib_pam_misc = declare_dependency()
+@@ -1211,11 +1215,12 @@ exe = executable(
+ include_directories : includes,
+ link_with : lib_common,
+ install_dir : usrbin_exec_dir,
+- install : true)
++ install : opt,
++ build_by_default : opt)
+ if opt and not is_disabler(exe)
+-exes += exe
+-manadocs += ['text-utils/bits.1.adoc']
+-bashcompletions += ['bits']
++ exes += exe
++ manadocs += ['text-utils/bits.1.adoc']
++ bashcompletions += ['bits']
+ endif
+
+ opt = not get_option('build-col').require(is_glibc).disabled()
+@@ -3080,14 +3085,16 @@ endif
+
+ ############################################################
+
++opt = not get_option('build-findfs').disabled()
+ exe = executable(
+ 'findfs',
+ findfs_sources,
+ include_directories : includes,
+ dependencies : [blkid_dep],
+ install_dir : sbindir,
+- install : true)
+-if not is_disabler(exe)
++ install : opt,
++ build_by_default : opt)
++if opt and not is_disabler(exe)
+ exes += exe
+ manadocs += ['misc-utils/findfs.8.adoc']
+ bashcompletions += ['findfs']
+@@ -3922,7 +3929,6 @@ run_target(
+ depends : exes)
+
+
+-manadocs += ['lib/terminal-colors.d.5.adoc']
+ if build_libblkid
+ manadocs += ['libblkid/libblkid.3.adoc']
+ endif
diff --git a/misc/libuuid/files/patch-meson__options.txt b/misc/libuuid/files/patch-meson__options.txt
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/files/patch-meson__options.txt
@@ -0,0 +1,11 @@
+--- meson_options.txt.orig 2024-12-06 09:03:41 UTC
++++ meson_options.txt
+@@ -255,6 +255,8 @@ option('build-hexdump', type : 'feature',
+ description : 'build pylibmount')
+ option('build-hexdump', type : 'feature',
+ description : 'build hexdump')
++option('build-findfs', type : 'feature',
++ description : 'build findfs')
+
+ # static programs
+
diff --git a/misc/libuuid/pkg-descr b/misc/libuuid/pkg-descr
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/pkg-descr
@@ -0,0 +1,11 @@
+The UUID library is used to generate unique identifiers for objects
+that may be accessible beyond the local system. This library
+generates UUIDs compatible with those created by the Open Software
+Foundation (OSF) Distributed Computing Environment (DCE) utility
+uuidgen.
+
+The UUIDs generated by this library can be reasonably expected to be
+unique within a system, and unique across all systems. They could
+be used, for instance, to generate unique HTTP cookies across multiple
+web servers without communication between the servers, and without fear
+of a name clash.
diff --git a/misc/libuuid/pkg-plist b/misc/libuuid/pkg-plist
new file mode 100644
--- /dev/null
+++ b/misc/libuuid/pkg-plist
@@ -0,0 +1,21 @@
+bin/uuidgen
+include/uuid/uuid.h
+lib/libuuid.a
+lib/libuuid.so
+lib/libuuid.so.1
+lib/libuuid.so.1.3.0
+libdata/pkgconfig/uuid.pc
+%%MANPAGES%%share/man/man1/uuidgen.1.gz
+%%MANPAGES%%share/man/man3/uuid.3.gz
+%%MANPAGES%%share/man/man3/uuid_clear.3.gz
+%%MANPAGES%%share/man/man3/uuid_compare.3.gz
+%%MANPAGES%%share/man/man3/uuid_copy.3.gz
+%%MANPAGES%%share/man/man3/uuid_generate.3.gz
+%%MANPAGES%%share/man/man3/uuid_generate_random.3.gz
+%%MANPAGES%%share/man/man3/uuid_generate_time.3.gz
+%%MANPAGES%%share/man/man3/uuid_generate_time_safe.3.gz
+%%MANPAGES%%share/man/man3/uuid_is_null.3.gz
+%%MANPAGES%%share/man/man3/uuid_parse.3.gz
+%%MANPAGES%%share/man/man3/uuid_time.3.gz
+%%MANPAGES%%share/man/man3/uuid_unparse.3.gz
+%%MANPAGES%%share/man/man8/uuidd.8.gz
diff --git a/misc/ola/Makefile b/misc/ola/Makefile
--- a/misc/ola/Makefile
+++ b/misc/ola/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ola
DISTVERSION= 0.10.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc
MASTER_SITES= https://github.com/OpenLightingProject/ola/releases/download/${DISTVERSION}/
@@ -17,7 +17,7 @@
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
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xiphos
DISTVERSION= 4.2.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= misc gnome
# Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be
# built as they miss the file ${WRKSRC}/cmake/source_version.txt.
@@ -25,7 +25,7 @@
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-gtk3
# gettext is always needed, even if NLS is off
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kodi
DISTVERSION= 21.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia java
MASTER_SITES= http://mirrors.kodi.tv/build-deps/sources/
DISTFILES= apache-groovy-binary-${GROOVY_VERSION}.zip \
@@ -46,7 +46,7 @@
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
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,6 +1,6 @@
PORTNAME= obs-studio
DISTVERSION= 30.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -45,7 +45,7 @@
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/biboumi/Makefile b/net-im/biboumi/Makefile
--- a/net-im/biboumi/Makefile
+++ b/net-im/biboumi/Makefile
@@ -1,6 +1,6 @@
PORTNAME= biboumi
DISTVERSION= 9.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= https://git.louiz.org/biboumi/snapshot/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -12,7 +12,7 @@
LICENSE= ZLIB
LIB_DEPENDS= libexpat.so:textproc/expat2 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake iconv localbase:ldflags pkgconfig python:build tar:xz
diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile
--- a/net-im/profanity/Makefile
+++ b/net-im/profanity/Makefile
@@ -1,6 +1,6 @@
PORTNAME= profanity
DISTVERSION= 0.14.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MASTER_SITES= https://profanity-im.github.io/tarballs/
@@ -13,7 +13,7 @@
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
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,6 +1,6 @@
PORTNAME= telepathy-gabble
PORTVERSION= 0.18.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -19,7 +19,7 @@
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
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -1,7 +1,7 @@
PORTNAME= netdata
DISTVERSIONPREFIX= v
DISTVERSION= 1.43.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-mgmt
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -14,7 +14,7 @@
LIB_DEPENDS= libjson-c.so:devel/json-c \
libyaml.so:textproc/libyaml \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libuv.so:devel/libuv
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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/asterisk18/Makefile b/net/asterisk18/Makefile
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -1,5 +1,6 @@
PORTNAME= asterisk
PORTVERSION= 18.26.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -17,7 +18,7 @@
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/freeswitch/Makefile b/net/freeswitch/Makefile
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -1,5 +1,6 @@
PORTNAME= freeswitch
DISTVERSION= 1.10.12
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://files.freeswitch.org/releases/freeswitch/ \
https://files.freeswitch.org/releases/sounds/:sounds
@@ -32,7 +33,7 @@
libpng.so:graphics/png \
libjbig.so:graphics/jbigkit \
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
--- 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 @@
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
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gupnp
PORTVERSION= 1.6.7
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
@@ -16,7 +17,7 @@
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
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mosquitto
DISTVERSION= 2.0.18
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://mosquitto.org/files/source/
@@ -11,7 +12,7 @@
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/opensips31/Makefile b/net/opensips31/Makefile
--- a/net/opensips31/Makefile
+++ b/net/opensips31/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opensips31
DISTVERSION= 3.1.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= https://opensips.org/pub/opensips/${DISTVERSION}/
DISTNAME= opensips-${DISTVERSION}
@@ -19,7 +19,7 @@
libjson-c.so:devel/json-c \
libjwt.so:www/libjwt \
libpcre.so:devel/pcre \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= gettext-runtime gmake gnome localbase:ldflags ncurses perl5 \
pkgconfig shebangfix ssl
diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,5 +1,5 @@
PORTVERSION= 2.1.7
-PORTREVISION= 3
+PORTREVISION= 4
PKGNAMESUFFIX= 2
WWW= https://www.clusterlabs.org/pacemaker/
diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common
--- a/net/pacemaker2/Makefile.common
+++ b/net/pacemaker2/Makefile.common
@@ -13,7 +13,7 @@
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
--- a/science/bout++/Makefile
+++ b/science/bout++/Makefile
@@ -1,6 +1,7 @@
PORTNAME= bout++
DISTVERSIONPREFIX= v
DISTVERSION= 5.1.1
+PORTREVISION= 1
CATEGORIES= science math # physics
MAINTAINER= yuri@FreeBSD.org
@@ -14,7 +15,7 @@
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
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -59,7 +59,7 @@
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
--- a/science/openmodelica/Makefile
+++ b/science/openmodelica/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openmodelica
DISTVERSIONPREFIX= v
DISTVERSION= 1.24.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science cad java
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
@@ -33,7 +33,7 @@
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
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= orthanc
DISTVERSION= 1.12.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= science
MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc/
DISTNAME= Orthanc-${PORTVERSION}
@@ -27,7 +27,7 @@
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
--- a/science/qbox/Makefile
+++ b/science/qbox/Makefile
@@ -1,7 +1,7 @@
PORTNAME= qbox
DISTVERSIONPREFIX= rel
DISTVERSION= 1_78_2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org
@@ -17,7 +17,7 @@
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
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gvm
DISTVERSIONPREFIX= v
DISTVERSION= 22.15.0
+PORTREVISION= 1
CATEGORIES= security
PKGNAMESUFFIX= -libs
@@ -21,7 +22,7 @@
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
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,5 +1,6 @@
PORTNAME= snort
DISTVERSION= 3.6.0.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
PKGNAMESUFFIX= 3
@@ -17,7 +18,7 @@
libhwloc.so:devel/hwloc2 \
libpcap.so:net/libpcap \
libpcre.so:devel/pcre \
- 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
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sssd
PORTVERSION= 2.9.6
+PORTREVISION= 1
CATEGORIES= security
PKGNAMESUFFIX= 2
@@ -44,7 +45,7 @@
libtdb.so:databases/tdb \
libtevent.so:devel/tevent \
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
--- 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 @@
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
--- a/security/tpm2-tss/Makefile
+++ b/security/tpm2-tss/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tpm2-tss
DISTVERSION= 4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= https://github.com/tpm2-software/tpm2-tss/releases/download/${DISTVERSION}/
@@ -11,7 +11,7 @@
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/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile
--- a/sysutils/cluster-glue/Makefile
+++ b/sysutils/cluster-glue/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cluster-glue
PORTVERSION= 1.0.12
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://hg.linux-ha.org/glue/archive/
DISTNAME= 0a7add1d9996
@@ -16,7 +16,7 @@
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
--- 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 @@
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
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -1,6 +1,6 @@
PORTNAME= passwordsafe
DISTVERSION= 1.12.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MAINTAINER= brnrd@FreeBSD.org
@@ -13,7 +13,7 @@
NOT_FOR_ARCHS_REASON= Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h
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
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,5 +1,6 @@
PORTNAME= rsyslog
PORTVERSION= 8.2412.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -13,7 +14,7 @@
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
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,6 +1,6 @@
PORTNAME= syslog-ng
DISTVERSION= 4.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
# official master site:
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
@@ -16,7 +16,7 @@
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/tracker/Makefile b/sysutils/tracker/Makefile
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tracker
PORTVERSION= 2.3.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
@@ -14,7 +14,7 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+LIB_DEPENDS= libuuid.so:misc/libuuid \
libsoup-2.4.so:devel/libsoup \
libdbus-1.so:devel/dbus \
libjson-glib-1.0.so:devel/json-glib \
diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile
--- a/sysutils/tracker3/Makefile
+++ b/sysutils/tracker3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tracker
PORTVERSION= 3.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -15,7 +15,7 @@
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libicutu.so:devel/icu \
libjson-glib-1.0.so:devel/json-glib \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \
pkgconfig python:build sqlite tar:xz vala:build
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -24,8 +24,8 @@
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
--- a/textproc/fcitx5/Makefile
+++ b/textproc/fcitx5/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fcitx5
DISTVERSION= 5.1.11
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/ \
https://download.fcitx-im.org/data/:dict
@@ -20,7 +21,7 @@
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/textproc/zorba/Makefile b/textproc/zorba/Makefile
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zorba
PORTVERSION= 2.7.0
-PORTREVISION= 41
+PORTREVISION= 42
CATEGORIES= textproc java
MASTER_SITES= https://launchpadlibrarian.net/119058962/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@@ -16,7 +16,7 @@
libicudata.so:devel/icu \
libcurl.so:ftp/curl \
libtidy5.so:www/tidy-html5 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= fop:textproc/fop
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/davix/Makefile b/www/davix/Makefile
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -1,6 +1,7 @@
PORTNAME= davix
DISTVERSIONPREFIX= R_
DISTVERSION= 0_8_7
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= yuri@FreeBSD.org
@@ -11,7 +12,7 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcurl.so:ftp/curl \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= cmake:testing compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl
SHEBANG_GLOB= *.py
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
--- 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 @@
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
--- 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_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 @@
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
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,7 +1,7 @@
PORTNAME= hyprland
DISTVERSIONPREFIX= v
DISTVERSION= 0.46.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -21,7 +21,7 @@
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
--- a/x11/budgie-desktop/Makefile
+++ b/x11/budgie-desktop/Makefile
@@ -1,6 +1,6 @@
PORTNAME= budgie-desktop
DISTVERSION= 10.8.2
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= x11 budgie
MASTER_SITES= BUDGIE
@@ -18,7 +18,7 @@
zenity>0:x11/zenity
LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \
libpeas-1.0.so:devel/libpeas \
- 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
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gnome-terminal
DISTVERSION= 3.44.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -19,7 +19,7 @@
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libgnutls.so:security/gnutls \
libpcre2-8.so:devel/pcre2 \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Jan 18, 11:31 PM (21 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15904677
Default Alt Text
D23312.diff (77 KB)
Attached To
Mode
D23312: Replace e2fsprogs libblkid and libuuid by util-linux implementations
Attached
Detach File
Event Timeline
Log In to Comment