diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index c10faa37ecfe..d5ced291fb03 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	gnome-photos
 DISTVERSION=	43.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photo application for GNOME
 WWW=		https://wiki.gnome.org/Design/Apps/Photos
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	DOCS
 
 BUILD_DEPENDS=	geoclue>=0:net/geoclue \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 		libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libexempi.so:textproc/exempi \
 		libexiv2.so:graphics/exiv2 \
 		libfribidi.so:converters/fribidi \
 		libgdata.so:devel/libgdata \
 		libgegl-0.4.so:graphics/gegl \
 		libgeocode-glib-2.so:net/geocode-glib2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libgfbgraph-0.2.so:net/gfbgraph \
 		libgjs.so:lang/gjs \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgrilo-0.3.so:net/grilo \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libjson-glib-1.0.so:devel/json-glib \
 		libpng.so:graphics/png \
 		libportal.so:deskutils/libportal \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		librest-0.7.so:devel/librest \
 		libsoup-2.4.so:devel/libsoup \
 		libtracker-sparql-3.0.so:sysutils/tracker3
 RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome jpeg localbase meson pkgconfig \
 		tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3 gtk30 libxml2
 USE_LDCONFIG=	yes
 
 GLIB_SCHEMAS=	org.gnome.photos.gschema.xml
 MESON_ARGS=	--buildtype \
 		plain
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,'babl','babl-0.1'," \
 		${WRKSRC}/meson.build
 .include <bsd.port.mk>
diff --git a/devel/kf5-kfilemetadata/Makefile b/devel/kf5-kfilemetadata/Makefile
index a18bce1852cb..0a48ef2c7c9a 100644
--- a/devel/kf5-kfilemetadata/Makefile
+++ b/devel/kf5-kfilemetadata/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	kfilemetadata
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library for extracting file metadata
 
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 		libepub.so:textproc/ebook-tools \
 		libexiv2.so:graphics/exiv2 \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libtag.so:audio/taglib
 # TODO: maybe depend on textproc/catdoc
 
 USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig \
 		qt:5 tar:xz
 USE_KDE=	archive config coreaddons i18n \
 		ecm:build
 USE_QT=		core gui xml \
 		buildtools:build qmake:build
 
 .include <bsd.port.mk>
diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile
index 00a292f1f4e4..83169d84ac14 100644
--- a/devel/kio-extras/Makefile
+++ b/devel/kio-extras/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	kio-extras
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 library to increase the functionality of KIO
 WWW=		https://projects.kde.org/projects/kde/workspace/kio-extras
 
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libImath.so:math/Imath \
 		libkdsoap.so:www/kdsoap
 
 USES=		cmake compiler:c++11-lib gettext gperf kde:5 \
 		pkgconfig qt:5 shared-mime-info shebangfix tar:xz xorg
 USE_KDE=	activities archive auth bookmarks codecs completion config \
 		configwidgets coreaddons crash dbusaddons dnssd doctools \
 		emoticons guiaddons i18n iconthemes init itemmodels itemviews \
 		jobwidgets js kdelibs4support khtml kio notifications parts \
 		pty service solid sonnet syntaxhighlighting textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui \
 		ecm:build
 USE_QT=		concurrent core dbus declarative gui location network phonon4 printsupport \
 		sql svg testlib webchannel widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11 xcursor
 SHEBANG_FILES=	info/kde-info2html
 
 # CVE-2018-19120
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidget
 
 OPTIONS_DEFINE=	SAMBA AFC MTP EXR EXIV SLP SSH TAGLIB DOCS
 OPTIONS_DEFAULT=	SAMBA AFC MTP EXR EXIV SLP SSH TAGLIB
 OPTIONS_SUB=	yes
 
 SAMBA_DESC=		Needed to build the SMB kioslave
 SAMBA_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Samba
 SAMBA_USES=		samba:lib
 
 AFC_DESC=		Needed to build AFC (Apple File Conduit) kioslave
 AFC_LIB_DEPENDS=	libimobiledevice-1.0.so:comms/libimobiledevice \
 			libplist-2.0.so:devel/libplist
 AFC_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_IMobileDevice \
 			CMAKE_DISABLE_FIND_PACKAGE_PList
 
 MTP_DESC=		Needed to build the MTP kioslave
 MTP_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Mtp
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 
 EXR_DESC=		Provides support for OpenEXR formatted images in the thumbnail kioslave
 EXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 EXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 EXIV_DESC=		Provides support for automatic rotation of JPEGs in the thumbnail kioslave
 EXIV_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Exiv2
 EXIV_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 SLP_DESC=		Provides SLP support in the network:/ kioslave
 SLP_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_SLP
 SLP_LIB_DEPENDS=	libslp.so:net/openslp
 
 SSH_DESC=		Needed to build the SFTP kioslave
 SSH_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_LibSSH
 SSH_LIB_DEPENDS=	libssh.so:security/libssh
 
 # Our taglib is too old
 TAGLIB_DESC=		Needed to build the audio thumbnail kioslave
 TAGLIB_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Taglib
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 
 .include <bsd.port.mk>
