[crux-commits] ports/contrib (refs/remotes/origin/3.6): Take ownership of st; merge in my former st-xrdb (via #crux-devel)

crux at crux.nu crux at crux.nu
Sat Apr 10 19:05:59 UTC 2021


commit fc22292084adfd63025569afe42fe8206d633181
Author: Steffen Nurpmeso <steffen at sdaoden.eu>
Date:   Tue Jan 26 23:50:15 2021 +0100

    Take ownership of st; merge in my former st-xrdb (via #crux-devel)

diff --git a/st-xrdb/.footprint b/st-xrdb/.footprint
deleted file mode 100644
index c5a5ff60d..000000000
--- a/st-xrdb/.footprint
+++ /dev/null
@@ -1,7 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/st
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/st.1.gz
diff --git a/st-xrdb/.signature b/st-xrdb/.signature
deleted file mode 100644
index 41af04085..000000000
--- a/st-xrdb/.signature
+++ /dev/null
@@ -1,6 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31nF+825pdDsk9g6HJBqs5V3jPe5f+zSFY/BFGHvJ4uhkt5AwvgoinlzVMLYNjdGNbX2txrYzj8J60FxBMl4sw4=
-SHA256 (Pkgfile) = a851c6d51f52b8717b22bb8a25b15c1860f614109bd4599adb8bc1fbe24426d6
-SHA256 (.footprint) = 691a6289f6a50fbf5ac809a9575739a0cf939045f0b1b24f28847765a13a620b
-SHA256 (st-0.8.4.tar.gz) = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
-SHA256 (st-xrdb.patch) = fde468790e3574f1ebfc9e56742e17e5eca33ee94e6b093b58f2e61457c9938c
diff --git a/st-xrdb/Pkgfile b/st-xrdb/Pkgfile
deleted file mode 100644
index dae2dd07b..000000000
--- a/st-xrdb/Pkgfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Description: Simple terminal emulator for X, with X resource support (patch)
-# URL:         https://st.suckless.org
-# Maintainer:  Steffen Nurpmeso, steffen at sdaoden dot eu
-# Depends on:  fontconfig freetype xorg-libx11 xorg-libxext xorg-libxft 
-
-name=st-xrdb
-version=0.8.4
-release=2
-realn=st
-source=(https://dl.suckless.org/$realn/$realn-$version.tar.gz \
-   st-xrdb.patch)
-
-build() {
-   cd $realn-$version
-
-   patch -p1 -i $SRC/st-xrdb.patch
-
-   sed -i '/tic/d' Makefile
-
-   make CC="${CC:-cc}" PREFIX=/usr \
-         X11INC=/usr/include/X11 X11LIB=/usr/lib \
-         DESTDIR="$PKG" \
-      all install
-}
-
-# s-sh-mode
diff --git a/st/.footprint b/st/.footprint
index 703a73e90..c5a5ff60d 100644
--- a/st/.footprint
+++ b/st/.footprint
@@ -5,10 +5,3 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/st.1.gz
-drwxr-xr-x	root/root	usr/share/terminfo/
-drwxr-xr-x	root/root	usr/share/terminfo/s/
--rw-r--r--	root/root	usr/share/terminfo/s/st-bs
--rw-r--r--	root/root	usr/share/terminfo/s/st-bs-256color
--rw-r--r--	root/root	usr/share/terminfo/s/st-meta
--rw-r--r--	root/root	usr/share/terminfo/s/st-meta-256color
--rw-r--r--	root/root	usr/share/terminfo/s/st-mono
diff --git a/st/.signature b/st/.signature
index 936d99487..b570bd0eb 100644
--- a/st/.signature
+++ b/st/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33ix7RoBOIDlwKIVQmqFjjXVP3ek/VBbWxnMpjw/woZ9rWAVO8EQkwhYaz+9bj9c194e7+ae3N+HihTKJqL63AY=
-SHA256 (Pkgfile) = 56b3e9217dd7b68c4b5fb80f772dbb42220f03547c70d058557dec168ba3e064
-SHA256 (.footprint) = a618d1642b1e13760c409d8128517cb09af28b02e1c19c18b0260f9e59738862
+RWSagIOpLGJF39uDaLUazyyVHnI4OzB2q8Il4g303Y8k5JGPADyNfioHs+cDG0s5oej9jj+s9FuLOTnv1zTNN7M8j80+GtiCvg4=
+SHA256 (Pkgfile) = 9e1e6b7711c401a3406db10e417605e4b462eee67a10755170721fd61a0c6945
+SHA256 (.footprint) = 691a6289f6a50fbf5ac809a9575739a0cf939045f0b1b24f28847765a13a620b
 SHA256 (st-0.8.4.tar.gz) = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
+SHA256 (xrdb-plus.patch) = fde468790e3574f1ebfc9e56742e17e5eca33ee94e6b093b58f2e61457c9938c
diff --git a/st/Pkgfile b/st/Pkgfile
index 007c40924..61b8f239e 100644
--- a/st/Pkgfile
+++ b/st/Pkgfile
@@ -1,23 +1,26 @@
-# Description: simple terminal implementation for X
-# URL:         https://st.suckless.org/
-# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  xorg-libxext xorg-libxft
+# Description: Simple terminal emulator for X, with X resource support (patch)
+# URL:         https://st.suckless.org
+# Maintainer:  Steffen Nurpmeso, steffen at sdaoden dot eu
+# Depends on:  fontconfig freetype xorg-libx11 xorg-libxext xorg-libxft 
 
 name=st
 version=0.8.4
 release=1
-source=(https://dl.suckless.org/st/$name-$version.tar.gz)
+realn=st
+source=(https://dl.suckless.org/$realn/$realn-$version.tar.gz \
+   xrdb-plus.patch)
 
-build () {
-	cd "$name-$version"
+build() {
+   cd $realn-$version
 
-	if [ -f $PKGMK_ROOT/config.h ]; then
-		cp $PKGMK_ROOT/config.h .
-	fi
+   patch -p1 -i $SRC/xrdb-plus.patch
 
-	make CC=gcc
-	make DESTDIR=$PKG PREFIX=/usr TERMINFO=$PKG/usr/share/terminfo install
+   sed -i '/tic/d' Makefile
 
-	# Remove duplicates of files from ncurses
-	rm -f $PKG/usr/share/terminfo/s/{st,st-256color}
+   make CC="${CC:-cc}" PREFIX=/usr \
+         X11INC=/usr/include/X11 X11LIB=/usr/lib \
+         DESTDIR="$PKG" \
+      all install
 }
+
+# s-sh-mode
diff --git a/st/README b/st/README
deleted file mode 100644
index 186ca063e..000000000
--- a/st/README
+++ /dev/null
@@ -1,14 +0,0 @@
-The configuration of st is done by creating a custom config.h
-and (re)compiling the source code. To create a custom config.h,
-unpack the tarball, copy the file st-$version/config.def.h to
-st's port directory, and edit to suit your preferences. Then,
-when you call pkgmk in the st port directory, the custom
-config.h will be detected and copied into the source before
-compilation. I recommend that you save a copy your custom config.h
-some where other than the st port directory, so that your changes
-won't get nuked when updating ports or performing a prtsweep or
-prtwash (see opt/prt-utils for more information about those two).
-
-Another solution for customizing st is to create a custom and
-(preferably) private port that contains your custom config and also
-might include patches, such as from https://suckless.org/patches/.
diff --git a/st-xrdb/st-xrdb.patch b/st/xrdb-plus.patch
similarity index 100%
rename from st-xrdb/st-xrdb.patch
rename to st/xrdb-plus.patch


More information about the crux-commits mailing list