Minor changes to conform recommendations.

3 files changed, 36 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14afa7663368..1006c0f13618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jul 15 20:23:10 UTC 2016
 pkgbase = d1x-rebirth
-	pkgdesc = An enhanced engine to play with Descent1 datas
+	pkgdesc = An enhanced engine to play with Descent1 data.
 	pkgver = 0.58.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.dxx-rebirth.com/
 	install = d1x-rebirth.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 9fb64eafbb7e..cbd5e652b726 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,47 @@
-# Contributor : zico <zico@dxx-rebirth.com>
+# Contributor: zico <zico@dxx-rebirth.com>
+# Maintainer: SanskritFritz (gmail)
 
 pkgname=d1x-rebirth
 pkgver=0.58.1
-pkgrel=1
-pkgdesc="An enhanced engine to play with Descent1 datas"
+pkgrel=2
+pkgdesc="An enhanced engine to play with Descent1 data."
 arch=('i686' 'x86_64')
 url="http://www.dxx-rebirth.com/"
 license=('custom:D1x' 'LGPL' 'custom:as-is')
 depends=('sdl' 'sdl_mixer' 'mesa' 'physfs')
 makedepends=('scons' 'unzip')
-install=$pkgname.install
-source=(http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz $pkgname.desktop $pkgname.install http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa)
-noextract=(d1xr-hires.dxa d1xr-sc55-music.dxa)
+install="$pkgname.install"
+source=("http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz"
+        "$pkgname.desktop"
+        "$pkgname.install"
+        "http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa"
+        "http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa")
+noextract=("d1xr-hires.dxa" "d1xr-sc55-music.dxa")
 md5sums=('8f43e66191fdedd0c7ff9278719accf1'
          'ded1f8c2deb3825134e1a984985684cb'
          '78c79b2b82175ebd4073edf257a9bd68'
          '7d978ce3875995e54cbf426167e88b94'
-         'bf54b45a648052b2531bbb95c001403b') 
+         'bf54b45a648052b2531bbb95c001403b')
+
+build() {
+	cd "$srcdir/${pkgname}_v${pkgver}-src"
+	sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
+	scons sharepath="/usr/share/$pkgname"
+}
 
 package() {
-  cd $srcdir/${pkgname}_v${pkgver}-src
-  sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
-  scons sharepath="/usr/share/$pkgname" || return 1
-  
-  mkdir -p $pkgdir/usr/bin/
-  mkdir -p $pkgdir/usr/share/$pkgname/
-  mkdir -p $pkgdir/usr/share/pixmaps/
-  mkdir -p $pkgdir/usr/share/applications/
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
+	mkdir -p "$pkgdir/usr/bin/"
+	mkdir -p "$pkgdir/usr/share/$pkgname/"
+	mkdir -p "$pkgdir/usr/share/pixmaps/"
+	mkdir -p "$pkgdir/usr/share/applications/"
+	mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
+
+	cd $srcdir/${pkgname}_v${pkgver}-src
+	install -m755 "$pkgname" "$pkgdir/usr/bin/"
 
-  install -m755 $pkgname $pkgdir/usr/bin/
-  cd $srcdir/
-  install -m644 $srcdir/${pkgname}_v${pkgver}-src/$pkgname.xpm $pkgdir/usr/share/pixmaps/
-  install -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/
-  install -m644 $srcdir/${pkgname}_v${pkgver}-src/COPYING.txt $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 d1xr-hires.dxa $pkgdir/usr/share/$pkgname/
-  install -m644 d1xr-sc55-music.dxa $pkgdir/usr/share/$pkgname/
+	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/$pkgname.xpm" "$pkgdir/usr/share/pixmaps/"
+	install -m644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/"
+	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/"
+	install -m644 "$srcdir/d1xr-hires.dxa" "$pkgdir/usr/share/$pkgname/"
+	install -m644 "$srcdir/d1xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
 } 
diff --git a/d1x-rebirth.install b/d1x-rebirth.install
index e56a7de3a9be..d5e11e03f50c 100755
--- a/d1x-rebirth.install
+++ b/d1x-rebirth.install
@@ -1,5 +1,5 @@
 post_install() {
-  echo 'Put your Descent 1 datas either to /usr/share/d1x-rebirth/ or ~/.d1x-rebirth/'
+  echo 'Put your Descent 1 data files either to /usr/share/d1x-rebirth/ or ~/.d1x-rebirth/'
 
   cat << EOF
 Following files are needed to run the game: