Cleanup

2 files changed, 18 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70d496f887e9..41da1870398f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = methane
-	pkgdesc = Help the Super Methane Brothers to capture baddies with your gas gun.
+	pkgdesc = Help the Super Methane Brothers to capture baddies with your gas gun
 	pkgver = 1.5.1
 	pkgrel = 4
 	url = http://methane.sourceforge.net
@@ -8,18 +8,13 @@ pkgbase = methane
 	license = GPL
 	depends = clanlib-23
 	source = http://downloads.sourceforge.net/methane/methane-1.5.1.tgz
-	source = methane.desktop
 	source = methane.png
+	source = methane.desktop
 	source = methane-clanlib23.patch
 	source = methane-nogl1.patch
-	md5sums = 7e4258e326478678c2332388eab2ed14
-	md5sums = ee0ebbf6138142365f5c1a287d1691a6
-	md5sums = a9ec845554b4987c02723b87d308e573
-	md5sums = ca3b7c6d7e959914e086882d40f8d810
-	md5sums = c6237f8fc6ebaa95b0ee7ff1caabe69f
 	sha256sums = ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248
-	sha256sums = cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17
 	sha256sums = 6c56b025b058a954bd089850dc50f4f25b292da97bbba0d4315db4060152f1fe
+	sha256sums = cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17
 	sha256sums = d7318ef7004cce6bb3de04c76b1d3d15d26265310a5d3938f2efa6c183f4a346
 	sha256sums = 3b2426f27f45b232caf69d21eb1f79e8db3f7041bc6255eb20fe0fc0aae970a5
 
diff --git a/PKGBUILD b/PKGBUILD
index f72e7395dd9d..28a0866d37bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,52 @@
-# Maintainer: carstene1ns <arch carsten-teibes de>
+# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
 # Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
 # Contributor: Larryhaja  <larryhaja at gmail.com>
 
 pkgname=methane
 pkgver=1.5.1
 pkgrel=4
-pkgdesc="Help the Super Methane Brothers to capture baddies with your gas gun."
+pkgdesc="Help the Super Methane Brothers to capture baddies with your gas gun"
 arch=('i686' 'x86_64')
 url="http://methane.sourceforge.net"
 license=('GPL')
 depends=('clanlib-23')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz"
-        "$pkgname.desktop"
         "$pkgname.png"
+        "$pkgname.desktop"
         "$pkgname-clanlib23.patch"
         "$pkgname-nogl1.patch")
-md5sums=('7e4258e326478678c2332388eab2ed14'
-         'ee0ebbf6138142365f5c1a287d1691a6'
-         'a9ec845554b4987c02723b87d308e573'
-         'ca3b7c6d7e959914e086882d40f8d810'
-         'c6237f8fc6ebaa95b0ee7ff1caabe69f')
 sha256sums=('ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248'
-            'cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17'
             '6c56b025b058a954bd089850dc50f4f25b292da97bbba0d4315db4060152f1fe'
+            'cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17'
             'd7318ef7004cce6bb3de04c76b1d3d15d26265310a5d3938f2efa6c183f4a346'
             '3b2426f27f45b232caf69d21eb1f79e8db3f7041bc6255eb20fe0fc0aae970a5')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # clanlib related changes
-  patch -Np1 -i $srcdir/$pkgname-clanlib23.patch
+  patch -Np1 < ../$pkgname-clanlib23.patch
   # remove opengl1 renderer
-  patch -Np1 -i $srcdir/$pkgname-nogl1.patch
+  patch -Np1 < ../$pkgname-nogl1.patch
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # remove leftover build dir
-  rm -fR build
-
+  rm -rf build
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  mkdir -p $pkgdir/usr/share/$pkgname
-  mkdir $pkgdir/usr/bin
+  cd $pkgname-$pkgver
 
   # install desktop entry
-  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  install -Dm644 ../$pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
 
   # install data and executable
-  cp -R {resources,docs} $pkgdir/usr/share/$pkgname
-  install -m755 $pkgname $pkgdir/usr/bin
+  install -d "$pkgdir"/usr/share/$pkgname
+  cp -r {resources,docs} "$pkgdir"/usr/share/$pkgname
+  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }