Cleanup of PKGBUILD and patches for pthread

1 files changed, 26 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5b2b57b0e327..2700c7510c46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,40 @@
-# Maintainer chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
+# Maintainer: Michael Wawrzyniak <arch ismyusernameat cmstactical nexttothecomma net>
+# Contributor: chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
 # Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 
 pkgname=syncterm
 pkgver=1.1
-pkgrel=3
-epoch=1
-_ver=1.1
-pkgdesc="A BBS terminal program, Supports ANSI music and the IBM charset when possible. Will run from a console, under X11 using XLib, or using SDL."
+pkgrel=4
+pkgdesc="A BBS terminal program, supporting ANSI music and IBM charset."
 url="http://syncterm.bbsdev.net"
 license=('GPL')
-depends=('ncurses' 'sdl')
-options=(!buildflags)
-makedepends=(unzip)
+depends=('ncurses')
+makedepends=('unzip')
+optdepends=('hicolor-icon-theme: for GUI icon support'
+            'sdl2: for SDL GUI support'
+            'libx11: for X11 GUI support')
 arch=('i686' 'x86_64')
-source=("https://phoenixnap.dl.sourceforge.net/project/syncterm/syncterm/syncterm-$_ver/syncterm-$_ver-src.tgz")
-md5sums=('f528a1fdbe87a69a52582582d99e4032')
+source=("https://downloads.sourceforge.net/project/syncterm/syncterm/$pkgname-$pkgver/$pkgname-$pkgver-src.tgz"
+        "cl-linux-yield.patch"
+        "cl-makefile.patch"
+        "st_crypt.patch")
+md5sums=('f528a1fdbe87a69a52582582d99e4032'
+         'c67ca676bddbbbbefa3fe20cd00ab7e7'
+         '3471ec7748fc0a9d8be12424be7a8ff5'
+         '69f59c1a5f71e44beb6e68644d497418')
 
+prepare() {
+	cp "$srcdir/cl-linux-yield.patch" "$pkgname-$pkgver/3rdp/build/cl-linux-yield.patch"
+	patch -Np1 -d "$pkgname-$pkgver" -i "${srcdir}/cl-makefile.patch"
+	patch -Np1 -d "$pkgname-$pkgver" -i "${srcdir}/st_crypt.patch"
+}
 
 build() {
-  cd "$srcdir/syncterm-$_ver"
-  cd "src/syncterm/"
-  make MANPREFIX="$pkgdir/usr/share" SRC_ROOT="$(realpath ..)" PREFIX="/usr" RELEASE=1 || true
+	cd "$pkgname-$pkgver/src/syncterm"
+	make PREFIX="/usr" MANPREFIX="/usr/share" RELEASE=1
 }
 
 package() {
-  cd "$srcdir/syncterm-$_ver"
-  cd "src/syncterm/"
-  make install MANPREFIX="$pkgdir/usr/share" SRC_ROOT="$(realpath ..)" PREFIX="$pkgdir/usr" RELEASE=1
+	cd "$pkgname-$pkgver/src/syncterm"
+	make PREFIX="$pkgdir/usr" MANPREFIX="$pkgdir/usr/share" RELEASE=1 install
 }
-