* Cleanup and improvements.

1 files changed, 15 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4d6a0358eb30..b27d1c8418ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,11 @@
 # Contributor: Manolis Tzanidakis
 pkgname=ucspi-tcp
 pkgver=0.88
-pkgrel=7
+pkgrel=8
 pkgdesc="Easy-to-use command-line tools for building TCP client-server applications."
 arch=('i686' 'x86_64')
 url="http://cr.yp.to/ucspi-tcp.html"
 license=('public-domain')
-depends=('glibc')
-makedepends=('gcc' 'make' 'patch')
 source=("http://cr.yp.to/$pkgname/$pkgname-$pkgver.tar.gz"
         "ucspi-tcp-$pkgver-ipv6.patch"
         "head-1.patch")
@@ -18,16 +16,24 @@ sha512sums=('44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e74
             '4180f2e8e0bd23bc345d363b5cfeab321293360203386fc93672bcb5c6fd8145d82c4eedb261abd0faacbce15bcd3180d7b02f2604039db735def7cdcd30abbc'
             '815b4caa3d9a294e3fe69a464f37d1f50ebd83e25d608955dff4b78da1d3ddd9fb4f2586ab41552f006a117f2bd7a937a6ee485dd7897d2d63a9f9e2e12a1d8d')
 
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    patch -p0 < $srcdir/head-1.patch || return 1
-    patch -p1 < $srcdir/ucspi-tcp-$pkgver-ipv6.patch || return 1
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+    patch -p0 < "$srcdir/head-1.patch"
+    patch -p1 < "$srcdir/ucspi-tcp-$pkgver-ipv6.patch"
     echo "gcc ${CFLAGS}" > conf-cc
     echo "/usr" > conf-home
-    make || return 1
+}
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
     for bin in tcpserver tcprules tcprulescheck argv0 recordio \
                tcpclient *\@ tcpcat mconnect mconnect-io addcr \
                delcr fixcrio rblsmtpd; do
-        install -m 755 -D $bin $pkgdir/usr/bin/$bin
+        install -m 755 -D $bin "$pkgdir/usr/bin/$bin"
     done
 }