git: cf3b464ef8a7 - main - net/xrdp: Pet portclippy/portfmt and bump PORTREVISION

The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf3b464ef8a746b4109e3176b1a6c92b52c4e338

commit cf3b464ef8a746b4109e3176b1a6c92b52c4e338
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2024-12-26 14:31:42 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-12-26 23:24:36 +0000

    net/xrdp: Pet portclippy/portfmt and bump PORTREVISION
    
    after OPTIONS changes in the previous commit.
    
    PR:             283627
    Approved by:    meta@ (myself, maintainer)
---
 net/xrdp/Makefile | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 5f915324c226..3fdb08df40c3 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -15,19 +15,17 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
 		xterm:x11/xterm
-LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 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_XORG=	ice pixman sm x11 xfixes xrandr
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-
 CONFIGURE_ARGS=	--enable-imlib2 \
 		--enable-jpeg \
 		--enable-painter \
@@ -38,15 +36,14 @@ CONFIGURE_ARGS=	--enable-imlib2 \
 		--enable-vsock \
 		--localstatedir=/var \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
+
+INSTALL_TARGET=	install-strip
+
 LDFLAGS+=	-lssl
 CONFLICTS=	xrdp-devel
-INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
-USER=		_xrdp
-GROUP=		_xrdp
-
 OPTIONS_DEFINE=			DEBUG FUSE IPV6
 OPTIONS_DEFAULT=		FDKAAC OPENH264 OPUS X264
 OPTIONS_GROUP=			AUDIO_CODEC VIDEO_CODEC
@@ -59,19 +56,24 @@ OPENH264_DESC=			H.264 video codec support via OpenH264
 OPUS_DESC=			Enable Opus for audio redirection
 
 DEBUG_CONFIGURE_ENABLE=		devel-debug devel-logging
-FDKAAC_CONFIGURE_ENABLE=	fdkaac
 FDKAAC_LIB_DEPENDS=		libfdk-aac.so:audio/fdk-aac
-FUSE_CONFIGURE_ENABLE=		fuse
+FDKAAC_CONFIGURE_ENABLE=	fdkaac
 FUSE_USES=			fuse
+FUSE_CONFIGURE_ENABLE=		fuse
 IPV6_CONFIGURE_ENABLE=		ipv6
-MP3LAME_CONFIGURE_ENABLE=	mp3lame
 MP3LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
-OPENH264_CONFIGURE_ENABLE=	openh264
+MP3LAME_CONFIGURE_ENABLE=	mp3lame
 OPENH264_LIB_DEPENDS=		libopenh264.so:multimedia/openh264
-OPUS_CONFIGURE_ENABLE=		opus
+OPENH264_CONFIGURE_ENABLE=	openh264
 OPUS_LIB_DEPENDS=		libopus.so:audio/opus
-X264_CONFIGURE_ENABLE=		x264
+OPUS_CONFIGURE_ENABLE=		opus
 X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
+X264_CONFIGURE_ENABLE=		x264
+
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
+GROUP=		_xrdp
+USER=		_xrdp
 
 .include <bsd.port.pre.mk>
 
@@ -97,7 +99,8 @@ 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 gfx.toml
+.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini \
+	gfx.toml
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor