update to R210

and reworked somewhat the PKGBUILD

3 files changed, 43 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 519abc86997b..bed5123dd146 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,30 @@
 pkgbase = prospector
-	pkgdesc = A roguelike in space.
-	pkgver = R201
+	pkgdesc = A roguelike in space
+	pkgver = R210
 	pkgrel = 1
 	url = http://prospector.at/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = unzip
-	depends = libxpm
-	depends = libjpeg6
-	depends = ncurses
-	depends = freetype2
-	depends = libogg
-	depends = libvorbis
-	depends = libtinfo
-	noextract = download.php?id=86
-	source = http://www.prospector.at/forum/dm_eds/download.php?id=86
+	depends = ncurses5-compat-libs
+	noextract = prospector-R210.zip
+	source = prospector-R210.zip::http://www.prospector.at/forum/dm_eds/download.php?id=117
 	source = prospector.sh
-	sha256sums = c5450d647c30bd66ffcb9504ca92c19a73e01bbc207c55d1dbf2e086a945d821
-	sha256sums = fe98b315007af211d58df579b269b6b6b0ab3ae45bf302d7e522100a590220f1
+	sha256sums = 2948002bff3bde764c727c92e6343a660270e8156e14afa7c8b07ba0caf74985
+	sha256sums = 4d20c555f4375c8dc12daa5b331d1f6d8473842713e4fa7f525e92bffd0b833e
+	depends_i686 = libxpm
+	depends_i686 = libjpeg6
+	depends_i686 = ncurses
+	depends_i686 = freetype2
+	depends_i686 = libogg
+	depends_i686 = libvorbis
+	depends_x86_64 = lib32-libxpm
+	depends_x86_64 = lib32-libjpeg6
+	depends_x86_64 = lib32-ncurses
+	depends_x86_64 = lib32-freetype2
+	depends_x86_64 = lib32-libogg
+	depends_x86_64 = lib32-libvorbis
 
 pkgname = prospector
 
diff --git a/PKGBUILD b/PKGBUILD
index 224d1c949ab9..29fef5cf0e73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,41 @@
-# Maintainer: Aaron Fischer <mail@aaron-fischer.net>
+# Contributor: Lex Black <autumn-wind@web.de>
+# Contributor: Aaron Fischer <mail@aaron-fischer.net>
 # Contributor: Mark Pustjens <pustjens@dds.nl>
 
 pkgname=prospector
-pkgver=R201
+pkgver=R210
 pkgrel=1
-pkgdesc="A roguelike in space."
+_fun="download.php?id=117"
+pkgdesc="A roguelike in space"
 arch=("i686" "x86_64")
 url="http://prospector.at/"
 license=("GPL2")
-if test "$CARCH" == x86_64 ; then
-    depends=("lib32-libxpm" "lib32-libjpeg6" "lib32-ncurses" "lib32-freetype2" "lib32-libogg" "lib32-libvorbis" "libtinfo")
-else
-    depends=("libxpm" "libjpeg6" "ncurses" "freetype2" "libogg" "libvorbis" "libtinfo")
-fi
+depends=('ncurses5-compat-libs')
+depends_x86_64=("lib32-libxpm" "lib32-libjpeg6" "lib32-ncurses" "lib32-freetype2" "lib32-libogg" "lib32-libvorbis")
+depends_i686=("libxpm" "libjpeg6" "ncurses" "freetype2" "libogg" "libvorbis")
 makedepends=("unzip")
-source=("http://www.prospector.at/forum/dm_eds/download.php?id=86"
+source=("${pkgname}-${pkgver}.zip::http://www.prospector.at/forum/dm_eds/${_fun}"
         "prospector.sh")
-noextract=("download.php?id=86")
-sha256sums=("c5450d647c30bd66ffcb9504ca92c19a73e01bbc207c55d1dbf2e086a945d821"
-            "fe98b315007af211d58df579b269b6b6b0ab3ae45bf302d7e522100a590220f1")
+noextract=("${pkgname}-${pkgver}.zip")
+sha256sums=('2948002bff3bde764c727c92e6343a660270e8156e14afa7c8b07ba0caf74985'
+            '4d20c555f4375c8dc12daa5b331d1f6d8473842713e4fa7f525e92bffd0b833e')
+
 
 package() {
     # install prospector files
-    install -m 755 -d "${pkgdir}/usr/share/prospector/"
-    cd "${pkgdir}/usr/share/prospector"
-    unzip "${srcdir}/download.php?id=86"
+    install -m 755 -d "${pkgdir}/opt/prospector/"
+    cd "${pkgdir}/opt/prospector"
+    bsdtar -xf "${srcdir}/${pkgname}-${pkgver}.zip"
     
     # install bin wrapper
     install -m 755 -d "${pkgdir}/usr/bin"
     install -m 755 "${srcdir}/prospector.sh" "${pkgdir}/usr/bin/prospector"
     
     # Fix the permission so that all users can play the game
-    chown -R root:games ${pkgdir}/usr/share/${pkgname}
-    find ${pkgdir}/usr/share/${pkgname} -type d -exec chmod 755 {} \;
-    find ${pkgdir}/usr/share/${pkgname} -type f -exec chmod 664 {} \;
+    chown -R root:games "${pkgdir}/opt/${pkgname}"
+    find "${pkgdir}/opt/${pkgname}" -type d -exec chmod 755 {} \;
+    find "${pkgdir}/opt/${pkgname}" -type f -exec chmod 664 {} \;
     
     # No sound for linux any more ...
-    #chmod 774 ${pkgdir}/usr/share/${pkgname}/prospector_fbsound
+    #chmod 774 ${pkgdir}/opt/${pkgname}/prospector_fbsound
 }
diff --git a/prospector.sh b/prospector.sh
index 0ca172d13e7d..22456d4e5203 100755
--- a/prospector.sh
+++ b/prospector.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
-export LD_LIBRARY_PATH="/usr/share/prospector"
-cd /usr/share/prospector/
-./prospector_fbsound
+export LD_LIBRARY_PATH="/opt/prospector"
+cd /opt/prospector/
+#./prospector_fbsound
+./prospector_nosound