Hello,
I am reaching out to discuss the possibility of adding an xresources
flavor to x11/st. In my opinion, this addition would greatly enhance the
functionality of the program by allowing it to read colors and a font
from the .Xresources file.
Personally, I find it beneficial to set Solarized colors in my
.Xresources file as it helps reduce eye strain. By incorporating this
flavor, it would simplify the process of setting up my development
environment after a fresh OpenBSD installation.
I've attached a diff for your review. I'd greatly appreciate it if you
could take a look and let me know if it meets the necessary
requirements.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/st/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 12 Jan 2023 21:00:13 -0000 1.26
+++ Makefile 18 Jul 2023 05:17:24 -0000
@@ -2,7 +2,12 @@ COMMENT= simple X terminal
V= 0.9
DISTNAME= st-${V}
-SUPDISTFILES= st-scrollback-0.8.5.diff:0
+
+PATCH_SCROLLBACK= st-scrollback-0.8.5.diff:0
+PATCH_XRESOURCES= st-xresources-20230320-45a15676.diff:1
+SUPDISTFILES= ${PATCH_SCROLLBACK} \
+ ${PATCH_XRESOURCES}
+
REVISION= 0
CATEGORIES= x11
@@ -19,6 +24,7 @@ WANTLIB= X11 Xft c fontconfig freetype
MASTER_SITES= https://dl.suckless.org/st/
MASTER_SITES0= https://st.suckless.org/patches/scrollback/
+MASTER_SITES1= https://st.suckless.org/patches/xresources/
MAKE_ENV= LDFLAGS="${LDFLAGS}" \
X11INC=${X11BASE}/include \
@@ -26,12 +32,17 @@ MAKE_ENV= LDFLAGS="${LDFLAGS}" \
NO_TEST= Yes
-FLAVORS= scrollback
+FLAVORS= scrollback xresources
FLAVOR?=
.if ${FLAVOR:Mscrollback}
-PATCHFILES= ${SUPDISTFILES}
+PATCHFILES+= ${PATCH_SCROLLBACK}
.endif
+
+.if ${FLAVOR:Mxresources}
+PATCHFILES+= ${PATCH_XRESOURCES}
+.endif
+
PATCH_DIST_STRIP= -p1
do-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/st/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 12 Jan 2023 21:00:13 -0000 1.17
+++ distinfo 18 Jul 2023 05:17:24 -0000
@@ -1,4 +1,6 @@
SHA256 (st-0.9.tar.gz) = 82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=
SHA256 (st-scrollback-0.8.5.diff) =
3H9SI7JvyBPZHUrjW9qlTWMCTK6fGK/Zs1lLozmd+lU=
+SHA256 (st-xresources-20230320-45a15676.diff) =
/ETVhdSM8d+wD7MMTixM+RmLd/VakfaO974mpcdXBKg=
SIZE (st-0.9.tar.gz) = 48171
SIZE (st-scrollback-0.8.5.diff) = 8914
+SIZE (st-xresources-20230320-45a15676.diff) = 4853
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/st/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 12 Jan 2023 21:00:14 -0000 1.2
+++ pkg/DESCR 18 Jul 2023 05:17:24 -0000
@@ -3,3 +3,4 @@ st is a simple virtual terminal emulator
Flavour:
scrollback - allows scrolling through terminal output with
shift+pgup/pgdn
+ xresources - configure st through Xresources