[upd] 20190106→20231028

3 files changed, 27 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc643bf54821..4f91b3790eb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = openjazz
 	pkgdesc = A free, open-source version of the classic Jazz Jackrabbit™ games
-	pkgver = 20190106
+	pkgver = 20231028
 	pkgrel = 1
 	url = http://alister.eu/jazz/oj/
 	install = openjazz.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = perl-podlators
-	depends = zlib
-	depends = sdl
-	depends = libmodplug
-	source = https://github.com/AlisterT/openjazz/releases/download/20190106/openjazz-20190106.tar.xz
-	source = https://github.com/AlisterT/openjazz/raw/20190106/unix/OpenJazz.6.pod
-	sha256sums = 91341adcc4908db12aad6b82d2fb0125429a26585f65d7eb32d403656313eaab
-	sha256sums = 60c382efd5ba101dfcc9a216ed1f19e3cec4183f338445e14fc1446e17898a70
+	makedepends = git
+	makedepends = cmake
+	makedepends = ninja
+	depends = sdl2
+	source = https://github.com/AlisterT/openjazz/releases/download/20231028/openjazz-20231028.tar.xz
+	sha256sums = 7240e14d07130c1be9e59b4f336cf9d557cebd97fdb6f1b960f0f4c4e33c256b
 
 pkgname = openjazz
-
diff --git a/PKGBUILD b/PKGBUILD
index 2435ed5ada40..7883e8807554 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,29 @@
 # Contributor: Paul Dino Jones "ZitZ" <Raptorman18@gmail.com>
 
 pkgname=openjazz
-pkgver=20190106
+pkgver=20231028
 pkgrel=1
 pkgdesc="A free, open-source version of the classic Jazz Jackrabbit™ games"
 arch=('i686' 'x86_64')
 url="http://alister.eu/jazz/oj/"
 license=('GPL')
-depends=('zlib' 'sdl' 'libmodplug')
-makedepends=('perl-podlators')
+makedepends=('git' 'cmake' 'ninja')
+depends=('sdl2')
 install=openjazz.install
-source=("https://github.com/AlisterT/openjazz/releases/download/$pkgver/openjazz-$pkgver.tar.xz"
-        "https://github.com/AlisterT/openjazz/raw/$pkgver/unix/OpenJazz.6.pod")
-sha256sums=('91341adcc4908db12aad6b82d2fb0125429a26585f65d7eb32d403656313eaab'
-            '60c382efd5ba101dfcc9a216ed1f19e3cec4183f338445e14fc1446e17898a70')
+source=("https://github.com/AlisterT/openjazz/releases/download/$pkgver/openjazz-$pkgver.tar.xz")
+sha256sums=('7240e14d07130c1be9e59b4f336cf9d557cebd97fdb6f1b960f0f4c4e33c256b')
 
 prepare() {
-  # look in home directory for data files
-  sed 's|"/."|"/.openjazz/"|' -i $pkgname-$pkgver/src/main.cpp
-
-  # generate manual page
-  pod2man -c "OpenJazz Manual" -n OpenJazz -r "OpenJazz $pkgver" OpenJazz.6.pod OpenJazz.6
+  rm -rf aurbuild
 }
 
 build() {
-  cd $pkgname-$pkgver
-  export CPPFLAGS="$CPPFLAGS -DDATAPATH=\\\"/usr/share/openjazz/\\\" -DHOMEDIR"
-  ./configure --prefix=/usr
-  make
+  cmake -S $pkgname-$pkgver -B aurbuild -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATAPATH="/usr/share/openjazz/"
+  cmake --build aurbuild
 }
 
 package() {
-  make -C $pkgname-$pkgver DESTDIR="$pkgdir/" install
-  # install manual page
-  install -Dm644 OpenJazz.6 "$pkgdir"/usr/share/man/man6/OpenJazz.6
+  DESTDIR="$pkgdir/" cmake --install aurbuild
 }
diff --git a/openjazz.install b/openjazz.install
index ae2aeaf2b058..56df8ea2b5a0 100644
--- a/openjazz.install
+++ b/openjazz.install
@@ -1,13 +1,19 @@
 
 post_install() {
-  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 "OpenJazz needs original Jazz Jackrabbit™ data files to play."
+  echo "You can put them in '/usr/share/openjazz' for global installation or"
+  echo "in ${XDG_DATA_HOME:-/.local/share}/openjazz' for yourself."
   echo "Legal game data download:"
-  echo "        http://www.dosgamesarchive.com/gamegroup/jazz-jackrabbit/"
+  echo "        https://www.dosgamesarchive.com/related-games/jazz-jackrabbit"
 }
 
 post_upgrade() {
   post_install
+
+  if [ $(vercmp "$2" 20231028) -lt 0 ]; then
+    echo " => The settings/data directories have been moved from ~/.openjazz to"
+    echo "    respect xdg basedir spec."
+  fi
 }
 
 post_remove() {