commit 9f45bbb9663b57cbe047f5e852ad36999855fe16
parent 3944a657eddb7911eb928ad11ec998bc38ffa48c
Author: FRIGN <dev@frign.de>
Date: Sun, 20 Sep 2015 20:54:51 +0200
Update st-openbsd patch-page
Diffstat:
4 files changed, 64 insertions(+), 67 deletions(-)
diff --git a/st.suckless.org/patches/openbsd.md b/st.suckless.org/patches/openbsd.md
@@ -0,0 +1,37 @@
+openbsd
+=======
+
+Description
+-----------
+
+OpenBSD primariley searches for terminfo descriptions in
+terminfo databases before considering terminfo files.
+Given the terminfo currently stored in the global database
+is for st 0.1.1, this leads to conflicts and misbehaviour.
+
+This patch renames st to st-git to force OpenBSD to use
+the provided terminfo file.
+
+
+Notes
+-----
+
+Once a new stable version of st is out, the corresponding changes
+to st.info can be pushed upstream to ncurses and then be merged
+back to OpenBSD, effectively making this patch obsolete for
+future stable releases.
+More information on this issue can be found in this
+[thread](http://marc.info/?l=openbsd-misc&m=139540215025526&w=2)
+
+
+Download
+--------
+
+* [st-git-20150920-openbsd.diff](st-git-20150920-openbsd.diff)
+
+
+Authors
+-------
+
+ * Nils Reuße - nilsreusse@gmail.com
+ * Laslo Hunhold - dev@frign.de (st-git-20150920 port)
diff --git a/st.suckless.org/patches/st-git-20150920-openbsd.diff b/st.suckless.org/patches/st-git-20150920-openbsd.diff
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index 6158ab2..9b81f88 100644
+--- a/Makefile
++++ b/Makefile
+@@ -49,7 +49,8 @@ install: all
+ @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
+ @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+ @echo Please see the README file regarding the terminfo entry of st.
+- @tic -s st.info
++ @sed 's/st\([^t].*\)/st-git\1/g' st.info > st-git.info
++ @tic -s st-git.info
+
+ uninstall:
+ @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+diff --git a/config.def.h b/config.def.h
+index b6adc5e..ffc2e74 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -63,7 +63,7 @@ static unsigned int cursorthickness = 2;
+ static int bellvolume = 0;
+
+ /* TERM value */
+-static char termname[] = "st-256color";
++static char termname[] = "st-git-256color";
+
+ static unsigned int tabspaces = 8;
+
diff --git a/st.suckless.org/patches/st-on-openbsd.diff b/st.suckless.org/patches/st-on-openbsd.diff
@@ -1,25 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -49,7 +49,8 @@
- @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
- @echo Please see the README file regarding the terminfo entry of st.
-- @tic -s st.info
-+ @sed 's/st\([^t].*\)/st-git\1/g' st.info > st-git.info
-+ @tic -s st-git.info
-
- uninstall:
- @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-diff --git a/config.def.h b/config.def.h
---- a/config.def.h
-+++ b/config.def.h
-@@ -44,7 +44,7 @@
- static int bellvolume = 0;
-
- /* TERM value */
--static char termname[] = "st-256color";
-+static char termname[] = "st-git-256color";
-
- static unsigned int tabspaces = 8;
-
diff --git a/st.suckless.org/patches/st_on_openbsd.md b/st.suckless.org/patches/st_on_openbsd.md
@@ -1,42 +0,0 @@
-st on OpenBSD
-=============
-
-Description
------------
-
-On OpenBSD, terminfo descriptions are searched for in terminfo
-databases, before terminfo files are considered. At present,
-the terminfo information stored in the systemwide terminfo db
-are from st version 0.1.1, conflicting with newer versions of
-st and thus causing misbehaviour. This patch renames the name
-of st to st-git, so that no terminfo description can be found
-in the OpenBSD database, and therefore the right information is
-loaded from the installed terminfo file.
-
-
-Notes
------
-
-I tested this diff with the latest code from git, but the principle
-applies to the released versions of st as well, i just have not tried
-them. Once a new stable version of st is out, the corresponding
-changes to st.info can be pushed upstream (to ncurses) and then be
-merged back to OpenBSD, making this patch obsolete for future stable
-versions of st. More information on the issue can be found in this
-[thread][1].
-
-
-
-Download
---------
-
-* [st-on-openbsd.diff][2]
-
-[1]: http://marc.info/?l=openbsd-misc&m=139540215025526&w=2
-[2]: st-on-openbsd.diff
-
-
-Author
-------
-
- * Nils Reuße - nilsreusse @ gmail
