Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -13751,3 +13751,5 @@ net/py-coherence||2020-01-18|fails with python-3.X, and python-2.7 is EOLed (GH bug#32) net/py-upnp-inspector||2020-01-18|Missing dependency: net/py-coherence is python-2.7-only security/py-pymacaroons-pynacl|security/py-pymacaroons|2020-01-20|Rename to match upstream naming +misc/e2fsprogs-libuuid|misc/libuuid|2020-01-22|Move to implementation from util-linux +misc/e2fsprogs-libblkid|misc/libblkid|2020-01-22|Move to implementation from util-linux Index: audio/baresip/Makefile =================================================================== --- audio/baresip/Makefile +++ audio/baresip/Makefile @@ -2,7 +2,7 @@ PORTNAME= baresip PORTVERSION= 0.5.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= http://www.creytiv.com/pub/ Index: audio/gsequencer/Makefile =================================================================== --- audio/gsequencer/Makefile +++ audio/gsequencer/Makefile @@ -2,6 +2,7 @@ PORTNAME= gsequencer DISTVERSION= 3.0.9 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SAVANNAH/gsequencer/${DISTVERSION:R}.x @@ -21,7 +22,7 @@ libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile \ libsoup-2.4.so:devel/libsoup \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 RUN_DEPENDS= dssi>0:audio/dssi Index: audio/lash/Makefile =================================================================== --- audio/lash/Makefile +++ audio/lash/Makefile @@ -3,7 +3,7 @@ PORTNAME= lash PORTVERSION= 0.5.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= audio MASTER_SITES= SAVANNAH @@ -17,7 +17,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 Index: audio/libgig/Makefile =================================================================== --- audio/libgig/Makefile +++ audio/libgig/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgig DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/qsampler/${PORTNAME}/${PORTVERSION} \ http://download.linuxsampler.org/packages/ @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsndfile.so:audio/libsndfile \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= gmake libtool pathfix pkgconfig tar:bzip2 GNU_CONFIGURE= yes Index: audio/linuxsampler/Makefile =================================================================== --- audio/linuxsampler/Makefile +++ audio/linuxsampler/Makefile @@ -3,6 +3,7 @@ PORTNAME= linuxsampler DISTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://download.linuxsampler.org/packages/ @@ -18,7 +19,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 gmake libtool pathfix pkgconfig sqlite:3 tar:bzip2 GNU_CONFIGURE= yes Index: benchmarks/flowgrind/Makefile =================================================================== --- benchmarks/flowgrind/Makefile +++ benchmarks/flowgrind/Makefile @@ -4,7 +4,7 @@ PORTNAME= flowgrind PORTVERSION= 0.8.0 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= benchmarks MAINTAINER= dbaio@FreeBSD.org @@ -17,7 +17,7 @@ libxmlrpc.so:net/xmlrpc-c \ libcurl.so:ftp/curl \ libwwwxml.so:www/libwww \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf ssl Index: chinese/fcitx/Makefile =================================================================== --- chinese/fcitx/Makefile +++ chinese/fcitx/Makefile @@ -3,7 +3,7 @@ PORTNAME= fcitx PORTVERSION= 4.2.9.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese x11 MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \ http://download.fcitx-im.org/data/:data @@ -30,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 Index: deskutils/bijiben/Makefile =================================================================== --- deskutils/bijiben/Makefile +++ deskutils/bijiben/Makefile @@ -3,7 +3,7 @@ PORTNAME= bijiben PORTVERSION= 3.28.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -20,7 +20,7 @@ libgoa-1.0.so:net/gnome-online-accounts \ libical.so:devel/libical \ libzeitgeist-2.0.so:sysutils/zeitgeist \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid PORTSCOUT= limitw:1,even Index: deskutils/gnote/Makefile =================================================================== --- deskutils/gnote/Makefile +++ deskutils/gnote/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnote PORTVERSION= 3.28.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -17,7 +17,7 @@ LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \ libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid PORTSCOUT= limitw:1,even Index: deskutils/nautilus-actions/Makefile =================================================================== --- deskutils/nautilus-actions/Makefile +++ deskutils/nautilus-actions/Makefile @@ -3,14 +3,14 @@ PORTNAME= nautilus-actions PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Extension for Nautilus to configure programs to launch on files -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ +LIB_DEPENDS= libuuid.so:misc/libuuid \ libdbus-glib-1.so:devel/dbus-glib \ libgtop-2.0.so:devel/libgtop \ libunique-3.0.so:x11-toolkits/libunique3 Index: devel/RStudio/Makefile =================================================================== --- devel/RStudio/Makefile +++ devel/RStudio/Makefile @@ -6,6 +6,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v DISTVERSION= 1.2.5033 +PORTREVISION= 1 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools @@ -31,7 +32,7 @@ LIB_DEPENDS= libR.so:math/R \ libboost_thread.so:devel/boost-libs \ libinotify.so:devel/libinotify \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= cmake desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl USE_QT= core dbus declarative gui location network opengl printsupport sensors \ Index: devel/appstream-glib/Makefile =================================================================== --- devel/appstream-glib/Makefile +++ devel/appstream-glib/Makefile @@ -3,7 +3,7 @@ PORTNAME= appstream-glib PORTVERSION= 0.7.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/ DIST_SUBDIR= gnome @@ -19,7 +19,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ 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 Index: devel/babeltrace/Makefile =================================================================== --- devel/babeltrace/Makefile +++ devel/babeltrace/Makefile @@ -3,6 +3,7 @@ PORTNAME= babeltrace PORTVERSION= 1.5.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= pizzamig@FreeBSD.org @@ -17,7 +18,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 Index: devel/gearmand-devel/Makefile =================================================================== --- devel/gearmand-devel/Makefile +++ devel/gearmand-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.1.8 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ PKGNAMESUFFIX= -devel @@ -14,7 +14,7 @@ BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libevent.so:devel/libevent \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libboost_program_options.so:devel/boost-libs CONFLICTS= p5-Gearman-Server-1.* gearmand-1.0.* Index: devel/gearmand/Makefile =================================================================== --- devel/gearmand/Makefile +++ devel/gearmand/Makefile @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.0.6 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libevent.so:devel/libevent \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.* Index: devel/ignition-common/Makefile =================================================================== --- devel/ignition-common/Makefile +++ devel/ignition-common/Makefile @@ -2,7 +2,7 @@ PORTNAME= ignition-common DISTVERSION= 3.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ @@ -17,7 +17,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 pkgconfig Index: devel/libcrossguid/Makefile =================================================================== --- devel/libcrossguid/Makefile +++ devel/libcrossguid/Makefile @@ -2,7 +2,7 @@ PORTNAME= libcrossguid PORTVERSION= 20150803 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= mickael.maillot@gmail.com @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USE_GITHUB= yes GH_ACCOUNT= graeme-hill Index: devel/libdap/Makefile =================================================================== --- devel/libdap/Makefile +++ devel/libdap/Makefile @@ -3,6 +3,7 @@ PORTNAME= libdap PORTVERSION= 3.20.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.opendap.org/pub/source/ \ LOCAL/sunpoet @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libxml2.so:textproc/libxml2 USES= bison charsetfix gmake libtool localbase pathfix ssl Index: devel/libewf/Makefile =================================================================== --- devel/libewf/Makefile +++ devel/libewf/Makefile @@ -3,6 +3,7 @@ PORTNAME= libewf PORTVERSION= 20140808 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/libyal/libewf-legacy/releases/download/${PORTVERSION}/ \ LOCAL/antoine @@ -15,7 +16,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:3.5+ USE_LDCONFIG= yes Index: devel/libsml/Makefile =================================================================== --- devel/libsml/Makefile +++ devel/libsml/Makefile @@ -3,6 +3,7 @@ PORTNAME= libsml PORTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mail+freebsd@gerritbeine.de @@ -10,7 +11,7 @@ LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= dos2unix gmake USE_LDCONFIG= yes Index: devel/msitools/Makefile =================================================================== --- devel/msitools/Makefile +++ devel/msitools/Makefile @@ -2,6 +2,7 @@ PORTNAME= msitools PORTVERSION= 0.100 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME @@ -13,7 +14,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 gmake gnome libtool pkgconfig shebangfix tar:xz Index: devel/p5-UUID/Makefile =================================================================== --- devel/p5-UUID/Makefile +++ devel/p5-UUID/Makefile @@ -3,6 +3,7 @@ PORTNAME= UUID PORTVERSION= 0.28 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JNH @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/License BUILD_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= perl5 USE_PERL5= configure Index: devel/pecl-uuid/Makefile =================================================================== --- devel/pecl-uuid/Makefile +++ devel/pecl-uuid/Makefile @@ -3,7 +3,7 @@ PORTNAME= uuid PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel pear MAINTAINER= gasol.wu@gmail.com @@ -11,7 +11,7 @@ LICENSE= LGPL3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= php:pecl Index: devel/pmdk/Makefile =================================================================== --- devel/pmdk/Makefile +++ devel/pmdk/Makefile @@ -2,6 +2,7 @@ PORTNAME= pmdk DISTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= d.scott.phillips@intel.com @@ -15,7 +16,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= autoreconf:build gmake pkgconfig USE_GITHUB= yes Index: devel/xeus-cling/Makefile =================================================================== --- devel/xeus-cling/Makefile +++ devel/xeus-cling/Makefile @@ -2,7 +2,7 @@ PORTNAME= xeus-cling DISTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -22,7 +22,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 Index: devel/xeus/Makefile =================================================================== --- devel/xeus/Makefile +++ devel/xeus/Makefile @@ -2,7 +2,7 @@ PORTNAME= xeus DISTVERSION= 0.23.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -15,7 +15,7 @@ nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack LIB_DEPENDS= libcryptopp.so:security/cryptopp \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libzmq.so:net/libzmq4 USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl Index: games/moonlight-embedded/Makefile =================================================================== --- games/moonlight-embedded/Makefile +++ games/moonlight-embedded/Makefile @@ -2,7 +2,7 @@ PORTNAME= moonlight-embedded DISTVERSION= 2.4.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://github.com/irtimmer/moonlight-embedded/releases/download/v${DISTVERSION}/ @@ -17,7 +17,7 @@ libenet.so:net/enet \ libexpat.so:textproc/expat2 \ libopus.so:audio/opus \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= cmake localbase:ldflags perl5 pkgconfig sdl ssl tar:xz USE_LDCONFIG= yes Index: lang/chez-scheme/Makefile =================================================================== --- lang/chez-scheme/Makefile +++ lang/chez-scheme/Makefile @@ -4,6 +4,7 @@ PORTNAME= chez-scheme PORTVERSION= 9.5.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://distfiles.pirateparty.in/ashish/:boot \ LOCAL/ashish:boot @@ -18,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 i386 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= gmake iconv:lib ncurses USE_GITHUB= yes Index: lang/io/Makefile =================================================================== --- lang/io/Makefile +++ lang/io/Makefile @@ -3,7 +3,7 @@ PORTNAME= io PORTVERSION= 2017.09.06 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MAINTAINER= gahr@FreeBSD.org Index: math/cadabra2/Makefile =================================================================== --- math/cadabra2/Makefile +++ math/cadabra2/Makefile @@ -2,7 +2,7 @@ PORTNAME= cadabra2 DISTVERSION= 2.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -17,7 +17,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} Index: misc/Makefile =================================================================== --- misc/Makefile +++ misc/Makefile @@ -78,8 +78,6 @@ SUBDIR += dnetc SUBDIR += dtach SUBDIR += dvorak7min - SUBDIR += e2fsprogs-libblkid - SUBDIR += e2fsprogs-libuuid SUBDIR += elixir-mime SUBDIR += elixir-uuid SUBDIR += elki @@ -215,6 +213,7 @@ SUBDIR += lesspipe SUBDIR += lf SUBDIR += libad9361-iio + SUBDIR += libblkid SUBDIR += libeatmydata SUBDIR += libemos SUBDIR += libiio @@ -228,6 +227,7 @@ SUBDIR += libsupertone SUBDIR += libsweep-lidar SUBDIR += libutf + SUBDIR += libuuid SUBDIR += lifelines SUBDIR += lingoteach SUBDIR += locale-en_DK Index: misc/ignition-fuel-tools/Makefile =================================================================== --- misc/ignition-fuel-tools/Makefile +++ misc/ignition-fuel-tools/Makefile @@ -2,7 +2,7 @@ PORTNAME= ignition-fuel-tools DISTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ @@ -16,7 +16,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 Index: misc/libblkid/Makefile =================================================================== --- /dev/null +++ misc/libblkid/Makefile @@ -0,0 +1,34 @@ +# $FreeBSD$ + +PORTNAME= libblkid +PORTVERSION= 2.34 +CATEGORIES= misc +MASTER_SITES= https://www.kernel.org/pub/linux/utils/util-linux/v${PORTVERSION}/ +DISTNAME= util-linux-${PORTVERSION} + +MAINTAINER= bapt@FreeBSD.org +COMMENT= Library to handle device identification and token extraction + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.LGPL-2.1-or-later + +USES= libtool tar:xz + +LIB_DEPENDS+= libuuid.so:misc/libuuid + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-all-programs \ + --disable-bash-completion \ + --without-ncurses \ + --without-ncursesw \ + --disable-nls \ + --enable-libblkid + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libblkid.so.1* + ${RM} ${STAGEDIR}${PREFIX}/man/man5/terminal* + ${RMDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions \ + ${STAGEDIR}${PREFIX}/share/bash-completion/ + +.include + Index: misc/libblkid/distinfo =================================================================== --- /dev/null +++ misc/libblkid/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1579681161 +SHA256 (util-linux-2.34.tar.xz) = 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5 +SIZE (util-linux-2.34.tar.xz) = 4974812 Index: misc/libblkid/pkg-descr =================================================================== --- /dev/null +++ misc/libblkid/pkg-descr @@ -0,0 +1,7 @@ +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, etc. +A common use is to allow use of LABEL= and UUID= tags instead of hard-coding +specific block device names into configuration files. + +WWW: https://git.kernel.org/cgit/utils/util-linux/util-linux.git Index: misc/libblkid/pkg-plist =================================================================== --- /dev/null +++ misc/libblkid/pkg-plist @@ -0,0 +1,7 @@ +include/blkid/blkid.h +lib/libblkid.a +lib/libblkid.so +lib/libblkid.so.1 +lib/libblkid.so.1.1.0 +libdata/pkgconfig/blkid.pc +man/man3/libblkid.3.gz Index: misc/libuuid/Makefile =================================================================== --- /dev/null +++ misc/libuuid/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= libuuid +PORTVERSION= 2.34 +CATEGORIES= misc +MASTER_SITES= https://www.kernel.org/pub/linux/utils/util-linux/v${PORTVERSION}/ +DISTNAME= util-linux-${PORTVERSION} + +MAINTAINER= bapt@FreeBSD.org +COMMENT= Library generates and parses 128-bit Universally Unique IDs (UUIDs) + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause + +USES= libtool tar:xz + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-all-programs \ + --disable-bash-completion \ + --without-ncurses \ + --without-ncursesw \ + --disable-nls \ + --enable-libuuid + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libuuid.so.1.* + ${RM} ${STAGEDIR}${PREFIX}/man/man5/terminal* + ${RMDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions \ + ${STAGEDIR}${PREFIX}/share/bash-completion/ + +.include Index: misc/libuuid/distinfo =================================================================== --- /dev/null +++ misc/libuuid/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1579594852 +SHA256 (util-linux-2.34.tar.xz) = 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5 +SIZE (util-linux-2.34.tar.xz) = 4974812 Index: misc/libuuid/pkg-descr =================================================================== --- /dev/null +++ misc/libuuid/pkg-descr @@ -0,0 +1,13 @@ +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. + +WWW: https://git.kernel.org/cgit/utils/util-linux/util-linux.git Index: misc/libuuid/pkg-plist =================================================================== --- /dev/null +++ misc/libuuid/pkg-plist @@ -0,0 +1,18 @@ +include/uuid/uuid.h +lib/libuuid.a +lib/libuuid.so +lib/libuuid.so.1 +lib/libuuid.so.1.3.0 +libdata/pkgconfig/uuid.pc +man/man3/uuid.3.gz +man/man3/uuid_clear.3.gz +man/man3/uuid_compare.3.gz +man/man3/uuid_copy.3.gz +man/man3/uuid_generate.3.gz +man/man3/uuid_generate_random.3.gz +man/man3/uuid_generate_time.3.gz +man/man3/uuid_generate_time_safe.3.gz +man/man3/uuid_is_null.3.gz +man/man3/uuid_parse.3.gz +man/man3/uuid_time.3.gz +man/man3/uuid_unparse.3.gz Index: multimedia/cinelerra-gg/Makefile =================================================================== --- multimedia/cinelerra-gg/Makefile +++ multimedia/cinelerra-gg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinelerra-gg DISTVERSION= 5.1-20180714 DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia MASTER_SITES= https://git.cinelerra-gg.org/git?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ @@ -41,7 +41,7 @@ libsndfile.so:audio/libsndfile \ libtheoraenc.so:multimedia/libtheora \ libtiff.so:graphics/tiff \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libvorbis.so:audio/libvorbis \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp \ Index: multimedia/kodi-devel/Makefile =================================================================== --- multimedia/kodi-devel/Makefile +++ multimedia/kodi-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= kodi DISTVERSION= 19.0.a20200115 +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMESUFFIX= -devel @@ -44,7 +45,7 @@ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ libudev.so:devel/libudev-devd \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} # Building libcpluff.a requires autoreconf and gmake. Using ninja Index: multimedia/kodi/Makefile =================================================================== --- multimedia/kodi/Makefile +++ multimedia/kodi/Makefile @@ -2,7 +2,7 @@ PORTNAME= kodi DISTVERSION= 17.6 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= multimedia java MAINTAINER= ports@FreeBSD.org @@ -55,7 +55,7 @@ libtinyxml.so:textproc/tinyxml \ libtspi.so:security/trousers \ libunistring.so:devel/libunistring \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libvorbis.so:audio/libvorbis \ libxslt.so:textproc/libxslt \ libyajl.so:devel/yajl Index: multimedia/ustreamer/Makefile =================================================================== --- multimedia/ustreamer/Makefile +++ multimedia/ustreamer/Makefile @@ -3,6 +3,7 @@ PORTNAME= ustreamer DISTVERSIONPREFIX= v DISTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= multimedia net MAINTAINER= yuri@FreeBSD.org @@ -13,7 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libevent.so:devel/libevent \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= compiler:c11 gmake jpeg localbase:ldflags USE_GITHUB= yes Index: net-im/profanity/Makefile =================================================================== --- net-im/profanity/Makefile +++ net-im/profanity/Makefile @@ -2,7 +2,7 @@ PORTNAME= profanity PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= arved@FreeBSD.org @@ -15,7 +15,7 @@ LIB_DEPENDS= libmesode.so:net-im/libmesode \ libcurl.so:ftp/curl \ libotr.so.5: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 \ Index: net-im/telepathy-gabble/Makefile =================================================================== --- net-im/telepathy-gabble/Makefile +++ net-im/telepathy-gabble/Makefile @@ -3,7 +3,7 @@ PORTNAME= telepathy-gabble PORTVERSION= 0.18.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ @@ -21,7 +21,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 Index: net-mgmt/ccnet-server/Makefile =================================================================== --- net-mgmt/ccnet-server/Makefile +++ net-mgmt/ccnet-server/Makefile @@ -4,6 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= ${SEAFILE_VER} DISTVERSIONSUFFIX= -server +PORTREVISION= 1 CATEGORIES= net-mgmt devel MAINTAINER= ultima@FreeBSD.org @@ -16,7 +17,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libsqlite3.so:databases/sqlite3 \ libzdb.so:databases/libzdb \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libevent.so:devel/libevent \ libjansson.so:devel/jansson Index: net-mgmt/netdata/Makefile =================================================================== --- net-mgmt/netdata/Makefile +++ net-mgmt/netdata/Makefile @@ -4,6 +4,7 @@ PORTNAME= netdata PORTVERSION= 1.19.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= mmokhi@FreeBSD.org @@ -11,7 +12,7 @@ LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid RUN_DEPENDS= bash:shells/bash \ curl:ftp/curl Index: net-mgmt/seafile-client/Makefile =================================================================== --- net-mgmt/seafile-client/Makefile +++ net-mgmt/seafile-client/Makefile @@ -3,6 +3,7 @@ PORTNAME= seafile-client DISTVERSIONPREFIX= v DISTVERSION= 7.0.4 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org @@ -16,7 +17,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 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ Index: net-mgmt/seafile-gui/Makefile =================================================================== --- net-mgmt/seafile-gui/Makefile +++ net-mgmt/seafile-gui/Makefile @@ -3,6 +3,7 @@ PORTNAME= seafile-gui DISTVERSIONPREFIX= v DISTVERSION= 7.0.4 +PORTREVISION= 1 CATEGORIES= net-mgmt devel MAINTAINER= ultima@FreeBSD.org @@ -16,7 +17,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 \ Index: net-mgmt/seafile-server/Makefile =================================================================== --- net-mgmt/seafile-server/Makefile +++ net-mgmt/seafile-server/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= ${SEAFILE_VER} DISTVERSIONSUFFIX= -server -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org @@ -21,7 +21,7 @@ libinotify.so:devel/libinotify \ libccnet.so:net-mgmt/ccnet-server \ libevent.so:devel/libevent \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libjansson.so:devel/jansson \ libonig.so:devel/oniguruma RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ Index: net-p2p/libbt/Makefile =================================================================== --- net-p2p/libbt/Makefile +++ net-p2p/libbt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libbt DISTVERSION= 1.06 +PORTREVISION= 1 CATEGORIES= net-p2p devel MASTER_SITES= SF @@ -13,7 +14,7 @@ LICENSE_COMB= multi LIB_DEPENDS= libcurl.so:ftp/curl \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= gmake localbase ssl GNU_CONFIGURE= yes Index: net/asterisk13/Makefile =================================================================== --- net/asterisk13/Makefile +++ net/asterisk13/Makefile @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.30.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 ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 Index: net/asterisk16/Makefile =================================================================== --- net/asterisk16/Makefile +++ net/asterisk16/Makefile @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 16.7.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 ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 Index: net/czmq4/Makefile =================================================================== --- net/czmq4/Makefile +++ net/czmq4/Makefile @@ -3,6 +3,7 @@ PORTNAME= czmq DISTVERSIONPREFIX= v DISTVERSION= 4.1.1 +PORTREVISION= 1 CATEGORIES= net PKGNAMESUFFIX= 4 @@ -31,7 +32,7 @@ CONFLICTS_INSTALL= czmq-3.* # uuid_CFLAGS and uuid_LIBS required -# to avoid conflicts with misc/e2fsprogs-libuuid +# to avoid conflicts with misc/libuuid CONFIGURE_ARGS= uuid_CFLAGS="-I/usr/include ${CFLAGS}" \ uuid_LIBS="-lc" \ --with-libzmq=${LOCALBASE} \ Index: net/gupnp/Makefile =================================================================== --- net/gupnp/Makefile +++ net/gupnp/Makefile @@ -3,7 +3,7 @@ PORTNAME= gupnp PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= GNOME @@ -19,7 +19,7 @@ libsoup>=2.48.0:devel/libsoup LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \ libsoup-2.4.so:devel/libsoup \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid OPTIONS_DEFINE= VAPI OPTIONS_SUB= yes Index: net/mosquitto/Makefile =================================================================== --- net/mosquitto/Makefile +++ net/mosquitto/Makefile @@ -3,6 +3,7 @@ PORTNAME= mosquitto PORTVERSION= 1.6.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://mosquitto.org/files/source/ @@ -11,7 +12,7 @@ LICENSE= EPL -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake ssl Index: net/p5-ZeroMQ/Makefile =================================================================== --- net/p5-ZeroMQ/Makefile +++ net/p5-ZeroMQ/Makefile @@ -2,6 +2,7 @@ PORTNAME= ZeroMQ PORTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DMAKI @@ -16,7 +17,7 @@ BUILD_DEPENDS= p5-Task-Weaken>=0:devel/p5-Task-Weaken RUN_DEPENDS= p5-Task-Weaken>=0:devel/p5-Task-Weaken LIB_DEPENDS= libzmq.so:net/libzmq2 \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal \ p5-Test-Requires>=0.05:devel/p5-Test-Requires \ p5-Test-TCP>=1.08:devel/p5-Test-TCP \ Index: net/pacemaker1/Makefile =================================================================== --- net/pacemaker1/Makefile +++ net/pacemaker1/Makefile @@ -3,7 +3,7 @@ # $FreeBSD$ PORTVERSION= 1.1.19 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 1 .include "${.CURDIR}/Makefile.common" Index: science/cdo/Makefile =================================================================== --- science/cdo/Makefile +++ science/cdo/Makefile @@ -3,7 +3,7 @@ PORTNAME= cdo PORTVERSION= 1.9.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/20826/ \ LOCAL/sunpoet @@ -61,7 +61,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 .include Index: science/qbox/Makefile =================================================================== --- science/qbox/Makefile +++ science/qbox/Makefile @@ -3,6 +3,7 @@ PORTNAME= qbox DISTVERSIONPREFIX= rel DISTVERSION= 1_68_1 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -17,7 +18,7 @@ liblapack.so:math/lapack \ libmpich.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 Index: security/openvas8-libraries/Makefile =================================================================== --- security/openvas8-libraries/Makefile +++ security/openvas8-libraries/Makefile @@ -3,6 +3,7 @@ PORTNAME?= openvas8-libraries PORTVERSION?= 8.0.9 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES?= http://wald.intevation.org/frs/download.php/2433/ DISTNAME?= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION} @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.GPLv2 LIB_DEPENDS= libhiredis.so:databases/hiredis \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libnetsnmp.so:net-mgmt/net-snmp \ libgnutls.so:security/gnutls \ libgpgme.so:security/gpgme \ Index: security/razorback-api/Makefile =================================================================== --- security/razorback-api/Makefile +++ security/razorback-api/Makefile @@ -2,7 +2,7 @@ PORTNAME= api PORTVERSION= 0.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MASTER_SITES= SF/razorbacktm/API PKGNAMEPREFIX= razorback- @@ -16,7 +16,7 @@ LIB_DEPENDS= libconfig.so:devel/libconfig \ libssh.so:security/libssh \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libcurl.so:ftp/curl \ libjson-c.so:devel/json-c Index: sysutils/cluster-glue/Makefile =================================================================== --- sysutils/cluster-glue/Makefile +++ sysutils/cluster-glue/Makefile @@ -2,7 +2,7 @@ PORTNAME= cluster-glue PORTVERSION= 1.0.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://hg.linux-ha.org/glue/archive/ DISTNAME= 0a7add1d9996 @@ -17,7 +17,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 \ Index: sysutils/e2fsprogs/Makefile =================================================================== --- sysutils/e2fsprogs/Makefile +++ sysutils/e2fsprogs/Makefile @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.45.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -31,9 +31,9 @@ LLD_UNSAFE= yes CONFIGURE_ARGS?=--disable-fsck \ --disable-e2initrd-helper \ - --disable-libuuid \ --disable-uuidd \ - --enable-libblkid \ + --disable-libuuid \ + --disable-libblkid \ --enable-elf-shlibs \ --libdir='${PREFIX}/lib/e2fsprogs/' \ --includedir='${PREFIX}/include/e2fsprogs/' \ @@ -69,9 +69,9 @@ BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash -LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid +LIB_DEPENDS+= libblkid.so:misc/libblkid LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss -LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS+= libuuid.so:misc/libuuid PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES .endif @@ -279,7 +279,7 @@ # remove or relocate files installed by other ports already, or shadowing system files: cd ${STAGEDIR}${PREFIX} && \ ${XARGS} <${FILESDIR}/unwanted ${RM} && \ - ${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss + ${RMDIR} include/e2fsprogs/ss share/ss ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ Index: sysutils/e2fsprogs/files/unwanted =================================================================== --- sysutils/e2fsprogs/files/unwanted +++ sysutils/e2fsprogs/files/unwanted @@ -1,21 +1,13 @@ bin/mk_cmds -include/e2fsprogs/blkid/blkid.h -include/e2fsprogs/blkid/blkid_types.h include/e2fsprogs/ss/ss.h include/e2fsprogs/ss/ss_err.h -lib/e2fsprogs/libblkid.a -lib/e2fsprogs/libblkid.so -lib/e2fsprogs/libblkid.so.1 -lib/e2fsprogs/libblkid.so.1.0 lib/e2fsprogs/libcom_err.a lib/e2fsprogs/libss.a lib/e2fsprogs/libss.so lib/e2fsprogs/libss.so.2 lib/e2fsprogs/libss.so.2.0 -libdata/pkgconfig/blkid.pc libdata/pkgconfig/ss.pc man/man1/mk_cmds.1 man/man3/com_err.3 -man/man3/libblkid.3 share/ss/ct_c.awk share/ss/ct_c.sed Index: sysutils/e2fsprogs/pkg-plist =================================================================== --- sysutils/e2fsprogs/pkg-plist +++ sysutils/e2fsprogs/pkg-plist @@ -58,13 +58,10 @@ man/man8/mkfs.ext2.8.gz man/man8/mkfs.ext3.8.gz man/man8/mkfs.ext4.8.gz -man/man8/findfs.8.gz -man/man8/blkid.8.gz man/man8/logsave.8.gz man/man8/fsck_ext2fs.8.gz man/man8/e2freefrag.8.gz sbin/badblocks -sbin/blkid sbin/debugfs sbin/dumpe2fs sbin/e2freefrag @@ -73,7 +70,6 @@ sbin/e2label sbin/e2mmpstatus sbin/e2undo -sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 Index: sysutils/fusefs-httpdirfs/Makefile =================================================================== --- sysutils/fusefs-httpdirfs/Makefile +++ sysutils/fusefs-httpdirfs/Makefile @@ -2,6 +2,7 @@ PORTNAME= httpdirfs DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- @@ -16,7 +17,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 gmake localbase pkgconfig ssl USE_CSTD= c99 Index: sysutils/fusefs-ntfs/Makefile =================================================================== --- sysutils/fusefs-ntfs/Makefile +++ sysutils/fusefs-ntfs/Makefile @@ -3,6 +3,7 @@ PORTNAME= ntfs PORTVERSION= 2017.3.23 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://tuxera.com/opensource/ PKGNAMEPREFIX= fusefs- @@ -14,7 +15,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid CONFLICTS_BUILD= bonobo-1.* CONFLICTS_INSTALL= ntfsprogs-* Index: sysutils/gdisk/Makefile =================================================================== --- sysutils/gdisk/Makefile +++ sysutils/gdisk/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdisk PORTVERSION= 1.0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION} DISTNAME= gptfdisk-${PORTVERSION} @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libpopt.so:devel/popt \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= localbase:ldflags Index: sysutils/heartbeat/Makefile =================================================================== --- sysutils/heartbeat/Makefile +++ sysutils/heartbeat/Makefile @@ -3,7 +3,7 @@ PORTNAME= heartbeat PORTVERSION= 2.1.4 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= LOCAL/kuriyama/heartbeat @@ -19,7 +19,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libgnutls.so:security/gnutls \ libnet.so:net/libnet \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= bison:devel/bison Index: sysutils/ltfs/Makefile =================================================================== --- sysutils/ltfs/Makefile +++ sysutils/ltfs/Makefile @@ -5,7 +5,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 2.4.1.2 DISTVERSIONSUFFIX= -10254 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= kbowling@FreeBSD.org @@ -17,7 +17,7 @@ LIB_DEPENDS= libicudata.so:devel/icu \ libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:ports-mgmt/pkg \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf fuse gnome libtool:build pkgconfig ssl Index: sysutils/passwordsafe/Makefile =================================================================== --- sysutils/passwordsafe/Makefile +++ sysutils/passwordsafe/Makefile @@ -2,7 +2,7 @@ PORTNAME= passwordsafe DISTVERSION= 1.03BETA -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= brnrd@FreeBSD.org @@ -13,7 +13,7 @@ NOT_FOR_ARCHS= aarch64 armv6 armv7 NOT_FOR_ARCHS_REASON= Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ +LIB_DEPENDS= libuuid.so:misc/libuuid \ libxerces-c.so:textproc/xerces-c3 \ libqrencode.so:graphics/libqrencode BUILD_DEPENDS= zip:archivers/zip Index: sysutils/pesign/Makefile =================================================================== --- sysutils/pesign/Makefile +++ sysutils/pesign/Makefile @@ -3,7 +3,7 @@ PORTNAME= pesign PORTVERSION= 0.110 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -18,7 +18,7 @@ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libpopt.so:devel/popt \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USE_GCC= yes USE_GITHUB= yes Index: sysutils/rsyslog8/Makefile =================================================================== --- sysutils/rsyslog8/Makefile +++ sysutils/rsyslog8/Makefile @@ -2,6 +2,7 @@ PORTNAME= rsyslog PORTVERSION= 8.2001.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -14,7 +15,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} Index: sysutils/syslog-ng320/Makefile =================================================================== --- sysutils/syslog-ng320/Makefile +++ sysutils/syslog-ng320/Makefile @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.20.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-10-09 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/syslog-ng321/Makefile =================================================================== --- sysutils/syslog-ng321/Makefile +++ sysutils/syslog-ng321/Makefile @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.21.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-10-09 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/syslog-ng322/Makefile =================================================================== --- sysutils/syslog-ng322/Makefile +++ sysutils/syslog-ng322/Makefile @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.22.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-10-09 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/syslog-ng323/Makefile =================================================================== --- sysutils/syslog-ng323/Makefile +++ sysutils/syslog-ng323/Makefile @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.23.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -18,7 +19,7 @@ EXPIRATION_DATE= 2020-10-09 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/syslog-ng324/Makefile =================================================================== --- sysutils/syslog-ng324/Makefile +++ sysutils/syslog-ng324/Makefile @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.24.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -18,7 +19,7 @@ EXPIRATION_DATE= 2020-12-12 LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/syslog-ng325/Makefile =================================================================== --- sysutils/syslog-ng325/Makefile +++ sysutils/syslog-ng325/Makefile @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.25.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ .if !defined(MASTERDIR) @@ -15,7 +16,7 @@ BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) LIB_DEPENDS= libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid USES= autoreconf:build compiler:c11 gettext-runtime gmake gnome \ libtool pathfix pkgconfig python:3.5+,build shebangfix ssl Index: sysutils/tracker/Makefile =================================================================== --- sysutils/tracker/Makefile +++ sysutils/tracker/Makefile @@ -3,7 +3,7 @@ PORTNAME= tracker PORTVERSION= 2.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= GNOME @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LGPL BUILD_DEPENDS= valac:lang/vala -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ +LIB_DEPENDS= libuuid.so:misc/libuuid \ libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libicutu.so:devel/icu Index: textproc/zorba/Makefile =================================================================== --- textproc/zorba/Makefile +++ textproc/zorba/Makefile @@ -3,7 +3,7 @@ PORTNAME= zorba PORTVERSION= 2.7.0 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= textproc java MASTER_SITES= https://launchpadlibrarian.net/119058962/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -18,7 +18,7 @@ libicudata.so:devel/icu \ libcurl.so:ftp/curl \ libtidy.so:www/tidy-lib \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/libuuid RUN_DEPENDS= fop:textproc/fop WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: www/blastbeat/Makefile =================================================================== --- www/blastbeat/Makefile +++ www/blastbeat/Makefile @@ -3,7 +3,7 @@ PORTNAME= blastbeat PORTVERSION= 20121205 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= ports@FreeBSD.org @@ -15,7 +15,7 @@ LICENSE_PERMS= auto-accept LIB_DEPENDS= libev.so:devel/libev \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libzmq.so:net/libzmq2 USES= gmake ssl Index: www/davix/Makefile =================================================================== --- www/davix/Makefile +++ www/davix/Makefile @@ -2,6 +2,7 @@ PORTNAME= davix DISTVERSION= 0.7.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PORTNAME}/${DISTVERSION}/ @@ -11,7 +12,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libuuid.so:misc/libuuid USES= cmake compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl SHEBANG_GLOB= *.py Index: www/libepc/Makefile =================================================================== --- www/libepc/Makefile +++ www/libepc/Makefile @@ -3,6 +3,7 @@ PORTNAME= libepc PORTVERSION= 0.4.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= GNOME @@ -12,7 +13,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 \ Index: www/lighttpd/Makefile =================================================================== --- www/lighttpd/Makefile +++ www/lighttpd/Makefile @@ -3,6 +3,7 @@ PORTNAME?= lighttpd PORTVERSION= 1.4.54 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= https://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -90,7 +91,7 @@ VALGRIND_CONFIGURE_WITH=valgrind WEBDAV_USES= gnome WEBDAV_USE= GNOME=libxml2 -WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ +WEBDAV_LIB_DEPENDS= libuuid.so:misc/libuuid \ libsqlite3.so:databases/sqlite3 WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks Index: x11/gnome-terminal/Makefile =================================================================== --- x11/gnome-terminal/Makefile +++ x11/gnome-terminal/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-terminal PORTVERSION= 3.28.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -17,7 +17,7 @@ BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ itstool:textproc/itstool \ vala:lang/vala -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ +LIB_DEPENDS= libuuid.so:misc/libuuid \ libgnutls.so:security/gnutls \ libfribidi.so:converters/fribidi \ libpcre2-8.so:devel/pcre2