diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index a3f197482e92..1a213c033576 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -1,146 +1,147 @@
 PORTNAME=	speech-dispatcher
 DISTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES?=	accessibility audio
 MASTER_SITES=	https://github.com/brailcom/speechd/releases/download/${PORTVERSION}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Common interface to speech synthesis
 WWW=		https://devel.freebsoft.org/speechd
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libdotconf.so:devel/dotconf \
 		libsndfile.so:audio/libsndfile
 
 USES=		gettext gmake gnome libtool localbase makeinfo \
 		pkgconfig
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ltdl \
 		--with-espeak-ng=no \
 		--with-baratinoo=no \
 		--with-kali=no \
 		--with-ibmtts=no \
 		--with-oss \
 		--with-voxin=no \
 		--without-systemdsystemunitdir
 INSTALL_TARGET=	install-strip
 
 .if !defined(_SD_PYTHON)
 
 CONFIGURE_ARGS+=--disable-python
 TEST_TARGET=	check
 TEST_WRKSRC=	${WRKSRC}/src/tests
 
 INFO=		spd-say speech-dispatcher speech-dispatcher-cs ssip
 PORTDOCS=	ANNOUNCE AUTHORS FAQ NEWS README* TODO
 
 OPTIONS_DEFINE=		ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PIPEWIRE \
 			PULSEAUDIO
 OPTIONS_DEFAULT=	ESPEAK PULSEAUDIO
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=	alsa
 
 AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CONFIGURE_WITH=	libao
 
 ESPEAK_LIB_DEPENDS=	libespeak-ng.so:audio/espeak-ng
 ESPEAK_CONFIGURE_WITH=	espeak
 
 FESTIVAL_DESC=		Festival Speech Synthesis System support
 FESTIVAL_RUN_DEPENDS=	${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:audio/festival-freebsoft-utils \
 			festival:audio/festival
 
 FLITE_DESC=		Flite speech synthesis engine support
 FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_WITH=	flite
 
 NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_USES=		xorg
 NAS_USE=		XORG=xau
 NAS_CONFIGURE_WITH=	nas
 
 PIPEWIRE_LIB_DEPENDS=		libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_CONFIGURE_WITH=	pipewire
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulse
 
 _SD_ETCFILES=	clients/emacs.conf \
 		modules/cicero.conf \
 		modules/dtk-generic.conf \
 		modules/epos-generic.conf \
 		modules/espeak-mbrola-generic.conf \
 		modules/espeak-ng-mbrola-generic.conf \
 		modules/espeak-ng-mbrola.conf \
 		modules/espeak-ng.conf \
 		modules/espeak.conf \
 		modules/festival.conf \
 		modules/flite.conf \
 		modules/llia_phon-generic.conf \
 		modules/mary-generic.conf \
 		modules/mimic3-generic.conf \
 		modules/openjtalk.conf \
 		modules/swift-generic.conf \
 		speechd.conf
 
 .  include <bsd.port.options.mk>
 
 post-patch:
 # ibmtts.c is omitted, because it is disabled by default
 .  for f in espeak.c generic.c ivona.c openjtalk.c pico.c
 	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/src/modules/${f}
 .  endfor
 	${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g ; \
 		s|/usr/bin|${LOCALBASE}/bin|g ; \
 		s|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/config/modules/*.conf
 
 post-install:
 .  for f in ${_SD_ETCFILES}
 	@${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .  endfor
 	@${RM} -r ${STAGEDIR}${DATADIR}/conf
 	@${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 # The 'test' target only builds the tests. The speech-dispatcher tests, in
 # whole, are not easily automated. This is only intended to provide a minimal
 # baseline. If you don't hear some robotic voices coming out of your speakers
 # after running the 'test' target, something is definitely wrong.
 post-test:
 	@if [ "`${LOCALBASE}/bin/speech-dispatcher -v | head -1`" != "${PORTNAME} ${DISTVERSION}" ]; then \
 		${ECHO_CMD} "===> Tests require a local installation of ${PKGNAME} to"; \
 		${ECHO_CMD} "     proceed. Try reinstalling ${PKGNAME} and running the"; \
 		${ECHO_CMD} "     'test' target again."; \
 		exit 1; \
 	else \
 		${ECHO_CMD} "===> Testing with locally installed `${LOCALBASE}/bin/speech-dispatcher -v | head -1`" ; \
 		${LOCALBASE}/bin/speech-dispatcher && ${TEST_WRKSRC}/run_test ${TEST_WRKSRC}/basic.test; \
 	fi
 
 .else
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}
 LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}
 
 USES+=		python shebangfix
 USE_PYTHON=	flavors
 
 SHEBANG_FILES=	src/api/python/speechd_config/spd-conf
 
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index f68b5f1ce67a..a5219afc2fe6 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	beets
 DISTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	leonhard@wachutka.eu
 COMMENT=	Media library management system for obsessive-compulsive music geeks
 WWW=		https://beets.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lap>=0:devel/py-lap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mediafile>=0.2.0:devel/py-mediafile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=1.0.0:math/py-munkres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.45:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist optsuffix pep517
 
 NO_ARCH=	yes
 
 PLIST_FILES=	share/man/man1/beet.1.gz \
 		share/man/man5/beetsconfig.5.gz
 
 OPTIONS_DEFINE=		ACOUSTICBRAINZ BADFILES BEATPORT DISCOGS EMBYUPDATE \
 			FETCHART FFMPEG IMAGEMAGICK IPFS KODIUPDATE LASTFM \
 			LASTIMPORT LYRICS LYRICS_GOOGLE METASYNC_DBUS MPDSTATS \
 			PLEXUPDATE REPLAYGAIN SONOS_UPDATE SPOTIFY THUMBNAILS \
 			WEB WEB_CORS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 ACOUSTICBRAINZ_DESC=	AcousticBrainz Plugin
 BADFILES_DESC=		Bad Files Plugin
 BEATPORT_DESC=		Beatport Catalog Autotagging Support
 DISCOGS_DESC=		Discogs Search Plugin
 EMBYUPDATE_DESC=	Emby Update Plugin
 FETCHART_DESC=		Cover Art Fetch Plugin
 IMAGEMAGICK_DESC=	Cover Art Resizing and Comparison
 IPFS_DESC=		IPFS Plugin
 KODIUPDATE_DESC=	Kodi Update Plugin
 LASTFM_DESC=		LastGenre Plugin
 LASTIMPORT_DESC=	Last.fm Import Plugin
 LYRICS_DESC=		Lyrics Plugin
 LYRICS_GOOGLE_DESC=	Use Google Custom Search for Lyrics
 METASYNC_DBUS_DESC=	Amarok support for the MetaSync plugin
 MPDSTATS_DESC=		MPD Statistics Plugin
 PLEXUPDATE_DESC=	PlexUpdate Plugin
 REPLAYGAIN_DESC=	Normalize Audio Loudness
 SONOS_UPDATE_DESC=	Sonos Update Plugin
 SPOTIFY_DESC=		Spotify Plugin
 THUMBNAILS_DESC=	Thumbnails for freedesktop.org-compliant file managers
 WEB_CORS_DESC=		Cross-origin resource sharing for the Web plugin
 WEB_DESC=		Web plugin for querying, browsing and playing music
 
 ACOUSTICBRAINZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 BADFILES_RUN_DEPENDS=		flac:audio/flac \
 				mp3val:audio/mp3val
 BEATPORT_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 DISCOGS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-discogs-client@${PY_FLAVOR}
 EMBYUPDATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 FETCHART_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 FFMPEG_RUN_DEPENDS=		ffmpeg>=2:multimedia/ffmpeg
 IMAGEMAGICK_USES=		magick:run
 IPFS_RUN_DEPENDS=		kubo-go:sysutils/kubo-go
 KODIUPDATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 LASTFM_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR}
 LASTIMPORT_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 LYRICS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 LYRICS_GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
 METASYNC_DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 MPDSTATS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-mpd2>=0.4.2:audio/py-python-mpd2@${PY_FLAVOR}
 PLEXUPDATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 REPLAYGAIN_RUN_DEPENDS=		mp3gain>=0:audio/mp3gain
 # Broken, unfechable	aacgain>=0:audio/aacgain
 SONOS_UPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}soco>=0:multimedia/py-soco@${PY_FLAVOR}
 SPOTIFY_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 THUMBNAILS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR}
 WEB_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}flask>=0:www/py-flask@${PY_FLAVOR}
 WEB_CORS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${PY_FLAVOR}
 
 post-install:
 	${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL} ${WRKSRC}/man/beetsconfig.5 ${STAGEDIR}${PREFIX}/share/man/man5/
 
 .include <bsd.port.mk>
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index 0c0e005d3302..3ea5034f7ebd 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	pithos
 PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Pandora client for the GNOME desktop
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		desktop-file-validate:devel/desktop-file-utils \
 		help2man:misc/help2man
 
 RUN_DEPENDS=	gnome-keyring:security/gnome-keyring \
 		gsettings-desktop-schemas>3.0.0:devel/gsettings-desktop-schemas \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py-pylast@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-pyxdg@${PY_FLAVOR}
 
 USES=	pkgconfig:run python gnome gstreamer meson ninja gettext shebangfix
 
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER=	core good bad soup
 
 GLIB_SCHEMAS=	io.github.Pithos.gschema.xml
 
 SHEBANG_FILES=	bin/pithos.in docs/conf.py meson_post_install.py
 
 post-patch:
 	${REINPLACE_CMD} -i '' -e \
 		"s|\(\([^.]\)pkgdatadir\)|\2'${PYTHONPREFIX_SITELIBDIR}'|g" \
 		${WRKSRC}/meson.build
 	${REINPLACE_CMD} -i '' -e "s|'pithos', ||" \
 		${WRKSRC}/meson_post_install.py
 
 pre-install:
 	${MKDIR} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 544e0cb2a5de..e7566bbe8cd9 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	ibus-pinyin
 PORTVERSION=	1.5.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	chinese
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	PinYin engine for IBus
 WWW=		http://code.google.com/p/ibus
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${LOCALBASE}/share/gir-1.0/IBus-1.0.gir:textproc/ibus
 LIB_DEPENDS=	libpyzy-1.0.so:chinese/pyzy \
 		libibus-1.0.so:textproc/ibus \
 		libsqlite3.so:databases/sqlite3
 
 USES=		autoreconf compiler:c++11-lib gettext gmake gnome libtool \
 		pkgconfig python
 USE_GITHUB=	yes
 GH_ACCOUNT=	ibus
 USE_GNOME=	glib20 intltool
 USE_PYTHON=	py3kplist
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index 0995fb4e2a54..c9885426dde1 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	khal
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	CalDAV-based calendar
 WWW=		https://lostpackets.de/khal/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=63:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}icalendar>=4.0.3:devel/py-icalendar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwid>=2.6.15:devel/py-urwid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		SETPROCTITLE
 
 SETPROCTITLE_DESC=		Set the process title
 SETPROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${PY_FLAVOR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && \
 	${INSTALL_DATA} khal.conf.sample ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 8b94e2e044d4..cb918bad033a 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	zim
 DISTVERSION=	0.76.3
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://www.zim-wiki.org/downloads/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Desktop wiki editor
 WWW=		https://www.zim-wiki.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PY_SETUPTOOLS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		cpe desktop-file-utils gettext gnome python shared-mime-info
 CPE_VENDOR=	zim-wiki
 USE_GNOME=	gtk30 pygobject3
 USE_PYTHON=	autoplist pep517 noflavors
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
 			MERCURIAL SCROT
 
 DITAA_DESC=		Diagram editor support
 DITAA_RUN_DEPENDS=	ditaa:graphics/ditaa
 GIT_DESC=		Version control for notebooks using git
 GIT_RUN_DEPENDS=	git:devel/git
 GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GNUR_DESC=		Support of plot editor based on GNU R
 GNUR_RUN_DEPENDS=	R:math/R
 GRAPHVIZ_RUN_DEPENDS=	fdp:graphics/graphviz
 LATEX_USES=		tex
 LATEX_USE=		TEX=latex:run
 MERCURIAL_DESC=		Version control for notebooks using hg
 MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
 SCROT_DESC=		Screenshot taking and inserting support
 SCROT_RUN_DEPENDS=	scrot:graphics/scrot
 
 .include <bsd.port.mk>
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index df950bea7d15..3ca32a51e6be 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	bpython
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://bpython-interpreter.org/releases/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fancy interface to the Python interpreter
 WWW=		https://bpython-interpreter.org/ \
 		https://docs.bpython-interpreter.org/en/latest/ \
 		https://github.com/bpython/bpython
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=62.4.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curtsies>=0.4.0:devel/py-curtsies@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cwcwidth>=0:devel/py-cwcwidth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/theme/*.theme ${STAGEDIR}${EXAMPLESDIR}/
 
 post-install-NLS-on:
 .for lang in es_ES fr_FR it_IT nl_NL
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/
 .endfor
 .for lang in de es_ES fr_FR it_IT nl_NL
 	${INSTALL_DATA} ${WRKSRC}/bpython/translations/${lang}/LC_MESSAGES/bpython.mo ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile
index 5ba8ad3e626f..37b261b16afe 100644
--- a/devel/py-spyder-kernels/Makefile
+++ b/devel/py-spyder-kernels/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	spyder-kernels
 DISTVERSION=	3.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	spyder_kernels-${DISTVERSION}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Jupyter kernels for the Spyder console
 WWW=		https://github.com/spyder-ide/spyder-kernels
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipykernel>=6.29.3:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipyparallel>0:devel/py-ipyparallel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=8.13.0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=7.4.9:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=24.0.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=5.14.3:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wurlitzer>=1.0.3:misc/py-wurlitzer@${PY_FLAVOR}
 # 'make test' not applicable for now because the test files are missing in the tarball
 # 100 passed, 7 skipped, 4 warnings
 # 1 failure may occur, see https://github.com/spyder-ide/spyder-kernels/issues/501
 # test_django_settings fail if www/djangoXX not installed
 #TEST_DEPENDS=	${PYNUMPY} \
 #		${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}distributed>0:devel/py-distributed@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pydicom>0:science/py-pydicom@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pytest-forked>0:devel/py-pytest-forked@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}xarray>0:devel/py-xarray@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils #pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-wlc/Makefile b/devel/py-wlc/Makefile
index 7a8255fe3e79..c2a79685397a 100644
--- a/devel/py-wlc/Makefile
+++ b/devel/py-wlc/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	wlc
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Command line utility for Weblate
 WWW=		https://pypi.org/project/wlc/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.0:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/setzer/Makefile b/editors/setzer/Makefile
index c6e352657e30..fb1320548388 100644
--- a/editors/setzer/Makefile
+++ b/editors/setzer/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	setzer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	66
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	LaTeX editor written in Python with Gtk
 WWW=		https://www.cvfosammmm.org/setzer/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libadwaita-1.so:x11-toolkits/libadwaita \
 		libgspell-1.so:textproc/gspell \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libportal.so:deskutils/libportal \
 		libwebkitgtk-6.0.so:www/webkit2-gtk@60
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bibtexparser>0:textproc/py-bibtexparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdfminer.six>=0:textproc/py-pdfminer.six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR} \
 		tex-xetex>0:print/tex-xetex \
 		xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig python \
 		shared-mime-info shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	cvfosammmm
 GH_PROJECT=	Setzer
 USE_GNOME=	glib20 gtk40 gtksourceview5 introspection pango pygobject3
 USE_PYTHON=	flavors py3kplist
 
 SHEBANG_FILES=	scripts/*
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile
index 90c8abdf9a63..8228ffa13f7b 100644
--- a/graphics/rapid-photo-downloader/Makefile
+++ b/graphics/rapid-photo-downloader/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	rapid-photo-downloader
 DISTVERSION=	0.9.26
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Import photos and videos efficiently and reliably
 WWW=		https://www.damonlynch.net/rapid/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2 \
 		libgudev-1.0.so:devel/libgudev
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colour>0:graphics/py-colour@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>2.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}easygui>=0:x11-toolkits/py-easygui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gphoto2>=1.4.0:graphics/py-gphoto2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymediainfo>=1.0:multimedia/py-pymediainfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rawkit>0:graphics/py-rawkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>0:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		exiftool:graphics/p5-Image-ExifTool
 
 USES=		desktop-file-utils gettext gnome pyqt:5 python qt:5
 USE_GNOME=	pygobject3:run
 USE_PYTHON=	autoplist distutils noflavors
 USE_QT=		imageformats:run
 USE_PYQT=	pyqt5
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		COLOUR PROGRESS
 OPTIONS_DEFAULT=	COLOUR PROGRESS
 
 COLOUR_DESC=	generates coloured program output
 PROGRESS_DESC=	shows a progress bar on the command line
 
 COLOUR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR}
 PROGRESS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyprind>=1.4.0:misc/py-pyprind@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/py-mailnag/Makefile b/mail/py-mailnag/Makefile
index c7d60f0e795b..bd32526548b0 100644
--- a/mail/py-mailnag/Makefile
+++ b/mail/py-mailnag/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	mailnag
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Extensible mail notification daemon
 WWW=		https://github.com/pulb/mailnag
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libsecret-1.so:security/libsecret
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext-tools gnome gstreamer python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pulb
 
 USE_GNOME=	gdkpixbuf glib20 gtk30 pygobject3
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	mailnag mailnag-config
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 PORTDOCS=	AUTHORS NEWS README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/data/mailnag-config.desktop \
 		${WRKSRC}/data/mailnag.desktop
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile
index 7544aaeb1baa..30c1df757b4b 100644
--- a/net-p2p/deluge-cli/Makefile
+++ b/net-p2p/deluge-cli/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	deluge
 DISTVERSION=	2.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p python
 MASTER_SITES=	PYPI
 PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	CLI part of bittorrent client using Python and libtorrent-rasterbar
 WWW=		https://deluge-torrent.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	intltool-merge:textproc/intltool \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \
 		${PYTHON_PKGNAMEPREFIX}rjsmin>0:archivers/py-rjsmin@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>=0.18:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/py-libtorrent-rasterbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyopenssl>=0.8:security/py-pyopenssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}service-identity>=0:security/py-service-identity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rencode>0:converters/py-rencode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
 
 USES=		cpe gettext python
 USE_PYTHON=	autoplist distutils
 
 CPE_VENDOR=	deluge-torrent
 
 NO_ARCH=	yes
 
 USE_RC_SUBR=	deluged deluge_web
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	DOCS PILLOW
 OPTIONS_DEFAULT=	PILLOW
 PILLOW_DESC=Support for resizing tracker icons (pulls in many graphics libraries which may not be useful in a headless server).
 PILLOW_RUN_DEPENDS=${PY_PILLOW}
 
 PORTDOCS=	CHANGELOG.md README.md
 
 post-patch:
 	@${REINPLACE_CMD} -e "/'new_release_check':/s|True,|False,|g ; \
 		/'geoip_db_location':/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g" \
 			${WRKSRC}/deluge/core/preferencesmanager.py
 	@${REINPLACE_CMD} -e "/'check_new_releases':/s|True,|False,|g ; \
 		/'show_new_releases':/s|True,|False,|g" \
 			${WRKSRC}/deluge/ui/gtk3/gtkui.py
 
 post-install:
 # install man pages
 .for man in deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1
 	${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${STAGEDIR}${PREFIX}/share/man/man1/
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/py-stig/Makefile b/net-p2p/py-stig/Makefile
index ec73d184518b..b09a7a107036 100644
--- a/net-p2p/py-stig/Makefile
+++ b/net-p2p/py-stig/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	stig
 DISTVERSION=	0.14.2a0
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	alven@FreeBSD.org
 COMMENT=	TUI and CLI client for the BitTorrent Transmission daemon
 WWW=		https://github.com/rndusr/stig/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp-socks>0:net/py-aiohttp-socks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>0:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwidtrees>0:devel/py-urwidtrees@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asynctest>0:devel/py-asynctest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest
 
 TESTING_UNSAFE=	yes
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-pass-git-helper/Makefile b/security/py-pass-git-helper/Makefile
index 2eb41203e2d3..fe4cf08acd11 100644
--- a/security/py-pass-git-helper/Makefile
+++ b/security/py-pass-git-helper/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pass-git-helper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Git credential helper interfacing with pass
 WWW=		https://github.com/languitar/pass-git-helper
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	languitar
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index a401f860b2fd..1e97bfeaf9ee 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -1,55 +1,55 @@
 # NOTE: please keep zeitgeist in sysutils/qzeitgeist in sync
 
 PORTNAME=	zeitgeist
 DISTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Event logging framework
 WWW=		https://wiki.gnome.org/Projects/Zeitgeist
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	dee-tool:devel/dee \
 		rapper:textproc/raptor2 \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR}
 
 USES=		autoreconf gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig \
 		python sqlite tar:xz vala:build
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_TAGNAME=	8b89364c077b46734d193c5b8a80f83b0fc917dd
 USE_GNOME=	cairo gdkpixbuf glib20 intlhack \
 		introspection:build
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-fts --disable-telepathy \
 		--disable-downloads-monitor
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DATAHUB
 OPTIONS_DEFAULT=DATAHUB
 
 DATAHUB_DESC=	Passive loggers for Zeitgeist
 
 DATAHUB_LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 DATAHUB_USE=	gnome=gtk30
 DATAHUB_CONFIGURE_ENABLE=	datahub
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index 8f19d1fe15be..6727258ffb9d 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -1,104 +1,105 @@
 PORTNAME=	ibus-typing-booster
 PORTVERSION=	2.30.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Faster typing by context sensitive completion
 WWW=		https://mike-fabian.github.io/ibus-typing-booster/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus	\
 		libm17n.so:devel/m17n-lib
 RUN_DEPENDS=	CLDR>0:textproc/CLDR	\
 		UCD>0:textproc/UCD	\
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}rapidfuzz>0:devel/py-rapidfuzz@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS=	m17n-db:devel/m17n-db	\
 		${LOCALBASE}/share/hunspell/cs_CZ.dic:textproc/cs-hunspell	\
 		${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell		\
 		${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell	\
 		${LOCALBASE}/share/hunspell/es_ES.dic:textproc/es-hunspell	\
 		${LOCALBASE}/share/hunspell/it_IT.dic:textproc/it-hunspell	\
 		${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell		\
 		${LOCALBASE}/share/hunspell/sv_SE.dic:textproc/sv-hunspell	\
 		${LOCALBASE}/libexec/ibus-engine-m17n:textproc/ibus-m17n	\
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}	\
 		gmake:devel/gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mike-fabian
 
 USES=		autoreconf desktop-file-utils gettext gmake gnome iconv pathfix	\
 		pkgconfig python shebangfix
 SHEBANG_FILES=	engine/emoji-picker.in engine/ibus-engine-typing-booster.in	\
 		setup/ibus-setup-typing-booster.in
 SHEBANG_LANG=	sh
 sh_OLD_CMD=	/usr/bin/sh
 sh_CMD=		${SH}
 USE_GNOME=	gtk40
 USE_LOCALE=	en_US.UTF-8
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec
 NO_ARCH=	yes
 GLIB_SCHEMAS=	org.freedesktop.ibus.engine.typing-booster.gschema.xml
 
 TEST_TARGET=	check
 TEST_ENV=	${MAKE_ENV} \
 		IBUS_TYPING_BOOSTER_DEBUG_LEVEL=1
 TESTING_UNSAFE=	yes
 
 OPTIONS_DEFINE=	HUNSPELL
 OPTIONS_DEFAULT=HUNSPELL
 
 HUNSPELL_RUN_DEPENDS=	hunspell:textproc/hunspell
 
 SPELL2FIX=	engine/itb_util.py setup/user_transliteration.py
 SHR2FIX=	engine/itb_sound.py ${GLIB_SCHEMAS}
 XML2FIX=	org.freedesktop.ibus.engine.typing_booster.metainfo.xml.in	\
 		org.freedesktop.ibus.engine.typing_booster.emoji_picker.metainfo.xml.in
 X11LOC2FIX=	engine/itb_util.py tests/test_compose_sequences.py tests/test_itb.py
 COMP2DEL=	engine/Makefile setup/Makefile
 
 pre-configure:
 .for f in ${SPELL2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/myspell|${LOCALBASE}/share/hunspell|'	\
 		${WRKSRC}/${f}
 .endfor
 	${FIND} ${WRKSRC} -name "*.py" | ${XARGS}	\
 	${REINPLACE_CMD} -e 's|/usr/bin/python3| ${PYTHON_CMD}|'
 .for f in ${XML2FIX}
 	${REINPLACE_CMD} -e 's|/usr/libexec|${PREFIX}/libexec|'	${WRKSRC}/${f}
 .endfor
 .for f in ${SHR2FIX} ${XML2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/ibus-typing-booster|${DATADIR}|'	\
 		-e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/${f}
 .endfor
 	${REINPLACE_CMD} -e 's|/usr/share/unicode|${LOCALBASE}/share/unicode|'	\
 		${WRKSRC}/engine/itb_emoji.py
 .for f in ${X11LOC2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/X11/locale|${LOCALBASE}/lib/X11/locale|'	\
 		${WRKSRC}/${f}
 .endfor
 
 post-configure:
 .for f in ${COMP2DEL}
 	${SED} -i.orig -e '/if test -n "\$$\$$dlist"/,/^	else :; fi$$/ d'	\
 		${WRKSRC}/${f}
 .endfor
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;}	\
 	&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
diff --git a/textproc/ibus-uniemoji/Makefile b/textproc/ibus-uniemoji/Makefile
index eb4051d49f6a..90f981a5e6af 100644
--- a/textproc/ibus-uniemoji/Makefile
+++ b/textproc/ibus-uniemoji/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	ibus-uniemoji
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Input method for entering unicode symbols and emoji by name
 WWW=		https://github.com/salty-horseibus-uniemoji
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}levenshtein>0:devel/py-levenshtein@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${LOCALBASE}/share/gir-1.0/IBus-1.0.gir:textproc/ibus
 
 USES=		gmake gnome python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	salty-horse
 USE_GNOME=	glib20 pygobject3
 SHEBANG_GLOB=	*.py
 
 MAKE_ENV=	PYTHON=${PYTHON_CMD} SYSCONFDIR=${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile
index b950cbc3e9e7..f00733904d0d 100644
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	nscde
 DISTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/NsCDE/NsCDE/releases/download/${DISTVERSION}/
 
 MAINTAINER=	freebsd@ny-central.org
 COMMENT=	Modern CDE clone based on fvwm
 WWW=		https://github.com/NsCDE/NsCDE
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		ksh93:shells/ksh \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 
 USES=		desktop-file-utils gettext magick pkgconfig:build pyqt:5 \
 		python shebangfix xorg
 USE_PYQT=	pyqt5
 USE_XORG=	x11 xext xpm
 
 SHEBANG_FILES=	doc/examples/fvwm3-per-monitor/nitrowrapper
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python-shebang="${PYTHON_CMD}"
 
 DOCSDIR=	${PREFIX}/share/doc/nscde
 SUB_FILES=	pkg-message
 SUB_LIST=	EXAMPLESDIR=${EXAMPLESDIR} \
 		PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/NsCDE-${DISTVERSION}
 
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		DOCS EXAMPLES KSH2020 SUDO
 OPTIONS_SINGLE=			IMGMAG KSHOPT ROOTAUTH
 OPTIONS_SINGLE_KSHOPT=		ASTKSH KSH2020
 OPTIONS_SINGLE_ROOTAUTH=	DOAS SUDO
 ASTKSH_DESC=			AT&T KSH93
 DOAS_DESC=			Use doas to elevate privileges
 KSH2020_DESC=			Updated AT&T KSH93 (arm64 compatible)
 KSHOPT_DESC=			KSH version
 ROOTAUTH_DESC=			Root authorization
 SUDO_DESC=			Use sudo to elevate privileges
 
 ASTKSH_RUN_DEPENDS=	ksh93:shells/ast-ksh93
 DOAS_RUN_DEPENDS=	doas:security/doas
 KSH2020_RUN_DEPENDS=	ksh93:shells/ksh
 
 SUDO_USES=	sudo
 
 _SUDOFILES=	data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog
 
 .include <bsd.port.pre.mk>
 
 UNAME_M_CMD=	${UNAME} -m
 PLIST_SUB+=	ARCH="$$(${UNAME_M_CMD})"
 
 post-patch-DOAS-on:
 	( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done )
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}
 	${MV} ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/* ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}/
 
 post-install-EXAMPLES-off:
 	${RM} -fr ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/*
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xdgmenumaker/Makefile b/x11-wm/xdgmenumaker/Makefile
index 6f9ab28b7fb3..6a3cc67a4290 100644
--- a/x11-wm/xdgmenumaker/Makefile
+++ b/x11-wm/xdgmenumaker/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	xdgmenumaker
 DISTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm python
 
 MAINTAINER=	nxjoseph@FreeBSD.org
 COMMENT=	Generate XDG menus for various window managers
 WWW=		https://github.com/gapan/xdgmenumaker
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	txt2tags:textproc/txt2tags
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR}
 TEST_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		display:test gnome python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	gapan
 USE_GNOME=	gtk30 pygobject3
 SHEBANG_FILES=	src/${PORTNAME}
 
 ALL_TARGET=	man
 TEST_ENV=	PYTHON=${PYTHON_CMD}
 TEST_TARGET=	test
 
 NO_ARCH=	yes
 
 post-patch:
 # This should have improved locale-specific tests, but 10 out of 24 still fail
 # (note that it is normal for tests that produce menus with icons to fail as
 # they expect the exact same icon theme and applications the author is using).
 	@${REINPLACE_CMD} -e 's,utf8,UTF-8,' ${WRKSRC}/tests/Makefile
 
 .include <bsd.port.mk>
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 5864323686b0..3d7973aa6c15 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	guake
 PORTVERSION=	3.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	daniel@shafer.cc
 COMMENT=	Dropdown terminal made for the GNOME desktop
 WWW=		http://guake-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
 		gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycairo>0:graphics/py-pycairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		gnome-settings-daemon>0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
 		keybinder-gtk3>0:x11/keybinder-gtk3 \
 		keybinder>0:x11/keybinder \
 		libnotify>0:devel/libnotify \
 		libwnck3>0:x11-toolkits/libwnck3
 
 USES=		desktop-file-utils gettext gmake gnome libtool localbase \
 		pkgconfig python shebangfix
 USE_GNOME=	cairo dconf glib20 gtk30 pygobject3 vte3
 USE_PYTHON=	distutils noflavors
 
 GLIB_SCHEMAS=	org.guake.gschema.xml
 CPE_VENDOR=	guake-project
 NO_ARCH=	yes
 SHEBANG_FILES=	scripts/test-exception.py
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GETTEXT_FIX=	about.py boxes.py customcommands.py dialogs.py globals.py \
 		gsettings.py guake_app.py keybindings.py main.py menus.py \
 		notebook.py prefs.py
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|PYTHON_INTERPRETER?=python3|PYTHON_INTERPRETER?=${PYTHON_CMD}|g' \
 		${WRKSRC}/Makefile
 .for x in ${GETTEXT_FIX}
 	@${REINPLACE_CMD} -e '/import/s|locale|gettext|g' ${WRKSRC}/guake/${x}
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo/
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
 		generate-desktop install-schemas install-locale
 	glib-compile-schemas --strict ${STAGEDIR}${PYTHON_SITELIBDIR}/guake/data/
 
 .include <bsd.port.mk>
diff --git a/x11/mate-dock-applet/Makefile b/x11/mate-dock-applet/Makefile
index 102aa34205b6..ffcc05dd0a24 100644
--- a/x11/mate-dock-applet/Makefile
+++ b/x11/mate-dock-applet/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	mate-dock-applet
 PORTVERSION=	21.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 mate
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Application dock applet for the MATE panel
 WWW=		https://github.com/ubuntu-mate/mate-dock-applet
 
 LICENSE=	GPLv3
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycairo>=0:graphics/py-pycairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-xlib>=0:x11-toolkits/py-python-xlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR}
 
 USES=		python autoreconf gettext gmake gnome libtool localbase \
 		pkgconfig shebangfix tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ubuntu-mate
 USE_GNOME=	gtk30 libwnck3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk3
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	src/*.in
 
 GLIB_SCHEMAS=	org.mate.panel.applet.dock.gschema.xml
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' \
 		${WRKSRC}/src/org.mate.panel.applet.DockAppletFactory.service.in
 
 .include <bsd.port.mk>
diff --git a/x11/ulauncher/Makefile b/x11/ulauncher/Makefile
index 0bf73d833da5..14acba5cf6f2 100644
--- a/x11/ulauncher/Makefile
+++ b/x11/ulauncher/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	ulauncher
 PORTVERSION=	5.15.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/Ulauncher/Ulauncher/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Advanced graphical application launcher
 WWW=		https://ulauncher.io/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.18:devel/py-python-distutils-extra@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>=0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>=0:www/py-websocket-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR} \
 		${LOCALBASE}/share/gir-1.0/Keybinder-3.0.gir:x11/keybinder-gtk3 \
 		${LOCALBASE}/share/gir-1.0/Notify-0.7.gir:devel/libnotify \
 		${LOCALBASE}/share/gir-1.0/WebKit2-4.0.gir:www/webkit2-gtk@40 \
 		wmctrl:x11/wmctrl-fork
 
 USES=		gettext-tools gnome python
 USE_GNOME=	gtk30 intltool pygobject3
 USE_PYTHON=	autoplist distutils noflavors
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	APPINDICATOR
 OPTIONS_DEFAULT=	APPINDICATOR
 
 APPINDICATOR_DESC=	AppIndicator support
 APPINDICATOR_RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/AppIndicator3-0.1.gir:devel/libappindicator
 
 .include <bsd.port.mk>
 
 PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed}
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index fd4ca73c866b..6b3f9e2e7c34 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,141 +1,141 @@
 PORTNAME=	xpra
 PORTVERSION=	6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	https://xpra.org/src/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Persistent remote applications for X
 WWW=		https://xpra.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 LIB_DEPENDS=	libaom.so:multimedia/aom \
 		libavcodec.so:multimedia/ffmpeg \
 		libavif.so:graphics/libavif \
 		libbrotlidec.so:archivers/brotli \
 		libdrm.so:graphics/libdrm \
 		libharfbuzz.so:print/harfbuzz \
 		liblz4.so:archivers/liblz4 \
 		libopenh264.so:multimedia/openh264 \
 		libwebp.so:graphics/webp \
 		libx264.so:multimedia/libx264 \
 		libxxhash.so:devel/xxhash \
 		libwayland-client.so:graphics/wayland
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aioquic>=0:www/py-aioquic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \
 		setxkbmap:x11/setxkbmap \
 		ssh-askpass:security/openssh-askpass \
 		xauth:x11/xauth \
 		xkbcomp:x11/xkbcomp \
 		Xvfb:x11-servers/xorg-server@xvfb
 TEST_DEPENDS=	bash:shells/bash \
 		coverage:devel/py-coverage@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext-runtime gnome localbase pkgconfig \
 		python shared-mime-info shebangfix tar:xz xorg
 
 USE_GNOME=	cairo gdkpixbuf gtk30 pygobject3
 USE_PYTHON=	cryptography cython distutils noflavors
 USE_XORG=	x11 xcomposite xcursor xdamage xext xfixes xi xkbfile xrandr \
 		xres xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER}
 SHEBANG_FILES=	fs/lib/cups/backend/xpraforwarder \
 		fs/libexec/xpra/auth_dialog \
 		fs/libexec/xpra/daemonizer \
 		fs/libexec/xpra/gnome-open fs/libexec/xpra/gvfs-open \
 		fs/libexec/xpra/xdg-open fs/libexec/xpra/xpra_signal_listener \
 		fs/libexec/xpra/xpra_udev_product_version \
 		tests/unittests/run
 
 OPTIONS_DEFINE=		AVAHI CUPS DOCS GSTREAMER LIBYUV \
 			WEBCAM
 OPTIONS_DEFAULT=	AVAHI CUPS GSTREAMER
 OPTIONS_SUB=		yes
 
 AVCODEC_DESC=	Enable avcodec2 (FFmpeg) decoder
 CUPS_DESC=	Enable CUPS for printer forwarding
 FFMPEG_DESC=	Enable FFmpeg encoder
 GSTREAMER_DESC=	Enable GStreamer for sound forwarding
 LIBYUV_DESC=	Enable libyuv CSC module (fastest)
 WEBCAM_DESC=	Enable webcam forwarding (client only)
 
 AVAHI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR}
 AVAHI_VARS=			XPRA_OPTIONS+=mdns
 CUPS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR}
 CUPS_VARS=			XPRA_OPTIONS+=printing
 GSTREAMER_USES=			gstreamer
 GSTREAMER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_USE=			GSTREAMER=flac,lame,mpg123,ogg,opus,pulse,vorbis,wavpack
 GSTREAMER_VARS=			XPRA_OPTIONS+=gstreamer
 LIBYUV_LIB_DEPENDS=		libyuv.so:graphics/libyuv
 LIBYUV_VARS=			XPRA_OPTIONS+=csc_libyuv
 WEBCAM_RUN_DEPENDS=		opencv>2:graphics/opencv
 WEBCAM_VARS=			XPRA_OPTIONS+=webcam
 
 PYDISTUTILS_PKGNAME=	xpra_all
 XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED} csc_libyuv \
 			enc_x264 \
 			mdns printing vpx webcam
 XPRA_OPTIONS=		dec_avcodec2 enc_ffmpeg enc_x264
 XPRA_OPTIONS_DISABLED=	pam strict uinput vpx Xdummy Xdummy_wrapper
 
 .include <bsd.port.options.mk>
 
 .for opt in ${XPRA_OPTIONS_ALL}
 .if empty(XPRA_OPTIONS:M${opt})
 PYDISTUTILS_ARGS+=	--without-${opt}
 .else
 PYDISTUTILS_ARGS+=	--with-${opt}
 .endif
 .endfor
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_BUILDARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_CONFIGUREARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_INSTALLARGS+=	${PYDISTUTILS_ARGS}
 MY_TEST_ENV=		XDG_DATA_HOME=${WRKDIR}/test_home \
 			XDG_CONFIG_HOME=${WRKDIR}/test_home \
 			XDG_CACHE_HOME=${WRKDIR}/test_home/.cache \
 			HOME=${WRKDIR}/test_home
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
 	    ${WRKSRC}/xpra/platform/pycups_printing.py
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \
 	    ${WRKSRC}/fs/etc/xpra/conf.d/16_printing.conf.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${CP} -r ${STAGEDIR}/etc ${STAGEDIR}${PREFIX} && ${RM} -r ${STAGEDIR}/etc
 	${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \
 	    ${STAGEDIR}${ETCDIR}/xorg.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 	${CP} -r ${STAGEDIR}${PREFIX}/etc/dbus-1 ${STAGEDIR}${PREFIX}/share && ${RM} -r ${STAGEDIR}${PREFIX}/dbus-1
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
 	    -exec ${STRIP_CMD} {} +
 
 do-test:
 	@${MKDIR} ${BINARY_LINKDIR}
 	${RLN} ${PYTHON_CMD} ${BINARY_LINKDIR}/python3
 	cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MY_TEST_ENV} \
 		${PYTHON_CMD} ${PYDISTUTILS_SETUP} unittests
 
 .include <bsd.port.post.mk>