svn commit: r563874 - head/x11/xterm

[Emanuel Haupt]

Author: ehaupt
Date: Wed Feb  3 10:33:45 2021
New Revision: 563874
URL: https://svnweb.freebsd.org/changeset/ports/563874

Log:
  Use portclippy/portfmt (no functional change)

Modified:
  head/x11/xterm/Makefile

Modified: head/x11/xterm/Makefile
==============================================================================
--- head/x11/xterm/Makefile	Wed Feb  3 09:33:57 2021	(r563873)
+++ head/x11/xterm/Makefile	Wed Feb  3 10:33:45 2021	(r563874)
@@ -6,7 +6,8 @@ PORTVERSION=	364
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1 \
-		LOCAL/ehaupt:src1 LOCAL/ehaupt:src2
+		LOCAL/ehaupt:src1 \
+		LOCAL/ehaupt:src2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src1 \
 		bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2
 
@@ -16,76 +17,73 @@ COMMENT=	Terminal emulator for the X Window System
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe localbase ncurses tar:tgz xorg
-USE_XORG=	xft xmu xt x11 xext xpm ice
+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 
-GNU_CONFIGURE=	yes
+USES=			cpe localbase ncurses tar:tgz xorg
+CPE_VENDOR=		invisible-island
+USE_XORG=		ice x11 xext xft xmu xpm xt
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-narrowproto \
+			--with-utempter
 
-CPE_VENDOR=	invisible-island
+CPPFLAGS+=	-DPIXMAP_ROOTDIR=${LOCALBASE}/share/pixmaps
 
-CONFIGURE_ARGS+=	--with-utempter --enable-narrowproto
-
 CONFLICTS=	x11iraf-[0-9]*
 
-ICONVERSION=	1
+OPTIONS_DEFINE=		256COLOR DABBREV DECTERM GNOME LOGGING LUIT PCRE2 REGIS \
+			SCRNDUMP SIXEL TOOLBAR WCHAR XINERAMA
+OPTIONS_DEFAULT=	256COLOR LUIT SIXEL WCHAR
+OPTIONS_RADIO=		3D
+OPTIONS_RADIO_3D=	NEXTAW XAW3D XAW3DXFT
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE2 DABBREV 256COLOR SIXEL GNOME LOGGING \
-		SCRNDUMP REGIS TOOLBAR XINERAMA
-OPTIONS_RADIO=	3D
-OPTIONS_RADIO_3D=	XAW3D XAW3DXFT NEXTAW
-
+256COLOR_DESC=	Enable 256-color support
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
-LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
-SIXEL_DESC=	Enable Sixel graphics support
-REGIS_DESC=	Enable ReGIS graphics support
-WCHAR_DESC=	Enable wide-character support
-256COLOR_DESC=	Enable 256-color support
 LOGGING_DESC=	Enable logging terminal I/O to a file
-XAW3D_DESC=	Link with Xaw 3d library
-XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
+LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
 NEXTAW_DESC=	Link with neXT Athena library
+PCRE2_DESC=	${PCRE_DESC} version 2
+REGIS_DESC=	Enable ReGIS graphics support
 SCRNDUMP_DESC=	Enable XHTML and SVG screen dumps
+SIXEL_DESC=	Enable Sixel graphics support
 TOOLBAR_DESC=	Enable pulldown menus with a toolbar
-PCRE2_DESC=	${PCRE_DESC} version 2
+WCHAR_DESC=	Enable wide-character support
+XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
+XAW3D_DESC=	Link with Xaw 3d library
 
-OPTIONS_DEFAULT=WCHAR LUIT 256COLOR SIXEL
-
 256COLOR_CONFIGURE_ENABLE=	256-color
+DABBREV_CONFIGURE_ENABLE=	dabbrev
+DECTERM_CONFIGURE_ENABLE=	dec-locator
+GNOME_USES=			desktop-file-utils
+LOGGING_CONFIGURE_ENABLE=	logging
+LUIT_IMPLIES=			WCHAR
 LUIT_BUILD_DEPENDS=		luit:x11/luit
 LUIT_CONFIGURE_ENABLE=		luit
-LUIT_IMPLIES=			WCHAR
-WCHAR_CONFIGURE_ENABLE=		wide-chars
-WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
-DECTERM_CONFIGURE_ENABLE=	dec-locator
-PCRE2_CONFIGURE_WITH=		pcre2
+NEXTAW_LIB_DEPENDS=		libneXtaw.so:x11-toolkits/neXtaw
+NEXTAW_CONFIGURE_WITH=		neXtaw
 PCRE2_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
-DABBREV_CONFIGURE_ENABLE=	dabbrev
-SIXEL_CONFIGURE_ENABLE=		sixel-graphics
+PCRE2_CONFIGURE_WITH=		pcre2
 REGIS_CONFIGURE_ENABLE=		regis-graphics
-GNOME_USES=			desktop-file-utils
-LOGGING_CONFIGURE_ENABLE=	logging
 SCRNDUMP_CONFIGURE_ENABLE=	screen-dumps
-XAW3D_CONFIGURE_WITH=		Xaw3d
-XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
-XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
-XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:x11-toolkits/libxaw3dxft
-NEXTAW_CONFIGURE_WITH=		neXtaw
-NEXTAW_LIB_DEPENDS=		libneXtaw.so:x11-toolkits/neXtaw
+SIXEL_CONFIGURE_ENABLE=		sixel-graphics
 TOOLBAR_CONFIGURE_ENABLE=	toolbar
 WCHAR_LIB_DEPENDS=		libfreetype.so:print/freetype2
+WCHAR_CONFIGURE_ENABLE=		wide-chars
+WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
+XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:x11-toolkits/libxaw3dxft
+XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
+XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
+XAW3D_CONFIGURE_WITH=		Xaw3d
 XINERAMA_USE=			XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=		--without-xinerama
 
-LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
-
-CPPFLAGS+=	-DPIXMAP_ROOTDIR=${LOCALBASE}/share/pixmaps
-
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MXAW3D} && ! ${PORT_OPTIONS:MXAW3DXFT} && ! ${PORT_OPTIONS:MNEXTAW}
 USE_XORG+=	xaw
 .endif
+
+ICONVERSION=	1
 
 post-extract:
 	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \