git: 1f3a2e6d22b9 - main - x11/xterm: Update to 369 and modernize options

[Emanuel Haupt]

The branch main has been updated by ehaupt:

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

commit 1f3a2e6d22b9bf3d246809480ac490ad2c26afba
Author:     Emanuel Haupt <ehaupt at FreeBSD.org>
AuthorDate: 2021-09-28 05:37:20 +0000
Commit:     Emanuel Haupt <ehaupt at FreeBSD.org>
CommitDate: 2021-09-28 05:37:20 +0000

    x11/xterm: Update to 369 and modernize options
    
    The options helpers improvement has been submitted by sid at bsdmail.com
    via private mail.
---
 x11/xterm/Makefile | 16 ++++++----------
 x11/xterm/distinfo |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 20780c6bc369..ebabec2c7be3 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,7 +1,7 @@
 # Created by: krion
 
 PORTNAME=	xterm
-PORTVERSION=	368
+PORTVERSION=	369
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1 \
@@ -31,9 +31,9 @@ CONFLICTS=	x11iraf-[0-9]*
 
 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_DEFAULT=	256COLOR LUIT SIXEL WCHAR XAW
+OPTIONS_SINGLE=		ATHENA
+OPTIONS_SINGLE_ATHENA=	XAW NEXTAW XAW3D XAW3DXFT
 
 256COLOR_DESC=	Enable 256-color support
 DABBREV_DESC=	Enable support for dabbrev-expand
@@ -49,6 +49,7 @@ TOOLBAR_DESC=	Enable pulldown menus with a toolbar
 WCHAR_DESC=	Enable wide-character support
 XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
 XAW3D_DESC=	Link with Xaw 3d library
+XAW_DESC=	Link with Xaw library
 
 256COLOR_CONFIGURE_ENABLE=	256-color
 DABBREV_CONFIGURE_ENABLE=	dabbrev
@@ -75,12 +76,7 @@ XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_WITH=		Xaw3d
 XINERAMA_USE=			XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=		--without-xinerama
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MXAW3D} && ! ${PORT_OPTIONS:MXAW3DXFT} && ! ${PORT_OPTIONS:MNEXTAW}
-USE_XORG+=	xaw
-.endif
+XAW_USE=			XORG=xaw
 
 ICONVERSION=	1
 
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index e86d36e18dc2..71ac17ad2972 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1623124435
-SHA256 (xterm-368.tgz) = 2ff5169930b6b49ef0bafb5e1331c94f1a98c310442bba7798add821c76ae712
-SIZE (xterm-368.tgz) = 1451700
+TIMESTAMP = 1632767995
+SHA256 (xterm-369.tgz) = 71ed6a48d064893d2149741a002781a973496fd24d52dadd364f63439a764e26
+SIZE (xterm-369.tgz) = 1461310
 SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c
 SIZE (bsd-xterm-icons-1.tgz) = 22718