[upd] 20140216→20171024

4 files changed, 20 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6906ad085cbd..588a041cc389 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openjazz
 	pkgdesc = A free, open-source version of the classic Jazz Jackrabbit™ games
-	pkgver = 20140216
+	pkgver = 20171024
 	pkgrel = 1
 	url = http://alister.eu/jazz/oj/
 	install = openjazz.install
@@ -10,10 +10,8 @@ pkgbase = openjazz
 	depends = zlib
 	depends = sdl
 	depends = libmodplug
-	source = http://alister.eu/jazz/oj/OpenJazz-src-160214.zip
-	source = openjazz-datafolders.diff
-	sha256sums = 8178731e005188a8e87174af26f767b7a1815c06b3bd9b8156440ecea4d7b10a
-	sha256sums = a8bbf3d0116cf4faa0a073d8b4e7f356a9833d7dd6d26da1e487c90252334667
+	source = https://github.com/AlisterT/openjazz/releases/download/20171024/openjazz-20171024.tar.xz
+	sha256sums = ee1f2441a8a63cfe9ef11978e0635ccdacd847bc7b00781e363d422aa5770e3b
 
 pkgname = openjazz
 
diff --git a/PKGBUILD b/PKGBUILD
index d2371ffb4ff7..18b21e26cc6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributor: Paul Dino Jones "ZitZ" <Raptorman18@gmail.com>
 
 pkgname=openjazz
-pkgver=20140216
-_pkgver=160214
+pkgver=20171024
 pkgrel=1
 pkgdesc="A free, open-source version of the classic Jazz Jackrabbit™ games"
 arch=('i686' 'x86_64')
@@ -11,26 +10,21 @@ url="http://alister.eu/jazz/oj/"
 license=('GPL')
 depends=('zlib' 'sdl' 'libmodplug')
 install=openjazz.install
-source=("http://alister.eu/jazz/oj/OpenJazz-src-$_pkgver.zip"
-	      "openjazz-datafolders.diff")
-sha256sums=('8178731e005188a8e87174af26f767b7a1815c06b3bd9b8156440ecea4d7b10a'
-            'a8bbf3d0116cf4faa0a073d8b4e7f356a9833d7dd6d26da1e487c90252334667')
+source=("https://github.com/AlisterT/openjazz/releases/download/$pkgver/openjazz-$pkgver.tar.xz")
+sha256sums=('ee1f2441a8a63cfe9ef11978e0635ccdacd847bc7b00781e363d422aa5770e3b')
 
 prepare() {
-  # set global datapath and enable looking in home directory
-  patch -Np1 < openjazz-datafolders.diff
-  # modplug has changed the header file directory
-  sed 's|modplug.h|libmodplug/&|' -i src/io/sound.cpp
+  # look in home directory for data files
+  sed 's|"/."|"/.openjazz/"|' -i $pkgname-$pkgver/src/main.cpp
 }
 
 build() {
-  autoreconf -fi
+  cd $pkgname-$pkgver
+  export CPPFLAGS="$CPPFLAGS -DDATAPATH=\\\"/usr/share/openjazz/\\\" -DHOMEDIR"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  make DESTDIR="$pkgdir/" install
-  # licenses
-  install -Dm644 licenses.txt "$pkgdir"/usr/share/licenses/openjazz/licenses.txt
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir/" install
 }
diff --git a/openjazz-datafolders.diff b/openjazz-datafolders.diff
deleted file mode 100644
index 370aa225f4fc..000000000000
--- a/openjazz-datafolders.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Npurw OpenJazz-src-050214.old/Makefile.am OpenJazz-src-050214/Makefile.am
---- OpenJazz-src-050214.old/Makefile.am	2013-07-22 00:36:04.000000000 +0200
-+++ OpenJazz-src-050214/Makefile.am	2014-02-08 20:56:51.253996586 +0100
-@@ -1,7 +1,8 @@
- # -*- Makefile -*-

- 

- AM_CPPFLAGS = -DUSE_MODPLUG -DUSE_SOCKETS -DSCALE -I${top_srcdir}/src \

--              ${libSDL_CFLAGS} ${libmodplug_CFLAGS}

-+              -DDATAPATH=\"/usr/share/openjazz/\" -DLOWERCASE_FILENAMES \

-+              -DHOMEDIR=1 ${libSDL_CFLAGS} ${libmodplug_CFLAGS}

- AM_CFLAGS   = -Wall

- AM_CXXFLAGS = -Wall

- 

-diff -Npurw OpenJazz-src-050214.old/src/main.cpp OpenJazz-src-050214/src/main.cpp
---- OpenJazz-src-050214.old/src/main.cpp	2014-02-04 22:45:50.000000000 +0100
-+++ OpenJazz-src-050214/src/main.cpp	2014-02-08 20:00:21.741360579 +0100
-@@ -174,7 +174,7 @@ Main::Main (int argc, char *argv[]) {
- 	#ifdef WIN32

- 	firstPath = new Path(firstPath, createString(getenv("HOME"), "\\"));

- 	#else

--	firstPath = new Path(firstPath, createString(getenv("HOME"), "/."));

-+	firstPath = new Path(firstPath, createString(getenv("HOME"), "/.openjazz/"));

- 	#endif

- #endif

- 

diff --git a/openjazz.install b/openjazz.install
index b63bf6a1dd58..ae2aeaf2b058 100644
--- a/openjazz.install
+++ b/openjazz.install
@@ -1,17 +1,17 @@
 
 post_install() {
-  echo "Remember OpenJazz needs original Jazz Jackrabbit™ 1 or 2 data files to play."
-  echo "You can put them in '/usr/share/openjazz' for global installation or in"
-  echo "'~/.openjazz' only for yourself. All filenames are expected to be lowercase,"
-  echo "this one-liner might come in handy (in a terminal, with bash4):"
-  echo "'cd ~/.openjazz && for f in *; do mv \"\$f\" \"\${f,,}\"; done'"
+  echo "OpenJazz needs original Jazz Jackrabbit™ data files to play. You can put them in"
+  echo "'/usr/share/openjazz' for global installation or in '~/.openjazz' for yourself."
+  echo "Legal game data download:"
+  echo "        http://www.dosgamesarchive.com/gamegroup/jazz-jackrabbit/"
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  echo "If you have installed data files in '/usr/share/openjazz', you have to"
-  echo "remove/backup them yourself."
+post_remove() {
+  if [ -d usr/share/openjazz ]; then
+    echo "Remember to remove/backup installed data files in '/usr/share/openjazz'."
+  fi
 }