From owner-dev-commits-ports-main@freebsd.org Tue Sep 28 05:37:24 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBE36677030; Tue, 28 Sep 2021 05:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HJSv84DSLz3vQv; Tue, 28 Sep 2021 05:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 66CA81EF1E; Tue, 28 Sep 2021 05:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18S5bOfE029365; Tue, 28 Sep 2021 05:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18S5bOWj029364; Tue, 28 Sep 2021 05:37:24 GMT (envelope-from git) Date: Tue, 28 Sep 2021 05:37:24 GMT Message-Id: <202109280537.18S5bOWj029364@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 1f3a2e6d22b9 - main - x11/xterm: Update to 369 and modernize options MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f3a2e6d22b9bf3d246809480ac490ad2c26afba Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2021 05:37:24 -0000 The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f3a2e6d22b9bf3d246809480ac490ad2c26afba commit 1f3a2e6d22b9bf3d246809480ac490ad2c26afba Author: Emanuel Haupt AuthorDate: 2021-09-28 05:37:20 +0000 Commit: Emanuel Haupt 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@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 - -.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