diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 07:02:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 07:04:18 +0000 |
| commit | b5435c067ef5abdc4cff905f9737e20f60fd53e6 (patch) | |
| tree | 718360685dc9c8f667c0f8a7bbb8439c84218869 /main/st | |
| parent | 5ffb92306aad9af577fb29a93b354c30b9c57e45 (diff) | |
| download | aports-b5435c067ef5abdc4cff905f9737e20f60fd53e6.tar.bz2 aports-b5435c067ef5abdc4cff905f9737e20f60fd53e6.tar.xz | |
main/st: use terminfo from ncurses
ref #4775
Diffstat (limited to 'main/st')
| -rw-r--r-- | main/st/0001-set-terminfo-directory-in-config.mk.patch | 42 | ||||
| -rw-r--r-- | main/st/APKBUILD | 17 | ||||
| -rw-r--r-- | main/st/terminfo.patch | 13 |
3 files changed, 21 insertions, 51 deletions
diff --git a/main/st/0001-set-terminfo-directory-in-config.mk.patch b/main/st/0001-set-terminfo-directory-in-config.mk.patch deleted file mode 100644 index ba8e2de0ba..0000000000 --- a/main/st/0001-set-terminfo-directory-in-config.mk.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5c574dcc64ff64160329d93576df25f9e186e4e3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 8 May 2013 13:42:57 +0200 -Subject: [PATCH] set terminfo directory in config.mk - -This helps packagers to install the terminfo at proper place rather than -in users homedir. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - Makefile | 2 +- - config.mk | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 52af636..3ac74a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -49,7 +49,7 @@ 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 -+ @tic -o ${DESTDIR}${TERMINFODIR} -s st.info - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -diff --git a/config.mk b/config.mk -index 9431de2..3ac9bac 100644 ---- a/config.mk -+++ b/config.mk -@@ -6,6 +6,7 @@ VERSION = 0.4.1 - # paths - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man -+TERMINFODIR = $$HOME/.terminfo - - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib --- -1.8.2.2 - diff --git a/main/st/APKBUILD b/main/st/APKBUILD index 5491a2dfb5..786530c7ba 100644 --- a/main/st/APKBUILD +++ b/main/st/APKBUILD @@ -1,19 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=st pkgver=0.6 -pkgrel=0 +pkgrel=1 pkgdesc="a simple terminal implementation for X" url="http://st.suckless.org/" arch="all" license="MIT/X" -depends="" +depends="ncurses-terminfo" depends_dev="" makedepends="$depends_dev fontconfig-dev freetype-dev libx11-dev libxft-dev - libxext-dev ncurses" + libxext-dev" install="" subpackages="$pkgname-doc" source="http://dl.suckless.org/st/st-$pkgver.tar.gz - 0001-set-terminfo-directory-in-config.mk.patch" + terminfo.patch" _builddir="$srcdir"/st-$pkgver prepare() { @@ -33,13 +33,12 @@ build() { package() { cd "$_builddir" - make PREFIX=/usr DESTDIR="$pkgdir" TERMINFODIR=/usr/share/terminfo \ - install || return 1 + make PREFIX=/usr DESTDIR="$pkgdir" install || return 1 } md5sums="1a926f450b4eacb7e2f5ac5b8ffea7c8 st-0.6.tar.gz -28103a441b3d307f5b18e91a014066ee 0001-set-terminfo-directory-in-config.mk.patch" +68a69a4b8c521392aad2c1ff9b77a043 terminfo.patch" sha256sums="85310c08c3814e099b5e45888f8ac7548640e69e9973e934d4fba38b03737a2b st-0.6.tar.gz -4d1f63941288eddc574c0edf34633e918a4008727c42b2a17fc485de7808ce8c 0001-set-terminfo-directory-in-config.mk.patch" +e103aa13cebf6f85be34c38b8457f69fdd1c168618bc07d7bba1d9b2ccf8ac6c terminfo.patch" sha512sums="31e4b6d2b27d6cea79d6a31dabd7ff4e08a8ab376f06c113123810c05eab25e3964482a6429eecd65c369983cc8ee3694f367e3894ed2cc740c67738c1898d29 st-0.6.tar.gz -5ea77eb64c2628bc94477924421013e73c0753a998ed3b2ad21d89a887c11b87349e9569f82c79b02fddacb4b1d9e0c76743fd02dae89dc625c6c68806ee7e3c 0001-set-terminfo-directory-in-config.mk.patch" +9099d7c7dc557583179ec6d630419b067297520f788df6623236822cc4b6d2288ca93d25f3ae6c9169ca2a2357e5b7955eb1c0463b01efad5ee9c2e8c5db35ee terminfo.patch" diff --git a/main/st/terminfo.patch b/main/st/terminfo.patch new file mode 100644 index 0000000000..089c423336 --- /dev/null +++ b/main/st/terminfo.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 6158ab2..93cb684 100644 +--- a/Makefile ++++ b/Makefile +@@ -48,8 +48,6 @@ install: all + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 + @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 + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin |