diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile
index 1902068cdddb..e99e491193b6 100644
--- a/audio/mumble-server/Makefile
+++ b/audio/mumble-server/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	mumble-server
 DISTVERSION=	1.5.613
 CATEGORIES=	audio net
 MASTER_SITES=	https://github.com/${PORTNAME:S/-server//}-voip/${PORTNAME:S/-server//}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME:S/-server//}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Server component of Mumble
 WWW=		https://www.mumble.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++17-lang pkgconfig python:build qt:5 ssl
 USE_CXXSTD=	c++17
 USE_QT=		buildtools:build core dbus network qmake:build sql xml
+USE_RC_SUBR=	mumble_server
 
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	server
 CMAKE_OFF=	client
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 
 CXXFLAGS+=	-Wno-deprecated-declarations
 
-USE_RC_SUBR=	mumble_server
+EXTRA_PATCHES+=	${.CURDIR}/../mumble/files/patch-src_MumbleProtocol.cpp
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-EXTRA_PATCHES+=	${.CURDIR}/../mumble/files/patch-src_MumbleProtocol.cpp
+USERS=		mumble-server
+GROUPS=		mumble-server
 
 OPTIONS_DEFINE=		AVAHI DOCS ICE LTO
 OPTIONS_DEFAULT=	AVAHI LTO MYSQL SQLITE
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE
 
-AVAHI_CMAKE_BOOL=	zeroconf
+ICE_DESC=		Ice Support
+
 AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
+AVAHI_CMAKE_BOOL=	zeroconf
 
-ICE_DESC=		Ice Support
-ICE_CMAKE_BOOL=		ice
 ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_CMAKE_BOOL=		ice
 
 LTO_CMAKE_BOOL=		lto
 
 MYSQL_USE=		QT=sql-mysql:run
 PGSQL_USE=		QT=sql-pgsql:run
 SQLITE_USE=		QT=sql-sqlite3:run
 
