From b2362c2f7f731ebc9e1c896af0a6e5a0f3db163b Mon Sep 17 00:00:00 2001
From: prspkt <prspkt@protonmail.com>
Date: Thu, 15 Mar 2018 06:05:19 +0000
Subject: main/st: upgrade to 0.8, modernize abuild

---
 main/st/APKBUILD       | 36 +++++++++++++++---------------------
 main/st/terminfo.patch | 13 -------------
 2 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 main/st/terminfo.patch

(limited to 'main/st')

diff --git a/main/st/APKBUILD b/main/st/APKBUILD
index 4223e0a15b..7e1c97f56e 100644
--- a/main/st/APKBUILD
+++ b/main/st/APKBUILD
@@ -1,30 +1,29 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=st
-pkgver=0.7
-pkgrel=1
-pkgdesc="a simple terminal implementation for X"
-url="https://st.suckless.org/"
+pkgver=0.8
+pkgrel=0
+pkgdesc="Simple terminal emulator for X"
+url="https://st.suckless.org"
 arch="all"
-license="MIT/X"
+license="MIT"
 depends="ncurses-terminfo"
-depends_dev=""
-makedepends="$depends_dev fontconfig-dev freetype-dev libx11-dev libxft-dev
-	libxext-dev"
-install=""
+makedepends="fontconfig-dev freetype-dev libx11-dev libxext-dev libxft-dev"
 subpackages="$pkgname-doc $pkgname-dbg"
-source="http://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz
-	terminfo.patch"
+source="http://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	sed -i '/tic/d' "$builddir"/Makefile
+}
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
-	make || return 1
+	make -C "$builddir"
 }
 
 package() {
 	cd "$builddir"
-	make PREFIX=/usr DESTDIR="$pkgdir" install || return 1
+	make PREFIX=/usr DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/applications
 
 	cat >"$pkgdir"/usr/share/applications/st.desktop <<EOF
@@ -39,9 +38,4 @@ Categories=System;TerminalEmulator;
 EOF
 }
 
-md5sums="29b2a599cf1511c8062ed8f025c84c63  st-0.7.tar.gz
-68a69a4b8c521392aad2c1ff9b77a043  terminfo.patch"
-sha256sums="f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000  st-0.7.tar.gz
-e103aa13cebf6f85be34c38b8457f69fdd1c168618bc07d7bba1d9b2ccf8ac6c  terminfo.patch"
-sha512sums="9384820d373bfaaef1887290351d8c34abeef26cd7d50ddbae56ffb865864bcca9be798c6238bf1ce595ba7c317f2c1d97653055da0aa302e322eeee822768d4  st-0.7.tar.gz
-9099d7c7dc557583179ec6d630419b067297520f788df6623236822cc4b6d2288ca93d25f3ae6c9169ca2a2357e5b7955eb1c0463b01efad5ee9c2e8c5db35ee  terminfo.patch"
+sha512sums="47af80560f3bd803719b83e95affcb5425fed419fa4703dbd66ee2080f6671597aaba8110f3f7959190e8c3e2b02c62edf062fab950b2649f1d8c532c183de84  st-0.8.tar.gz"
diff --git a/main/st/terminfo.patch b/main/st/terminfo.patch
deleted file mode 100644
index 089c423336..0000000000
--- a/main/st/terminfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-- 
cgit v1.2.3