I'd quite like to have a package for st built with scrollback support.

Here's a diff adding it as a flavour to the x11/st port, is it ok to
add it there?

I understand if there are concerns about the patch getting in the way
of updates; I stuck to the basic patch rather than stacking others from
https://st.suckless.org/patches/scrollback/ on top to reduce the risk
of this and I'm hopeful that it's a common enough patch (and not too
complex) that it will either be fixed quickly or easy to adapt, but
if that still seems too much then I could write a separate port for
it instead.

Sync WANTLIB while there.

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/st/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile    12 Oct 2022 18:06:29 -0000      1.25
+++ Makefile    11 Jan 2023 13:38:40 -0000
@@ -2,6 +2,8 @@ COMMENT=                simple X terminal

 V=                     0.9
 DISTNAME=              st-${V}
+SUPDISTFILES=          st-scrollback-0.8.5.diff:0
+REVISION=              0

 CATEGORIES=            x11

@@ -13,15 +15,24 @@ MAINTAINER=         Joerg Jung <j...@openbsd.or
 PERMIT_PACKAGE=        Yes

 # uses pledge()
-WANTLIB=               X11 Xft c fontconfig freetype m util z
+WANTLIB=               X11 Xft c fontconfig freetype m util

 MASTER_SITES=          https://dl.suckless.org/st/
+MASTER_SITES0=         https://st.suckless.org/patches/scrollback/

 MAKE_ENV=              LDFLAGS="${LDFLAGS}" \
                        X11INC=${X11BASE}/include \
                        X11LIB=${X11BASE}/lib

 NO_TEST=               Yes
+
+FLAVORS=               scrollback
+FLAVOR?=
+
+.if ${FLAVOR:Mscrollback}
+PATCHFILES=            ${SUPDISTFILES}
+.endif
+PATCH_DIST_STRIP=      -p1

 do-install:
        ${INSTALL_PROGRAM} ${WRKBUILD}/st ${PREFIX}/bin/
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/st/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo    12 Oct 2022 18:06:29 -0000      1.16
+++ distinfo    11 Jan 2023 13:38:40 -0000
@@ -1,2 +1,4 @@
 SHA256 (st-0.9.tar.gz) = 82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=
+SHA256 (st-scrollback-0.8.5.diff) = 
3H9SI7JvyBPZHUrjW9qlTWMCTK6fGK/Zs1lLozmd+lU=
 SIZE (st-0.9.tar.gz) = 48171
+SIZE (st-scrollback-0.8.5.diff) = 8914
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/st/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   23 Sep 2011 14:41:31 -0000      1.1.1.1
+++ pkg/DESCR   11 Jan 2023 13:38:40 -0000
@@ -1 +1,5 @@
 st is a simple virtual terminal emulator for X which sucks less.
+
+Flavour:
+       scrollback - allows scrolling through terminal output with
+                       shift+pgup/pgdn

Reply via email to