-USERS=		mumble-server
-GROUPS=		mumble-server
-
 .include <bsd.port.pre.mk>
 
 post-install:
 	${SED} -i '' -e 's|database=.*|database=/var/db/mumble-server/mumble-server.sqlite| ; \
 			s|;pidfile=.*|pidfile=/var/run/mumble-server/mumble-server.pid| ; \
 			s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log| ; \
 			s|;host=.*|host=0.0.0.0|' \
 		${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini
 	${MV}   ${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini \
 		${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini.sample
 .for f in bin/mumble-server-user-wrapper share/man/man1/mumble-server-user-wrapper.1
 	${RM} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in README.md SECURITY.md docs/additional-readmes/README.static.linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index ed4802b5337f..7f1284cd373d 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.613
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Voice chat software primarily intended for use while gaming
 WWW=		https://www.mumble.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		microsoft-gsl>=3.0.0:devel/microsoft-gsl \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libopus.so:audio/opus \
 		libspeexdsp.so:audio/speexdsp \
 		libabsl_base.so:devel/abseil \
 		libpcre2-8.so:devel/pcre2 \
 		libPocoXML.so:devel/poco \
 		libPocoZip.so:devel/poco \
 		libprotobuf.so:devel/protobuf \
 		libexpat.so:textproc/expat2
 
 USES=		cmake compiler:c++17-lang cpe desktop-file-utils \
 		pkgconfig python:build qt:5 ssl xorg
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 USE_QT=		buildtools:build concurrent core dbus gui l10n linguist:build network \
 		qmake:build sql sql-sqlite3:run svg widgets xml
 USE_XORG=	x11 xext xi
 
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	client oss overlay plugins translations xinput2
 CMAKE_OFF=	bundled-gsl bundled-json bundle-qt-translations bundled-speex \
 		crash-report g15 server tracy update
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 
 CONFIGURE_ENV=	MUMBLE_PYTHON=${PYTHON_CMD}
 CXXFLAGS+=	-Wno-deprecated-declarations
 
 PLIST_SUB=	MUMBLE_VERSION="${DISTVERSION:R}"
 
 OPTIONS_DEFINE=		ALSA AVAHI JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
 OPTIONS_DEFINE_amd64=	OVERLAY_32BIT
 OPTIONS_DEFAULT_amd64=	OVERLAY_32BIT
 OPTIONS_RADIO=		SPEECH
 OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
 
 OVERLAY_32BIT_DESC=	Build and install 32bit overlay module
 QTSPEECH_DESC=		Use Qt's text-to-speech system
 RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
-SPEECH_DESC=		Support text-to-speech
 SPEECHD_DESC=		Support for Speech Dispatcher
+SPEECH_DESC=		Support text-to-speech
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	alsa
 
 AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 AVAHI_CMAKE_BOOL=	zeroconf
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_BOOL=	jackaudio
 
 LTO_BROKEN=		"QWidget: Cannot create a QWidget without QApplication": \
 			https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078
 LTO_CMAKE_BOOL=		lto
 
 OVERLAY_32BIT_CMAKE_BOOL=	overlay-xcompile
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_CMAKE_BOOL=	pipewire
 
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_BOOL=	portaudio
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	pulseaudio
 
 QTSPEECH_USE=		QT=speech
 QTSPEECH_CMAKE_BOOL=	qtspeech
 
 RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise
 RNNOISE_CMAKE_BOOL=	rnnoise
 RNNOISE_CMAKE_ON=	-Dbundled-rnnoise:BOOL=off
 
 SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
 SPEECHD_USES=		gettext-runtime gnome
 SPEECHD_USE=		GNOME=glib20
 SPEECHD_CMAKE_BOOL=	speechd
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOVERLAY_32BIT}
 . if ${ARCH} == amd64
 PLIST_SUB+=	OVERLAY_32BIT=""
 PLIST_SUB+=	OVERLAY_32BIT_SUFFIX=.x86
 PLIST_SUB+=	OVERLAY_NATIVE_SUFFIX=.x86_64
 . endif
 .else
 PLIST_SUB+=	OVERLAY_32BIT="@comment "
 PLIST_SUB+=	OVERLAY_NATIVE_SUFFIX=""
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index df4bfaea7a34..0f0a898268b0 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -1,87 +1,86 @@
 PORTNAME=	murmur
 PORTVERSION=	1.3.4
 CATEGORIES=	audio net
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Server component of Mumble
 WWW=		https://www.mumble.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libprotobuf.so:devel/protobuf
 
 USES=		compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
 BROKEN_SSL=	openssl openssl31
 BROKEN_SSL_REASON=	Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
 USE_CXXSTD=	c++11
-USE_QT=		buildtools:build core network sql xml
-
 USE_GITHUB=	YES
 GH_ACCOUNT=	mumble-voip
 GH_PROJECT=	mumble
+USE_QT=		buildtools:build core network sql xml
+USE_RC_SUBR=	murmur
 
 CONFIG=		no-client
 QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"
 
-USE_RC_SUBR=	murmur
+PORTSCOUT=	limit:^1\.3\.
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-PORTSCOUT=	limit:^1\.3\.
+USERS=		murmur
+GROUPS=		murmur
 
 OPTIONS_DEFINE=		BONJOUR DBUS DOCS ICE
 OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL SQLITE
 
 BONJOUR_DESC=		Bonjour Support
-BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
+ICE_DESC=		Ice Support
+
 BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
+BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
 
-DBUS_VARS_OFF=		CONFIG+=no-dbus
 DBUS_USE=		QT=dbus
+DBUS_VARS_OFF=		CONFIG+=no-dbus
 
-ICE_DESC=		Ice Support
-ICE_VARS_OFF=		CONFIG+=no-ice
 ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_VARS_OFF=		CONFIG+=no-ice
 
-MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
 MYSQL_USE=		QT=sql-mysql
+MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
 
-SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
 SQLITE_USE=		QT=sql-sqlite3:run
-
-USERS=		murmur
-GROUPS=		murmur
+SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIG+=	no-pch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
 pre-install:
 	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
 	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES INSTALL README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index f08fb29748fa..2ed97edb0885 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	sqldeveloper
 DISTVERSION=	23.1.1.345.2114
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-no-jre
+PORTREVISION=	2
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
 MASTER_SITES=
 DIST_SUBDIR=	oracle
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Graphical tool for database development
 WWW=		https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.html
 
 # https://www.oracle.com/downloads/licenses/sqldev-license.html
 LICENSE_NAME=	OTN
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
 
 RUN_DEPENDS=	openjfx14>=0:java/openjfx14 \
 		bash:shells/bash
 
 USES=		gnome zip
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}.desktop ${PORTNAME}.sh
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		PORTNAME=${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_LIST+=	OPENJFX14_JVM_OPTIONS="-J--module-path=${LOCALBASE}/openjfx14/lib -J--add-modules=javafx.swing,javafx.web"
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		due to Oracle license restrictions, you must fetch the \
 		source distribution manually. Please access \
 		https://www.oracle.com/tools/downloads/sqldev-downloads.html \
 		with a web browser and follow the link for the ${DISTFILES}. \
 		You will be required to register and log in, but you can \
 		create an account on that page. After registration and \
 		accepting the Oracle License, download the distribution file, \
 		${DISTFILES}, into ${DISTDIR}/${DIST_SUBDIR}/ and then restart \
 		this installation
 .endif
 
 do-install:
 	${ECHO_MSG} -n ">> Installing scripts..."
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${ECHO_MSG} " [ DONE ]"
 
 .for d in configuration dataminer dropins equinox \
     external ide javavm jdbc jdev jlib jviews modules \
     netbeans rdbms sleepycat sqldeveloper sqlj svnkit
 	${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	cd ${WRKSRC} && ${FIND} ${d} -type d \
 		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
 	cd ${WRKSRC} && ${FIND} ${d} -type f \
 		-not -name "*.exe" \
 		-not -name "*.dll" \
 		-not -name "*.so" \
 		-not -name "*.jnilib" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}/${DATADIR}/\{} \;
 	${ECHO_MSG} " [ DONE ]"
 .endfor
 
 	${RM} -r ${STAGEDIR}/${DATADIR}/modules/javafx
 	${RM} -r ${STAGEDIR}/${DATADIR}/netbeans/platform/modules/lib
 
 	@${ECHO_MSG} ">> Installing icon and desktop file ..."
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
 	    ${STAGEDIR}/${PREFIX}/share/icons/hicolor/32x32/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}/${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
 
 	${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.post.mk>
diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
index ba62beff208c..6201422ea2d1 100644
--- a/games/lwjgl3/Makefile
+++ b/games/lwjgl3/Makefile
@@ -1,127 +1,126 @@
 PORTNAME=	lwjgl
 DISTVERSION=	3.3.4.20231218
 PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	https://repo1.maven.org/:source1
 PKGNAMESUFFIX=	3
 DISTFILES=	maven2/com/beust/jcommander/1.78/jcommander-1.78.jar:source1 \
 		maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar:source1 \
 		maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar:source1 \
 		maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:source1 \
 		maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar:source1 \
 		maven2/org/joml/joml/1.10.5/joml-1.10.5-sources.jar:source1 \
 		maven2/org/joml/joml/1.10.5/joml-1.10.5.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar:source1 \
 		maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar:source1 \
 		maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar:source1 \
 		maven2/org/testng/testng/7.5/testng-7.5-sources.jar:source1 \
 		maven2/org/testng/testng/7.5/testng-7.5.jar:source1 \
 		maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar:source1
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Lightweight Java Game Library
 WWW=		https://www.lwjgl.org
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Upstream support FreeBSD on amd64 only: https://github.com/LWJGL/lwjgl3/issues/421
 
 BUILD_DEPENDS=		${LOCALBASE}/openjdk8/bin/java:java/openjdk8 \
 			kotlinc-jvm:lang/kotlin
 LIB_DEPENDS=		libdraco.so:archivers/draco \
 			libopenal.so:audio/openal-soft \
 			libopus.so:audio/opus \
 			libdbus-1.so:devel/dbus \
 			libhwloc.so:devel/hwloc2 \
 			libffi.so:devel/libffi \
 			libbgfx.so:graphics/bgfx \
 			libglfw.so:graphics/glfw \
 			libktx.so:graphics/khronos-texture \
 			libopenxr_loader.so:graphics/openxr \
 			libshaderc_shared.so:graphics/shaderc \
 			libspirv-cross-c-shared.so:graphics/spirv-cross \
 			libassimp.so:multimedia/assimp \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 
 USES=		gl gnome
 USE_ANT=	yes
-USE_GL=		gl
-USE_GNOME=	glib20 gtk30
-USE_JAVA=	17+
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	LWJGL
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	de8bd86
+USE_GL=		gl
+USE_GNOME=	glib20 gtk30
+USE_JAVA=	17+
 
 MAKE_ARGS=	-Dbuild.offline=true \
 		-Djavadoc.skip=true \
 		-Duse.libffi.so=true \
 		-Dlibffi.path=${LOCALBASE}/lib \
 		-Dlocal.kotlin=${LOCALBASE}/share/kotlin
 MAKE_ENV+=	JAVA8_HOME=${LOCALBASE}/openjdk8
 
 PLIST_SUB+=	MAJORVERSION=${PKGNAMESUFFIX}
 
 LIBSDIR=	${WRKSRC}/bin/libs/native/freebsd/*/org/lwjgl
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 MAKE_ENV+=	ANT_OPTS=-Xmx2G
 .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/bin/libs/java
 	${LN} -s ${DISTDIR}/maven2/com/beust/jcommander/1.78/jcommander-1.78.jar \
 		${WRKSRC}/bin/libs/java/jcommander.jar
 	${LN} -s ${DISTDIR}/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar \
 		${WRKSRC}/bin/libs/java/jsr305-sources.jar
 	${LN} -s ${DISTDIR}/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar \
 		${WRKSRC}/bin/libs/java/jsr305.jar
 	${LN} -s ${DISTDIR}/maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar \
 		${WRKSRC}/bin/libs/java/jopt-simple.jar
 	${LN} -s ${DISTDIR}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar \
 		${WRKSRC}/bin/libs/java/commons-math3.jar
 	${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.5/joml-1.10.5-sources.jar \
 		${WRKSRC}/bin/libs/java/joml-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.5/joml-1.10.5.jar \
 		${WRKSRC}/bin/libs/java/joml.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar \
 		${WRKSRC}/bin/libs/java/jmh-core-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar \
 		${WRKSRC}/bin/libs/java/jmh-core.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar \
 		${WRKSRC}/bin/libs/java/jmh-generator-annprocess.jar
 	${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar \
 		${WRKSRC}/bin/libs/java/slf4j-api.jar
 	${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar \
 		${WRKSRC}/bin/libs/java/slf4j-jdk14.jar
 	${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5-sources.jar \
 		${WRKSRC}/bin/libs/java/testng-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5.jar \
 		${WRKSRC}/bin/libs/java/testng.jar
 	${LN} -s ${DISTDIR}/maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar \
 		${WRKSRC}/bin/libs/java/jquery.jar
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/config/freebsd/build.xml \
 		${WRKSRC}/modules/lwjgl/cuda/src/main/java/org/lwjgl/cuda/CUDA.java
 
 do-install:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} release ${MAKE_ARGS}
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 .for x in ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar
 	${INSTALL_DATA} ${WRKSRC}${x} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}/
 .endfor
 .for x in ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so
 	${INSTALL_LIB} ${WRKSRC}${x} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/graphics/khronos-texture/Makefile b/graphics/khronos-texture/Makefile
index 3613ec994511..ceb477d2643e 100644
--- a/graphics/khronos-texture/Makefile
+++ b/graphics/khronos-texture/Makefile
@@ -1,44 +1,41 @@
 PORTNAME=	khronos-texture
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.2
 CATEGORIES=	graphics
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Khronos Texture is a container for textures for OpenGL/Vulkan/etc
 WWW=		https://github.com/KhronosGroup/KTX-Software
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:c++11-lib python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	KTX-Software
 
-OPTIONS_SINGLE=			SIMD
-OPTIONS_SINGLE_SIMD=		AVX2 NEON NONE SSE2 SSE41
-OPTIONS_EXCLUDE=		${${ARCH} != amd64 && ${ARCH} != i386:?AVX2 SSE2 SSE41:}
-OPTIONS_EXCLUDE+=		${${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != aarch64:?NEON:}
 OPTIONS_DEFAULT_aarch64=	NEON
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFAULT_armv7=		NEON
 OPTIONS_DEFAULT_OTHER_ARCHS=	NONE
+OPTIONS_SINGLE=			SIMD
+OPTIONS_SINGLE_SIMD=		AVX2 NEON NONE SSE2 SSE41
+OPTIONS_EXCLUDE=		${${ARCH} != amd64 && ${ARCH} != i386:?AVX2 SSE2 SSE41:}
+OPTIONS_EXCLUDE+=		${${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != aarch64:?NEON:}
 
 AVX2_DESC=		Use the AVX2 instruction set
-AVX2_CMAKE_ON=		-DASTCENC_ISA_AVX2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
-
 NEON_DESC=		Use the NEON instruction set
-NEON_CMAKE_ON=		-DASTCENC_ISA_NEON:BOOL=ON
-
 NONE_DESC=		Don't use any SIMD instructions
-NONE_CMAKE_ON=		-DASTCENC_ISA_NONE:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
-
 SSE2_DESC=		Use the SSE2 instruction set
-SSE2_CMAKE_ON=		-DASTCENC_ISA_SSE2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
-
 SSE41_DESC=		Use the SSE4.1 instruction set
+
+AVX2_CMAKE_ON=		-DASTCENC_ISA_AVX2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
+NEON_CMAKE_ON=		-DASTCENC_ISA_NEON:BOOL=ON
+NONE_CMAKE_ON=		-DASTCENC_ISA_NONE:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
+SSE2_CMAKE_ON=		-DASTCENC_ISA_SSE2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
 SSE41_CMAKE_ON=		-DASTCENC_ISA_SSE41:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/graphics/openxr/Makefile b/graphics/openxr/Makefile
index eaddcbd93cce..2e998bd964ed 100644
--- a/graphics/openxr/Makefile
+++ b/graphics/openxr/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	openxr
+DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.0.34
 CATEGORIES=	graphics
-DISTVERSIONPREFIX=	release-
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	OpenXR provides access to Augmented and Virtual Reality (XR-platforms)
 WWW=		https://github.com/KhronosGroup/OpenXR-SDK
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp
 
 USES=		cmake compiler:c++11-lib python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	OpenXR-SDK
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 7996f406a60f..36d7d47d9466 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,62 +1,61 @@
 PORTNAME=	sane-backends
 DISTVERSION=	1.2.1
 PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	API for accessing scanners, digital cameras, frame grabbers, etc
 WWW=		http://www.sane-project.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase:ldflags \
 		pathfix pkgconfig python:build
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	saned
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-locking \
 		--enable-pthread \
 		--without-systemd
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
 USERS=		saned
 GROUPS=		saned
 
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
 OPTIONS_DEFAULT=	AVAHI GPHOTO USB
 OPTIONS_SUB=		yes
 
 IEEE1284_DESC=	Parallel port support via libieee1284 (for i386 only)
 USB_DESC=	USB support
 
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app \
 				libcurl.so:ftp/curl \
 				libpoppler-glib.so:graphics/poppler-glib
 AVAHI_USE=			GNOME=cairo,glib20
 AVAHI_CONFIGURE_WITH=		avahi libcurl poppler-glib
 GPHOTO_LIB_DEPENDS=		libgphoto2.so:graphics/libgphoto2
 GPHOTO_CONFIGURE_WITH=		gphoto2
 IEEE1284_LIB_DEPENDS=		libieee1284.so:sysutils/libieee1284
 IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
 IPV6_CONFIGURE_ENABLE=		ipv6
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=		snmp
 USB_CONFIGURE_WITH=		usb
 V4L_LIB_DEPENDS=		libv4l1.so:multimedia/libv4l
 V4L_CONFIGURE_WITH=		v4l
 
 .include <bsd.port.mk>
diff --git a/graphics/spirv-cross/Makefile b/graphics/spirv-cross/Makefile
index 8c161e613d7d..213620074d58 100644
--- a/graphics/spirv-cross/Makefile
+++ b/graphics/spirv-cross/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	spirv-cross
+DISTVERSIONPREFIX=	vulkan-sdk-
 DISTVERSION=	1.3.280.0
 CATEGORIES=	graphics
-DISTVERSIONPREFIX=	vulkan-sdk-
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Tool for parsing and converting SPIR-V to other shader languages
 WWW=		https://github.com/KhronosGroup/SPIRV-Cross
 
 LICENSE=	APACHE20
 
 USES=		cmake compiler:c++11-lib python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-Cross
 
 CMAKE_ON=	SPIRV_CROSS_SHARED
 CMAKE_OFF=	SPIRV_CROSS_ENABLE_TESTS
 
 PORTSCOUT=	limit:^[0-9]{1,3}\.
 
 .include <bsd.port.mk>
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 4b2d23eeb10d..de7f0c471061 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -1,165 +1,201 @@
 PORTNAME=	lives
 DISTVERSION=	3.2.0
 PORTREVISION=	22
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Video editing system
 WWW=		http://lives-video.com/
 
 LICENSE=		GPLv3+ LGPL3+
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPL
 
 BROKEN=		fails to build with FFmpeg 6
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		analyseplugin:audio/ladspa
 LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
 		libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg \
 		libmjpegutils.so:multimedia/mjpegtools
 RUN_DEPENDS=	analyseplugin:audio/ladspa \
 		ffprobe:multimedia/ffmpeg \
 		sox:audio/sox
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
 		gl gnome libtool localbase pathfix perl5 pkgconfig python \
 		sdl shebangfix xorg
+USE_GL=		gl glu
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
+USE_LDCONFIG=	yes
+USE_SDL=	sdl sdl2
+USE_XORG=	x11 xrender
+
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi smogrify \
 		tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
 		lives-plugins/marcos-encoders/*encoder* \
 		lives-plugins/plugins/encoders/multi_encoder3 \
 		lives-plugins/plugins/playback/audiostream/audiostreamer.pl
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xrender
-USE_GL=		gl glu
-USE_SDL=	sdl sdl2
-USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
-USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-ldvgrab --disable-prctl --disable-system-weed --disable-dirac
 INSTALL_TARGET=	install-strip
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DOC_FILES=	AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS README \
 		OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
 		RFX/RFX.spec docs/c++-bindings.odt docs/clip_format.txt \
 		lives-plugins/marcos-encoders/README.multi_encoder \
 		weed-docs/weedspec.txt weed-docs/weedevents.txt
 
 OPTIONS_DEFINE=			ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \
 				LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
 				THEORA V4L WAYLAND
+OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
+				MPG123 MPLAYER NLS OGG123 OGG OGM OPENCV \
+				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
 OPTIONS_GROUP=			RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3
-OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
-				SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
 OPTIONS_GROUP_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
 OPTIONS_GROUP_MP3=		MPG123 MPG321
 OPTIONS_GROUP_MPLAYERS=		MPLAYER MPV
-OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
-				MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV \
-				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
+OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
+				SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
 OPTIONS_SUB=			yes
 
-ALSA_CONFIGURE_OFF=		--disable-alsa
+EXT_WIN_CAPTURE_DESC=		Allows external window capture via xdotool or wmctrl
+LIBEXPLAIN_DESC=		Used to explain Unix and Linux system call errors
+MENCODER_DESC=			Use mencoder as video file and movie encoder
+MP3_DESC=			Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
+MPG321_DESC=			MP3 decoding support via mpg321
+MPLAYERS_DESC=			Install mplayer/mpv (runtime check)
+MPV_DESC=			MPV media player support
+OGG123_DESC=			Use ogg123 from vorbis-tools
+OGM_DESC=			Use ogmtools for manipulating with OGM files
+PROJECTM_DESC=			projectM support
+RUNTIME_DESC=			Runtime detected utilities
+SSWF_DESC=			Use sswf for manipulating with Flash movies
+WMCTRL_DESC=			Install wmctrl
+XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
+XDOTOOL_DESC=			Install xdotool
+XWININFO_DESC=			Used for external window capture
+YTDLP_DESC=			Install yt-dlp (youtube-dl fork) - requires SYMLINK option
+
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_OFF=		--disable-alsa
+
 CDDA2WAV_RUN_DEPENDS=		cdda2wav:sysutils/cdrtools
+
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=		--disable-doxygen
-DV_CONFIGURE_OFF=		--disable-libdv
+
 DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
 DV_RUN_DEPENDS=			encodedv:multimedia/libdv
-EXT_WIN_CAPTURE_DESC=		Allows external window capture via xdotool or wmctrl
-FFTW_CONFIGURE_OFF=		--disable-fftw3f
+DV_CONFIGURE_OFF=		--disable-libdv
+
 FFTW_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float
+FFTW_CONFIGURE_OFF=		--disable-fftw3f
+
 FREI0R_BUILD_DEPENDS=		frei0r>0:graphics/frei0r
-FREI0R_CONFIGURE_OFF=		--disable-frei0r
 FREI0R_RUN_DEPENDS=		frei0r>0:graphics/frei0r
+FREI0R_CONFIGURE_OFF=		--disable-frei0r
+
 GHOSTSCRIPT_USES=		ghostscript:run
+
 IMAGEMAGICK_USES=		magick:run
-JACK_CONFIGURE_OFF=		--disable-jack
+
 JACK_LIB_DEPENDS=		libjack.so:audio/jack \
 				libjackserver.so:audio/jack
+JACK_CONFIGURE_OFF=		--disable-jack
+
 LAME_RUN_DEPENDS=		lame:audio/lame
-LIBEXPLAIN_CONFIGURE_OFF=	--disable-libexplain
-LIBEXPLAIN_DESC=		Used to explain Unix and Linux system call errors
+
 LIBEXPLAIN_LIB_DEPENDS=		libexplain.so:devel/libexplain
-LIBVISUAL_CONFIGURE_OFF=	--disable-libvisual
+LIBEXPLAIN_CONFIGURE_OFF=	--disable-libexplain
+
 LIBVISUAL_LIB_DEPENDS=		libvisual-0.4.so:graphics/libvisual04
+LIBVISUAL_CONFIGURE_OFF=	--disable-libvisual
+
 MATROSKA_RUN_DEPENDS=		mkvmerge:multimedia/mkvtoolnix
+
 MENCODER_RUN_DEPENDS=		mencoder:multimedia/mencoder
-MENCODER_DESC=			Use mencoder as video file and movie encoder
-MP3_DESC=			Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
+
 MPG123_RUN_DEPENDS=		mpg123:audio/mpg123
-MPG321_DESC=			MP3 decoding support via mpg321
+
 MPG321_RUN_DEPENDS=		mpg321:audio/mpg321
+
 MPLAYER_RUN_DEPENDS=		mplayer:multimedia/mplayer
-MPLAYERS_DESC=			Install mplayer/mpv (runtime check)
-MPV_DESC=			MPV media player support
+
 MPV_RUN_DEPENDS=		mpv:multimedia/mpv
+
 NLS_USES=			gettext-tools
-OGG_CONFIGURE_OFF=		--disable-ogg
-OGG_LIB_DEPENDS=		libogg.so:audio/libogg
-OGG123_DESC=			Use ogg123 from vorbis-tools
+
 OGG123_RUN_DEPENDS=		ogg123:audio/vorbis-tools
-OGM_DESC=			Use ogmtools for manipulating with OGM files
+
+OGG_LIB_DEPENDS=		libogg.so:audio/libogg
+OGG_CONFIGURE_OFF=		--disable-ogg
+
 OGM_RUN_DEPENDS=		ogmmerge:multimedia/ogmtools
-OPENCV_CONFIGURE_OFF=		--disable-opencv
+
 OPENCV_LIB_DEPENDS=		libopencv_calib3d.so:graphics/opencv \
 				libopencv_core.so:graphics/opencv
-SSWF_DESC=			Use sswf for manipulating with Flash movies
-SSWF_RUN_DEPENDS=		sswf:graphics/sswf
-THEORA_CONFIGURE_OFF=		--disable-theora
-THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
+OPENCV_CONFIGURE_OFF=		--disable-opencv
+
 OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-turbo
-PROJECTM_CONFIGURE_OFF=		--disable-projectM
-PROJECTM_DESC=			projectM support
+
 PROJECTM_LIB_DEPENDS=		libprojectM.so:graphics/libprojectm
-PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
+PROJECTM_CONFIGURE_OFF=		--disable-projectM
+
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
-RUNTIME_DESC=			Runtime detected utilities
+PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
+
+SSWF_RUN_DEPENDS=		sswf:graphics/sswf
+
+THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
+THEORA_CONFIGURE_OFF=		--disable-theora
+
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-V4L_CONFIGURE_OFF=		--disable-v4l
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
-WAYLAND_CONFIGURE_OFF=		--disable-wayland
+V4L_CONFIGURE_OFF=		--disable-v4l
+
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-egl.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland
-WMCTRL_DESC=			Install wmctrl
+WAYLAND_CONFIGURE_OFF=		--disable-wayland
+
 WMCTRL_RUN_DEPENDS=		wmctrl:x11/wmctrl
-YTDLP_DESC=			Install yt-dlp (youtube-dl fork) - requires SYMLINK option
-YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
+
 X264_RUN_DEPENDS=		x264:multimedia/x264
-XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
+
 XDG_SCREENSAVER_RUN_DEPENDS=	xdg-screensaver:devel/xdg-utils
-XDOTOOL_DESC=			Install xdotool
+
 XDOTOOL_RUN_DEPENDS=		xdotool:x11/xdotool
-XWININFO_DESC=			Used for external window capture
+
 XWININFO_RUN_DEPENDS=		xwininfo:x11/xwininfo
 
+YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		's/^LIBS = $$/&@LIBS@/'
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
 		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
 	@${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \
 		${WRKSRC}/build-lives-rfx-plugin
 
 pre-build-NLS-on:
 	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} update-po)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \
 		-not -type d >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer-skins/Makefile b/multimedia/smplayer-skins/Makefile
index eef8b6464c14..5b7bf6c93671 100644
--- a/multimedia/smplayer-skins/Makefile
+++ b/multimedia/smplayer-skins/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	smplayer-skins
 DISTVERSION=	20.11.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/smplayer/SMPlayer-skins/${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Skins for SMPlayer (Skinnable GUI)
 WWW=		https://www.smplayer.info/
 
 USES=		qt:5 tar:bzip2
 USE_QT=		buildtools:build
 
-NO_ARCH=	yes
-
 DATADIR=	${PREFIX}/share/smplayer
 
 BINARY_ALIAS=	rcc=${RCC}
 
+NO_ARCH=	yes
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
index 2c9e91a4dd5b..7a0b0674028a 100644
--- a/multimedia/smplayer-themes/Makefile
+++ b/multimedia/smplayer-themes/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	smplayer-themes
 PORTVERSION=	20.11.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/smplayer/SMPlayer-themes/${PORTVERSION}/
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Themes for SMPlayer
 WWW=		https://www.smplayer.info/
 
 USES=		qt:5 tar:bzip2
 USE_QT=		buildtools:build
 
-NO_ARCH=	yes
-
 DATADIR=	${PREFIX}/share/smplayer
 
+BINARY_ALIAS=	rcc=${RCC}
+
+NO_ARCH=	yes
+
 PORTDOCS=	Changelog README.txt
 OPTIONS_DEFINE=	DOCS
 
-BINARY_ALIAS=	rcc=${RCC}
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index b5d5c4a2ce4f..9ccfd5917d19 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	smplayer
 DISTVERSION=	23.12.0
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/${PORTNAME}/SMPlayer/${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Complete front-end based on Qt for mplayer
 WWW=		https://www.smplayer.info/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
 USES=		cpe compiler:c++11-lang desktop-file-utils dos2unix gl \
 		gmake qmake qt:5 tar:bzip2 xorg
+CPE_VENDOR=	ricardo_villalba
+DOS2UNIX_GLOB=	*.md *.txt
 USE_GL=		gl
 USE_QT=		buildtools:build linguisttools:build \
 		core dbus declarative gui network widgets xml
 USE_XORG=	x11 xext
 
-CPE_VENDOR=	ricardo_villalba
-DOS2UNIX_GLOB=	*.md *.txt
-
+QMAKE_ARGS=	"DEFINES_DISABLED+=MPLAYER2_SUPPORT"
+MAKE_ENV=	DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE}
 ALL_TARGET=	src/smplayer
+
+# Do not use unstable versions
+PORTSCOUT=	site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/
+
+SUB_FILES=	pkg-message
+
 CONFIGURE_WRKSRC=	${WRKSRC}/src
-MAKE_ENV=	DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE}
-QMAKE_ARGS=	"DEFINES_DISABLED+=MPLAYER2_SUPPORT"
 
 PORTDOCS=	${DOCS:T}
 DOCS=		old-docs/Changelog old-docs/dvdmenus.txt old-docs/Finding_subtitles.txt \
 		old-docs/Not_so_obvious_things.txt old-docs/Release_notes.txt \
 		old-docs/Watching_TV.txt README.md Readme.txt Release_notes.md
 
-OPTIONS_MULTI=		ENGINE
-OPTIONS_MULTI_ENGINE=	MPLAYER MPV
 OPTIONS_DEFINE=		DOCS DEBUG SKINS THEMES
 OPTIONS_DEFAULT=	MPV SKINS THEMES
+OPTIONS_MULTI=		ENGINE
+OPTIONS_MULTI_ENGINE=	MPLAYER MPV
 
 ENGINE_DESC=	Multimedia engine
 MPLAYER_DESC=	Allow to use MPlayer as multimedia engine
 MPV_DESC=	Allow to use mpv as multimedia engine
 SKINS_DESC=	Install additional skins
 THEMES_DESC=	Install additional themes
 
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPLAYER_QMAKE_OFF=	"DEFINES_DISABLED+=MPLAYER_SUPPORT"
 
 MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 MPV_QMAKE_OFF=		"DEFINES_DISABLED+=MPV_SUPPORT"
 
 SKINS_RUN_DEPENDS=	smplayer-skins>=0:multimedia/smplayer-skins
 THEMES_RUN_DEPENDS=	smplayer-themes>=0:multimedia/smplayer-themes
 
-# Do not use unstable versions
-PORTSCOUT=	site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/
-
-SUB_FILES=	pkg-message
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \
 		${WRKSRC}/webserver/Makefile
 	@${REINPLACE_CMD} -e 's|^sed|#sed|' \
 		${WRKSRC}/install_appdata.sh
 
 post-patch-DEBUG-on:
 	@${REINPLACE_CMD} -e '/CONFIG += debug/s|#||' \
 		${WRKSRC}/src/smplayer.pro
 
 post-patch-DEBUG-off:
 	@${REINPLACE_CMD} -e '/DEFINES += NO_DEBUG_ON_CONSOLE/s|#||' \
 		${WRKSRC}/src/smplayer.pro
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simple_web_server
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index c0a9a5c14ff9..984997c031bd 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,157 +1,158 @@
 PORTNAME=	freerdp
 DISTVERSION=	2.11.5
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 
 PATCH_SITES=	https://github.com/FreeRDP/FreeRDP/commit/
 PATCHFILES+=	61983cd6dcb86097d91b7ef405abc1266444a368.patch:-p1 # ffmpeg6 support: AVPicture
 								   # https://github.com/FreeRDP/FreeRDP/pull/8941
 PATCHFILES+=	78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch:-p1 # add additional neon check
 								   # https://github.com/FreeRDP/FreeRDP/issues/9746
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	libressl-devel
-BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
-
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias cmake compiler:c++11-lib cpe localbase pathfix pkgconfig ssl
+
+BROKEN_SSL=	libressl-devel
+BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
+
 USE_LDCONFIG=	yes
 
 PATCHVERSION=	${DISTVERSION}
 MAJORVERSION=	${DISTVERSION:R:R}
 
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB CHANNEL_URBDRC_CLIENT
 CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSSAPI WITH_GSTREAMER_0_10 WITH_IPP \
 		WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
 		WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
 		WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
 		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
 
+PORTSCOUT=	limit:^2\.
+
 PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
 PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
 
-PORTSCOUT=	limit:^2\.
-
 OPTIONS_DEFINE=		ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM GSTREAMER \
 			ICU JPEG LAME MANPAGES OPENH264 PCSC \
 			PULSEAUDIO SOXR WAYLAND X11
-OPTIONS_DEFAULT=	CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
-OPTIONS_RADIO=		SCALE
-OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
-OPTIONS_SUB=		yes
-
 OPTIONS_DEFINE_aarch64=	NEON
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_armv6=	NEON
 OPTIONS_DEFINE_armv7=	NEON
 OPTIONS_DEFINE_i386=	SSE
+OPTIONS_DEFAULT=	CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
 OPTIONS_DEFAULT_aarch64=	NEON
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_armv7=	NEON
+OPTIONS_RADIO=		SCALE
+OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
+OPTIONS_SUB=		yes
+
+BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
+CAIRO_DESC=		Use CAIRO image library for screen resizing
+NEON_DESC=		Enable Media Processing Engine instructions
+OPENH264_DESC=		H.264 video codec support via OpenH264
+PCSC_DESC=		Smart card support (smart card device redirection)
+SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
+WAYLAND_DESC=		Build FreeRDP Wayland client
+X11_DESC=		Build FreeRDP X11 client
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
-BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
 BROKENFOCUS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-focusbug.diff
 
-CAIRO_DESC=		Use CAIRO image library for screen resizing
-CAIRO_CMAKE_BOOL=	WITH_CAIRO
 CAIRO_USES=		gnome
 CAIRO_USE=		gnome=cairo
+CAIRO_CMAKE_BOOL=	WITH_CAIRO
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CMAKE_BOOL=	WITH_FAAC
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_BOOL=	WITH_FAAD2
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG WITH_DSP_FFMPEG
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
-GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
+GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
 GSTREAMER_USES=		gettext gnome gstreamer xorg
 GSTREAMER_USE=		gnome=glib20 xorg=x11,xext,xorgproto,xrandr
-GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CMAKE_BOOL=		WITH_ICU
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 
-NEON_DESC=		Enable Media Processing Engine instructions
 NEON_CMAKE_BOOL=	WITH_NEON
 
-OPENH264_DESC=		H.264 video codec support via OpenH264
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
-PCSC_DESC=		Smart card support (smart card device redirection)
 # LoadLibraryA("libpcsclite.so")
 PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 PCSC_CMAKE_BOOL=	WITH_PCSC
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
 SSE_CMAKE_BOOL=		WITH_SSE2
 
-SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
 
-WAYLAND_DESC=		Build FreeRDP Wayland client
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-cursor.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
-X11_DESC=		Build FreeRDP X11 client
+X11_USES=		xorg
+X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
 			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
 			-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
 			-DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \
 			-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
 			-DWITH_XV:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
-X11_USES=		xorg
-X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/cmake/FindGSM.cmake \
 		${WRKSRC}/libfreerdp/codec/dsp.c
 
 pre-configure:
 	${CP} ${FILESDIR}/mntent.h ${WRKSRC}/rdtk/include
 	${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client
 
 .include <bsd.port.mk>
diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 7d102ef502eb..4bd93dfd4915 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -1,206 +1,206 @@
 PORTNAME=	freerdp
 DISTVERSION=	3.4.0
 PORTREVISION=	1
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	libressl-devel
-BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
-
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias cmake compiler:c++11-lib cpe localbase:ldflags pathfix pkgconfig ssl xorg
-USE_XORG=	ice sm x11 xext
+
+BROKEN_SSL=	libressl-devel
+BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
+
 USE_LDCONFIG=	yes
+USE_XORG=	ice sm x11 xext
 
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD UWAC_FORCE_STATIC_BUILD \
 		WITH_BINARY_VERSIONING WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB \
 		WITH_FREERDP_DEPRECATED WITH_FREERDP_DEPRECATED_COMMANDLINE WITH_WINPR_DEPRECATED
 CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \
 		WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
 		WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
 		WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
 		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
 
 PLIST_SUB+=	PATCHVERSION="${DISTVERSION}"
 PLIST_SUB+=	MAJORVERSION="${DISTVERSION:R:R}"
 
-OPTIONS_DEFINE=		AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \
-			GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \
-			PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11
-OPTIONS_DEFAULT=	AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \
-			SDL SWSCALE WAYLAND X11
-OPTIONS_GROUP=		CLIPBOARD_IMAGE
-OPTIONS_GROUP_CLIPBOARD_IMAGE=	JPEG_CB PNG WEBP
-OPTIONS_RADIO=		GSSAPI SCALE
-OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
-OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
-OPTIONS_SUB=		yes
-
-OPTIONS_DEFINE_aarch64=	NEON
-OPTIONS_DEFINE_amd64=	SSE
-OPTIONS_DEFINE_armv6=	NEON
-OPTIONS_DEFINE_armv7=	NEON
-OPTIONS_DEFINE_i386=	SSE
+OPTIONS_DEFINE=			AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \
+				GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \
+				PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11
+OPTIONS_DEFINE_aarch64=		NEON
+OPTIONS_DEFINE_amd64=		SSE
+OPTIONS_DEFINE_armv6=		NEON
+OPTIONS_DEFINE_armv7=		NEON
+OPTIONS_DEFINE_i386=		SSE
+OPTIONS_DEFAULT=		AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \
+				SDL SWSCALE WAYLAND X11
 OPTIONS_DEFAULT_aarch64=	NEON
-OPTIONS_DEFAULT_amd64=	SSE
-OPTIONS_DEFAULT_armv7=	NEON
+OPTIONS_DEFAULT_amd64=		SSE
+OPTIONS_DEFAULT_armv7=		NEON
+OPTIONS_GROUP=			CLIPBOARD_IMAGE
+OPTIONS_GROUP_CLIPBOARD_IMAGE=  JPEG_CB PNG WEBP
+OPTIONS_RADIO=			GSSAPI SCALE
+OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
+OPTIONS_RADIO_SCALE=		CAIRO SWSCALE
+OPTIONS_SUB=			yes
 
 AAD_DESC=		Compile with support for Azure AD authentication
+BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
+CAIRO_DESC=		Use CAIRO image library for screen resizing
+CLIPBOARD_IMAGE_DESC=	Add "to/from" BMP conversion support to clipboard (experimental)
+JPEG_CB_DESC=		${JPEG_DESC}
+NEON_DESC=		Enable Media Processing Engine instructions
+OPENH264_DESC=		H.264 video codec support via OpenH264
+PCSC_DESC=		Smart card support (smart card device redirection)
+PKCS11_DESC=		Use security/pkcs11-helper
+SDL_DESC=		Build FreeRDP SDL client
+SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
+URIPARSER_DESC=		Use uriparser RFC 3986 URI parsing library to handle URIs
+WAYLAND_DESC=		Build FreeRDP Wayland client
+X11_DESC=		Build FreeRDP X11 client
+
 AAD_LIB_DEPENDS=	libcjson.so:devel/libcjson \
 			libcjson_utils.so:devel/libcjson
 AAD_CMAKE_BOOL=		WITH_AAD
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
-BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
 BROKENFOCUS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-focusbug.diff
 
-CAIRO_DESC=		Use CAIRO image library for screen resizing
-CAIRO_CMAKE_BOOL=	WITH_CAIRO
 CAIRO_USES=		gnome
 CAIRO_USE=		gnome=cairo
-
-CLIPBOARD_IMAGE_DESC=	Add "to/from" BMP conversion support to clipboard (experimental)
+CAIRO_CMAKE_BOOL=	WITH_CAIRO
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CMAKE_BOOL=	WITH_FAAC
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_BOOL=	WITH_FAAD2
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG WITH_DSP_FFMPEG
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=	gssapi:mit
+
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
-GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
 GSTREAMER_USES=		gettext gnome gstreamer xorg
 GSTREAMER_USE=		gnome=glib20 xorg=x11,xext,xorgproto,xrandr
-
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=	gssapi:mit
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CMAKE_ON=		-DWITH_UNICODE_BUILTIN=OFF
 ICU_CMAKE_OFF=		-DWITH_UNICODE_BUILTIN=ON
 
-JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
+JPEG_CMAKE_BOOL=	WITH_JPEG
 
-JPEG_CB_DESC=		${JPEG_DESC}
-JPEG_CB_CMAKE_BOOL=	WINPR_UTILS_IMAGE_JPEG
 JPEG_CB_USES=		jpeg
+JPEG_CB_CMAKE_BOOL=	WINPR_UTILS_IMAGE_JPEG
 
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 
-NEON_DESC=		Enable Media Processing Engine instructions
 NEON_CMAKE_BOOL=	WITH_NEON
 
-OPENH264_DESC=		H.264 video codec support via OpenH264
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CMAKE_BOOL=	WITH_OPUS
 
-PCSC_DESC=		Smart card support (smart card device redirection)
 # LoadLibraryA("libpcsclite.so")
 PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 PCSC_CMAKE_BOOL=	WITH_PCSC
 
-PKCS11_DESC=		Use security/pkcs11-helper
 PKCS11_BUILD_DEPENDS=	${LOCALBASE}/include/pkcs11-helper-1.0/pkcs11.h:security/pkcs11-helper
 PKCS11_CMAKE_BOOL=	WITH_PKCS11
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		WINPR_UTILS_IMAGE_PNG
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
-SDL_DESC=		Build FreeRDP SDL client
 SDL_LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
 			libsoup-2.4.so:devel/libsoup \
 			libharfbuzz.so:print/harfbuzz \
 			libwebkit2gtk-4.0.so:www/webkit2-gtk3
-SDL_CMAKE_BOOL=		WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
 SDL_USES=		gettext gnome sdl
 SDL_USE=		gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2
+SDL_CMAKE_BOOL=		WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
 SSE_CMAKE_BOOL=		WITH_SSE2
 
-SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
 
-URIPARSER_DESC=		Use uriparser RFC 3986 URI parsing library to handle URIs
 URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
 URIPARSER_CMAKE_BOOL=	WITH_URIPARSER
 
-WAYLAND_DESC=		Build FreeRDP Wayland client
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 			wayland-scanner:graphics/wayland
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-cursor.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_RUN_DEPENDS=	wayland-scanner:graphics/wayland
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_BOOL=	WINPR_UTILS_IMAGE_WEBP
 
-X11_DESC=		Build FreeRDP X11 client
+X11_USES=		xorg
+X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
 			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
 			-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
 			-DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \
 			-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
 			-DWITH_XV:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
-X11_USES=		xorg
-X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSSAPI_HEIMDAL} || ${PORT_OPTIONS:MGSSAPI_MIT}
 CMAKE_ON+=	WITH_KRB5
 .else
 CMAKE_OFF+=	WITH_KRB5
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/cmake/FindGSM.cmake \
 		${WRKSRC}/libfreerdp/codec/dsp.c
 
 pre-configure:
 	${CP} ${FILESDIR}/mntent.h ${WRKSRC}/winpr/include
 	${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client
 
 .include <bsd.port.mk>
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 03c0b3c9f6b2..a17d75ee989e 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.0-M18
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 11.0.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_SUB=	T=${TOMCAT_SUBDIR} \
-		WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
+PLIST_SUB=	T=${TOMCAT_SUBDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}${PKGNAMESUFFIX}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index ddc2e1f853b6..9e3dd97f0d39 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	tomcat
 DISTVERSION=	10.1.20
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 10.1.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_SUB=	T=${TOMCAT_SUBDIR} \
-		WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
+PLIST_SUB=	T=${TOMCAT_SUBDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index 07cbcd5ab233..22d33b283269 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	tomcat
 PORTVERSION=	8.5.100
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 8.5.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
 
 DEPRECATED=	Upstream EOL reaches on 2024-03-31, some time after 2024-06-30 distfiles will be archived.\
 		Migrate to www/tomcat9
 EXPIRATION_DATE=	2024-07-31
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_SUB=	T=${TOMCAT_SUBDIR} \
-		WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
+PLIST_SUB=	T=${TOMCAT_SUBDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 2dd0d8397fae..06ff5b6d1331 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	tomcat
 PORTVERSION=	9.0.87
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 9.0.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_SUB=	T=${TOMCAT_SUBDIR} \
-		WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
+PLIST_SUB=	T=${TOMCAT_SUBDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
 	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 .include <bsd.port.mk>