diff --git a/graphics/art/Makefile b/graphics/art/Makefile
index e5a4e4ba8517..2b81e8efc2cd 100644
--- a/graphics/art/Makefile
+++ b/graphics/art/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	art
 DISTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://bitbucket.org/agriggio/art/downloads/
 PKGNAMESUFFIX=	-raw-image-editor
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Raw image processing program
 WWW=		https://bitbucket.org/agriggio/art/wiki/Home
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_armv7=	compilation fails: use of overloaded operator '[]' is ambiguous, see https://bitbucket.org/agriggio/art/issues/256/build-fails-on-32-bit-architectures-use-of
 BROKEN_i386=	ld: error: undefined symbol: __atomic_load
 
 EXTRACT_DEPENDS=	gtar:archivers/gtar # bsdtar(1) complains about hard links to itself
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libraw_r.so:graphics/libraw \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfftw3f.so:math/fftw3-float \
 		libharfbuzz.so:print/harfbuzz \
 		liblensfun.so:graphics/lensfun \
 		liblcms2.so:graphics/lcms2 \
 		libmimalloc.so:devel/mimalloc \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gnome jpeg pkgconfig tar:xz xorg
 USE_GNOME=	atk atkmm cairo cairomm glibmm gtkmm30 librsvg2
 USE_XORG=	x11
 
 EXTRACT_CMD=	gtar
 
 LDFLAGS+=	-lpthread # otherwise build breaks on some systems: error: undefined symbol: pthread_create
 
 OPTIONS_DEFINE=		LTO
 OPTIONS_DEFAULT=	LTO
 
 LTO_CMAKE_BOOL=		WITH_LTO
 
 .if exists(/usr/include/omp.h)
 OPTIONS_DEFINE+=	OPENMP
 OPTIONS_DEFAULT+=	OPENMP
 
 OPENMP_CMAKE_BOOL=	OPTION_OMP
 .else
 CMAKE_OFF=	OPTION_OMP
 .endif
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ART
 
 .include <bsd.port.mk>
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 8e73d15c2c93..8a75613ce5b7 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	gwenview
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Image viewer and browser for KDE
 WWW=		http://gwenview.sourceforge.net
 
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		docbook-xml>0:textproc/docbook-xml \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libkImageAnnotator.so:graphics/kimageannotator
 RUN_DEPENDS=	kipi-plugins>=0:graphics/kipi-plugins
 
 USES=		compiler:c++11-lang cmake desktop-file-utils gettext jpeg pkgconfig \
 		kde:5 qt:5 tar:xz xorg
 USE_KDE=	activities auth baloo bookmarks codecs completion config \
 		configwidgets coreaddons emoticons filemetadata guiaddons i18n \
 		iconthemes init itemmodels itemviews jobwidgets \
 		kdelibs4support kimageformats kio libkdcraw libkipi \
 		notifications parts service solid sonnet textwidgets \
 		widgetsaddons windowsystem xmlgui \
 		ecm:build
 USE_QT=		concurrent core dbus gui network opengl phonon4 printsupport \
 		svg widgets x11extras xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 9a9ff7756408..29347ec6244b 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	libkexiv2
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Exiv2 library interface for KDE
 WWW=		https://www.digikam.org/
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USES=		cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	ecm
 USE_QT=		core gui \
 		buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/phototonic/Makefile b/graphics/phototonic/Makefile
