Cleanup

3 files changed, 23 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca86b0967eaf..e1c889575489 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alex4
 	pkgdesc = Help Alex the Allegator rescue Lola before the humans make a pair of shoes out of her!
 	pkgver = 1.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://allegator.sourceforge.net
 	install = alex4.install
 	arch = i686
@@ -9,23 +9,15 @@ pkgbase = alex4
 	license = GPL2
 	depends = dumb
 	source = http://downloads.sourceforge.net/project/allegator/Alex4/source%20and%20data/alex4src_data.zip
+	source = alex4.png
 	source = unix-port.patch
 	source = allegro-4.2.patch
-	source = alex4.png
 	source = alex4.desktop
-	source = alex4.install
-	md5sums = c81b8e3813300a0cfbe828bcdff60fda
-	md5sums = 8dcafad79e34fc9adb78a49b6933e10c
-	md5sums = f9ccd450934d346deec450e91ecfc42e
-	md5sums = 1c21affded614148ad06deb1bb59086c
-	md5sums = 96f6ee8ce4fc268d5161e5294cfe565e
-	md5sums = f5bfcc2b2378cf34ab0491e8a8da6c23
 	sha256sums = d266d7fba64fbfedf13240d3d0eb21b8bacbedeaa5f22b26a27d472c8d23f103
+	sha256sums = 236a8d163ee8aa94073aa1ec969a85e887b3c70fefbcd03b1f41b93b09fa32c6
 	sha256sums = 5bb70ca82bcd0df0ed72eccada0c9ccb37a570d7c62ea8a076bdf2169a15c2e5
 	sha256sums = ea3e6ffd558cbdb6c392d598499f0780de8c0e456da554531c5c975fe8688d28
-	sha256sums = 236a8d163ee8aa94073aa1ec969a85e887b3c70fefbcd03b1f41b93b09fa32c6
 	sha256sums = b7fc0854e9a07f08bd90f59aaf99011afc3c6c2a0ad0b244ec04694ce0ff19dd
-	sha256sums = 9a9589ca7ab7792cadeb6529141b9d719356d989a7393d7eab322b88c6f27965
 
 pkgname = alex4
 
diff --git a/PKGBUILD b/PKGBUILD
index f4fea1bb5059..6cf69232878b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,46 @@
-# Maintainer: carstene1ns <arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributor: megadriver <megadriver at gmx dot com>
 
 pkgname=alex4
 pkgver=1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Help Alex the Allegator rescue Lola before the humans make a pair of shoes out of her!"
 url="http://allegator.sourceforge.net"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('dumb')
-install="$pkgname.install"
+install=$pkgname.install
 source=("http://downloads.sourceforge.net/project/allegator/Alex4/source%20and%20data/alex4src_data.zip"
+        "$pkgname.png"
         "unix-port.patch"
         "allegro-4.2.patch"
-        "$pkgname.png"
-        "$pkgname.desktop"
-        "$pkgname.install")
-md5sums=('c81b8e3813300a0cfbe828bcdff60fda'
-         '8dcafad79e34fc9adb78a49b6933e10c'
-         'f9ccd450934d346deec450e91ecfc42e'
-         '1c21affded614148ad06deb1bb59086c'
-         '96f6ee8ce4fc268d5161e5294cfe565e'
-         'f5bfcc2b2378cf34ab0491e8a8da6c23')
+        "$pkgname.desktop")
 sha256sums=('d266d7fba64fbfedf13240d3d0eb21b8bacbedeaa5f22b26a27d472c8d23f103'
+            '236a8d163ee8aa94073aa1ec969a85e887b3c70fefbcd03b1f41b93b09fa32c6'
             '5bb70ca82bcd0df0ed72eccada0c9ccb37a570d7c62ea8a076bdf2169a15c2e5'
             'ea3e6ffd558cbdb6c392d598499f0780de8c0e456da554531c5c975fe8688d28'
-            '236a8d163ee8aa94073aa1ec969a85e887b3c70fefbcd03b1f41b93b09fa32c6'
-            'b7fc0854e9a07f08bd90f59aaf99011afc3c6c2a0ad0b244ec04694ce0ff19dd'
-            '9a9589ca7ab7792cadeb6529141b9d719356d989a7393d7eab322b88c6f27965')
+            'b7fc0854e9a07f08bd90f59aaf99011afc3c6c2a0ad0b244ec04694ce0ff19dd')
 
 prepare() {
-  cd $srcdir/alex4src
+  cd alex4src
 
-  patch -p1 -N -i $srcdir/unix-port.patch
-  patch -p1 -N -i $srcdir/allegro-4.2.patch
+  # make compatible with modern environment
+  patch -Np1 < ../unix-port.patch
+  patch -Np1 < ../allegro-4.2.patch
 }
 
 build() {
-  cd $srcdir/alex4src/src
+  cd alex4src/src
 
   LDFLAGS=-lm make PREFIX=/usr
 }
 
 package() {
-  cd $srcdir/alex4src/src
-
-  make PREFIX=$pkgdir/usr install
-
-  install -Dm644 ../$pkgname.ini $pkgdir/usr/share/$pkgname
+  cd alex4src
 
-  # install desktop entry
-  install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/icons/$pkgname.png
-  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+  make -C src PREFIX="$pkgdir/usr" install
+  install -Dm644 alex4.ini "$pkgdir"/usr/share/alex4/alex4.ini
+  # desktop entry
+  install -Dm644 ../$pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
diff --git a/alex4.install b/alex4.install
index b3acef513622..0fcb7794d84c 100644
--- a/alex4.install
+++ b/alex4.install
@@ -1,7 +1,7 @@
 
 post_install() {
-  echo "Copy /usr/share/alex4/alex4.ini to \$HOME/.alex4 directory."
-  echo "You can then edit it to configure game options."
+  echo "You can copy '/usr/share/alex4/alex4.ini' to '~/.alex4' directory to edit"
+  echo "game options."
 }
 
 post_upgrade() {