diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index cf1b6c5b0648..b4c1f0b76de9 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -1,94 +1,98 @@
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.80.b20221213
 PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR?=	${PORTNAME}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server (development version)
 WWW=		http://www.xrdp.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
-RUN_DEPENDS=	xterm:x11/xterm \
+RUN_DEPENDS=	${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp \
 		${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp-devel \
-		${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
+		xterm:x11/xterm
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
-USES=		autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \
-		ssl xorg
+USES=		autoreconf:build compiler:c11 cpe jpeg libtool localbase \
+		pkgconfig ssl xorg
 CPE_VENDOR=	neutrinolabs
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_TAGNAME=	36f3c43
 GH_TUPLE=	neutrinolabs:librfxcodec:79619b6:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter \
 		neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca
 
-CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
-		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
+CONFIGURE_ARGS=	--enable-imlib2 \
+		--enable-jpeg \
+		--enable-painter \
 		--enable-pam-config=freebsd \
-		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \
-		--enable-imlib2
+		--enable-pixman \
+		--enable-rfxcodec \
+		--enable-strict-locations \
+		--localstatedir=/var \
+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 LDFLAGS+=	-lssl
 CONFLICTS=	xrdp
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
-OPTIONS_DEFINE=	DEBUG FUSE IPV6
-OPTIONS_DEFAULT=	FDKAAC OPUS
-OPTIONS_GROUP=	AUDIO_CODEC
+OPTIONS_DEFINE=			DEBUG FUSE IPV6
+OPTIONS_DEFAULT=		FDKAAC OPUS
+OPTIONS_GROUP=			AUDIO_CODEC
 OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
-FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
-FUSE_DESC=	Enable drive redirection via FUSE (experimental)
-MP3LAME_DESC=	Enable MP3 Lame for audio redirection
-OPUS_DESC=	Enable Opus for audio redirection
+FDKAAC_DESC=			Enable Fraunhofer FDK AAC for audio redirection
+FUSE_DESC=			Enable drive redirection via FUSE (experimental)
+MP3LAME_DESC=			Enable MP3 Lame for audio redirection
+OPUS_DESC=			Enable Opus for audio redirection
 
-DEBUG_CONFIGURE_ENABLE=	devel-debug devel-logging
+DEBUG_CONFIGURE_ENABLE=		devel-debug devel-logging
 FDKAAC_CONFIGURE_ENABLE=	fdkaac
-FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
-FUSE_CONFIGURE_ENABLE=	fuse
-FUSE_USES=		fuse
-IPV6_CONFIGURE_ENABLE=	ipv6
+FDKAAC_LIB_DEPENDS=		libfdk-aac.so:audio/fdk-aac
+FUSE_CONFIGURE_ENABLE=		fuse
+FUSE_USES=			fuse
+IPV6_CONFIGURE_ENABLE=		ipv6
 MP3LAME_CONFIGURE_ENABLE=	mp3lame
-MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
-OPUS_CONFIGURE_ENABLE=	opus
-OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+MP3LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
+OPUS_CONFIGURE_ENABLE=		opus
+OPUS_LIB_DEPENDS=		libopus.so:audio/opus
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 # As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto
 # cannot be obtained automatically via pkgconfig. When compiled with base
 # OpenSSL, it needs to be specified explicitly.
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|0.9.80|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR}
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
 .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 5b5c38958193..ecd9598b3cf4 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -1,94 +1,98 @@
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.21
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR?=	${PORTNAME}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 WWW=		http://www.xrdp.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
-RUN_DEPENDS=	xterm:x11/xterm \
+RUN_DEPENDS=	${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp \
 		${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
-		${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
+		xterm:x11/xterm
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
-USES=		autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \
-		ssl xorg
+USES=		autoreconf:build compiler:c11 cpe jpeg libtool localbase \
+		pkgconfig ssl xorg
 CPE_VENDOR=	neutrinolabs
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_TUPLE=	neutrinolabs:librfxcodec:v0.1.6:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter
 
-CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
-		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
+CONFIGURE_ARGS=	--enable-imlib2 \
+		--enable-jpeg \
+		--enable-painter \
 		--enable-pam-config=freebsd \
-		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \
-		--enable-imlib2
+		--enable-pixman \
+		--enable-rfxcodec \
+		--enable-strict-locations \
+		--localstatedir=/var \
+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 LDFLAGS+=	-lssl
 CONFLICTS=	xrdp-devel
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
-OPTIONS_DEFINE=	DEBUG FUSE IPV6
-OPTIONS_DEFAULT=	FDKAAC OPUS
-OPTIONS_GROUP=	AUDIO_CODEC
+OPTIONS_DEFINE=			DEBUG FUSE IPV6
+OPTIONS_DEFAULT=		FDKAAC OPUS
+OPTIONS_GROUP=			AUDIO_CODEC
 OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
-FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
-FUSE_DESC=	Enable drive redirection via FUSE (experimental)
-MP3LAME_DESC=	Enable MP3 Lame for audio redirection
-OPUS_DESC=	Enable Opus for audio redirection
+FDKAAC_DESC=			Enable Fraunhofer FDK AAC for audio redirection
+FUSE_DESC=			Enable drive redirection via FUSE (experimental)
+MP3LAME_DESC=			Enable MP3 Lame for audio redirection
+OPUS_DESC=			Enable Opus for audio redirection
 
-DEBUG_CONFIGURE_ENABLE=	devel-debug devel-logging
+DEBUG_CONFIGURE_ENABLE=		devel-debug devel-logging
 FDKAAC_CONFIGURE_ENABLE=	fdkaac
-FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
-FUSE_CONFIGURE_ENABLE=	fuse
-FUSE_USES=		fuse
-IPV6_CONFIGURE_ENABLE=	ipv6
+FDKAAC_LIB_DEPENDS=		libfdk-aac.so:audio/fdk-aac
+FUSE_CONFIGURE_ENABLE=		fuse
+FUSE_USES=			fuse
+IPV6_CONFIGURE_ENABLE=		ipv6
 MP3LAME_CONFIGURE_ENABLE=	mp3lame
-MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
-OPUS_CONFIGURE_ENABLE=	opus
-OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+MP3LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
+OPUS_CONFIGURE_ENABLE=		opus
+OPUS_LIB_DEPENDS=		libopus.so:audio/opus
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 # As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto
 # cannot be obtained automatically via pkgconfig. When compiled with base
 # OpenSSL, it needs to be specified explicitly.
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 .endif
 
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 
 post-patch:
 	${REINPLACE_CMD} -e "s|^param=Xorg|param=${LOCALBASE}/libexec/Xorg|" \
 		${WRKSRC}/sesman/sesman.ini.in
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR}
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
 .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor
 
 .include <bsd.port.post.mk>