index 13ca2a2cf327..0f1304f4565e 100644
--- a/graphics/phototonic/Makefile
+++ b/graphics/phototonic/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	phototonic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1-136
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g12552ec
 CATEGORIES=	graphics
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Image viewer and organizer
 WWW=		http://oferkv.github.io/phototonic/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	oferkv
 USE_GL=		gl
 USE_QT=		core gui imageformats svg widgets buildtools:build
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/phototonic.pro
 
 .include <bsd.port.mk>
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 58ac02c0f711..68d8b36339ff 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	shotwell
 PORTVERSION=	0.30.18
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/shotwell/-/commit/
 PATCHFILES=	cd82759231e5ece2fa0dea40397c9051d15fd5c2.diff:-p1
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
 WWW=		https://wiki.gnome.org/Apps/Shotwell
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libportal.so:deskutils/libportal \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		libgio-2.0.so:devel/glib20 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libgdata.so:devel/libgdata \
 		libgee-0.8.so:devel/libgee \
 		libsoup-2.4.so:devel/libsoup \
 		libexiv2.so:graphics/exiv2 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
 		libraw.so:graphics/libraw \
 		libgcr-ui-3.so:security/gcr \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libxml2.so:textproc/libxml2
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \
 		ninja pkgconfig python:build shebangfix sqlite tar:xz vala:build xorg
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo dconf gtk30
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 SHEBANG_FILES=	build-aux/meson/postinstall.py
 python_OLD_CMD=	"/usr/bin/env python3"
 python_CMD=	${SETENV} ${PYTHON_VERSION}
 
 MESON_ARGS=	-Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \
 		-Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FACED
 OPTIONS_SUB=	yes
 
 FACED_DESC=	Face Detection
 
 FACED_CONFIGURE_ON=	-Dface-detection=true
 FACED_CONFIGURE_OFF=	-Dface-detection=false
 FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
 			libopencv_photo.so:graphics/opencv
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 59c17d01a6e2..fa99a4f6814f 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net multimedia
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Media server compatible with DLNA and UPnP
 WWW=		https://gerbera.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog \
 		libpugixml.so:textproc/pugixml \
 		libinotify.so:devel/libinotify
 
 USES=		cmake compiler:c++17-lang iconv localbase:ldflags \
 		pkgconfig sqlite
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	gerbera
 
 CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
 
 SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 USERS=		gerbera
 GROUPS=		gerbera
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			LIBMAGIC MATROSKA TAGLIB TEST
 OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG LIBMAGIC TAGLIB LIBNPUPNP
 
 OPTIONS_SINGLE=		UPNPLIB
 OPTIONS_SINGLE_UPNPLIB=	LIBNPUPNP LIBUPNP
 
 CURL_DESC=		Support for online services via cURL
 DUKTAPE_DESC=		Javascript support for custom import scripts
 FFMPEGTHUMBNAILER_DESC=	Support for thumbnail generation
 LIBMAGIC_DESC=		Identify file mime types via libmagic
 LIBNPUPNP_DESC=		Use high performance libnpupnp library
 LIBUPNP_DESC=		Use libupnp library
 MATROSKA_DESC=		Extract video/mkv metadata via libmatroska
 TAGLIB_DESC=		Extract audio file metadata via taglib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	WITH_CURL
 
 DEBUG_CMAKE_BOOL=	WITH_DEBUG
 
 DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
 DUKTAPE_CMAKE_BOOL=	WITH_JS
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CMAKE_BOOL=	WITH_EXIV2
 
 FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
 
 LIBMAGIC_LIB_DEPENDS=	libmagic.so:sysutils/file
 LIBMAGIC_CMAKE_BOOL=	WITH_MAGIC
 
 LIBNPUPNP_LIB_DEPENDS=	libnpupnp.so:net/libnpupnp
 LIBNPUPNP_CMAKE_BOOL=	WITH_NPUPNP
 
 LIBUPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
 MATROSKA_CMAKE_BOOL=	WITH_MATROSKA
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
 TEST_IMPLIES=		CURL DUKTAPE
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_CMAKE_BOOL=	WITH_TESTS
 TEST_TEST_TARGET=	test
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
 	@${MKDIR} ${STAGEDIR}/var/db/gerbera
 	@${MKDIR} ${STAGEDIR}/var/log/gerbera
 	@${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample
 
 .include <bsd.port.mk>
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 7645f06f5cb8..9208a7331949 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	libextractor
 PORTVERSION=	1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for keyword extraction
 WWW=		https://www.gnu.org/software/libextractor/
 
 BROKEN=		does not compile with exiv2 0.28
 DEPRECATED=	does not compile with exiv2 0.28, and no ports tree users
 EXPIRATION_DATE=2023-09-30
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	tidy-html5>0:www/tidy-html5
 LIB_DEPENDS=	libltdl.so:devel/libltdl libogg.so:audio/libogg \
 		libtiff.so:graphics/tiff
 
 USES=		cpe gnome iconv jpeg libarchive libtool \
 		makeinfo pathfix pkgconfig python
 CPE_VENDOR=	gnu
 
 USE_GNOME=	gtk20 gdkpixbuf2
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	csound outguess # bin/extract
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ffmpeg \
 		--with-gtk-version=2 \
 		--with-ltdl=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	$$(pkg-config --cflags gtk+-2.0) \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 INFO=		libextractor
 
 OPTIONS_DEFINE=		EXIV2 FLAC GIF GSF GSTREAMER MPEG2 MP4 \
 			NLS RPM SMF TIDY VORBIS
 
 OPTIONS_DEFAULT=	EXIV2 FLAC GIF GSF GSTREAMER MPEG2 MP4 \
 			RPM SMF TIDY VORBIS
 
 OPTIONS_SUB=		yes
 
 GSF_DESC=		GSF (OLE2 (MS office) support)
 RPM_DESC=		RPM package format support
 SMF_DESC=		Standard MIDI file support via LibSMF
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENV=	EXIV2_H="<exiv2/image.hpp>"
 EXIV2_CONFIGURE_ENV_OFF=	EXIV2_H=""
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENV_OFF=ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_ENV_OFF=	ac_cv_lib_gif_DGifOpen=no
 GSF_USE=		gnome=libgsf
 GSF_CONFIGURE_ENV_OFF=	ac_cv_lib_gsf_1_gsf_init=no
 GSTREAMER_USES=		gstreamer
 GSTREAMER_CONFIGURE_WITH=	gstreamer
 MP4_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MP4_CONFIGURE_ENV_OFF=	ac_cv_lib_mp4v2_MP4ReadProvider=no
 MPEG2_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENV_OFF=	ac_cv_lib_mpeg2_mpeg2_init=no
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 RPM_LIB_DEPENDS=	librpm.so:archivers/rpm4
 RPM_CONFIGURE_ENV=	ac_cv_lib_rpm_rpmReadPackageFile=yes
 RPM_CONFIGURE_ENV_OFF=	ac_cv_lib_rpm_rpmReadPackageFile=no
 SMF_LIB_DEPENDS=	libsmf.so:audio/libsmf
 SMF_CONFIGURE_ENV_OFF=	ac_cv_lib_smf_smf_load_from_memory=no
 TIDY_LIB_DEPENDS=	libtidy.so:www/tidy-lib
 TIDY_CONFIGURE_ENV=	TIDY_H="<tidy/tidy.h>"
 TIDY_CONFIGURE_ENV_OFF=	TIDY_H=""
 VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_ENV_OFF=	ac_cv_lib_vorbisfile_ov_open_callbacks=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-lstdc++|| ; \
 		 s|-lc_r|-pthread| ; \
 		 s|<exiv2/image.hpp>|$${EXIV2_H}| ; \
 		 s|<tidy/tidy.h>|$${TIDY_H}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|tidy/tidybuffio\.h|tidybuffio.h|' \
 		${WRKSRC}/src/plugins/html_extractor.c
 
 .include <bsd.port.mk>