Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 May 2021 22:32:06 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 00e1f8685513 - main - x11/sterm: only use general nonconflicting patches
Message-ID:  <202105052232.145MW6HX058669@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

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

commit 00e1f8685513f3d0294593b269b2629c890762b1
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-05-05 22:31:39 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-05-05 22:31:39 +0000

    x11/sterm: only use general nonconflicting patches
    
    Differential review:    https://reviews.freebsd.org/D29983
---
 x11/sterm/Makefile | 14 ++++----------
 x11/sterm/distinfo |  8 +++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index b2e73dbde376..53fee65fa827 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -26,22 +26,16 @@ BINARY_ALIAS=	tic=true
 PORTDATA=	config.def.h st.info
 PORTDOCS=	FAQ LEGACY README TODO
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_RADIO=	PATCHES
-OPTIONS_RADIO_PATCHES=	OPEN_COPIED_URL SCROLLBACK SOLARIZED
-OPEN_COPIED_URL_DESC=	Open contents of the clipboard in a user-defined browser
+OPTIONS_DEFINE=	DOCS SCROLLBACK XRESOURCES
 SCROLLBACK_DESC=	Scroll back through terminal output
-SOLARIZED_DESC=	Use Solarized color scheme
-
-OPEN_COPIED_URL_PATCH_SITES=	https://st.suckless.org/patches/open_copied_url/
-OPEN_COPIED_URL_PATCHFILES=	st-openclipboard-20190202-3be4cf1.diff:-p1
+XRESOURCES_DESC=	Allow to handle settings from Xresources
 
 SCROLLBACK_PATCH_SITES=	https://st.suckless.org/patches/scrollback/
 SCROLLBACK_PATCHFILES=	st-scrollback-0.8.4.diff:-p1 \
 			st-scrollback-mouse-20191024-a2c479c.diff:-p1
 
-SOLARIZED_PATCH_SITES=	https://st.suckless.org/patches/solarized/
-SOLARIZED_PATCHFILES=	st-solarized-both-0.8.4.diff:-p1
+XRESOURCES_PATCH_SITES=	https://st.suckless.org/patches/xresources/
+XRESOURCES_PATCHFILES=	st-xresources-20200604-9ba7ecf.diff:-p1
 
 pre-everything::
 	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
diff --git a/x11/sterm/distinfo b/x11/sterm/distinfo
index e7c593206066..9aeb9b618e0c 100644
--- a/x11/sterm/distinfo
+++ b/x11/sterm/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1608642179
+TIMESTAMP = 1618581025
 SHA256 (st-0.8.4.tar.gz) = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
 SIZE (st-0.8.4.tar.gz) = 47330
-SHA256 (st-openclipboard-20190202-3be4cf1.diff) = e7a1a8dd90b30286236baafec2a00113aca21c91f4e9cbb2ec4a519f224274cb
-SIZE (st-openclipboard-20190202-3be4cf1.diff) = 1692
 SHA256 (st-scrollback-0.8.4.diff) = 418e1c5df11105482f13a008218c89eadb974630c25b4a6ff3da763dc2560e44
 SIZE (st-scrollback-0.8.4.diff) = 8904
 SHA256 (st-scrollback-mouse-20191024-a2c479c.diff) = 319458d980195d18fa0f81a6898d58f8d046c5ff982ab872d741f54bb60e267d
 SIZE (st-scrollback-mouse-20191024-a2c479c.diff) = 622
-SHA256 (st-solarized-both-0.8.4.diff) = 0dc844dc62872499c0c627054cebd2451c8cf0a22071425e7c499fab7b905263
-SIZE (st-solarized-both-0.8.4.diff) = 5214
+SHA256 (st-xresources-20200604-9ba7ecf.diff) = 5be9b40d2b51761685f6503e92028a7858cc6571a8867b88612fce8a70514d5b
+SIZE (st-xresources-20200604-9ba7ecf.diff) = 4840



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105052232.145MW6HX058669>