Update chocolate-doom to 2.0.0

5 files changed, 20 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d945992a0d59..5b35e85b244d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,19 @@
 pkgbase = chocolate-doom
-	pkgdesc = A Doom port reproducing the behavior of the original DOS version
-	pkgver = 1.7.0
-	pkgrel = 2
+	pkgdesc = Doom, Heretic, Hexen, Strife port accurately reproducing the originals.
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = http://www.chocolate-doom.org/
 	install = chocolate-doom.install
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	makedepends = autoconf
-	makedepends = automake
-	makedepends = python2
+	makedepends = python
 	depends = sdl
 	depends = sdl_mixer
 	depends = sdl_net
-	source = http://sourceforge.net/projects/chocolate-doom/files/chocolate-doom/1.7.0/chocolate-doom-1.7.0.tar.gz
-	source = chocolate-doom.desktop
-	source = chocolate-setup.desktop
-	sha256sums = c1cffb602e3cc3a82941b4675b9dc816a6e419076faf8f54db46df397f86bfc0
-	sha256sums = 67b077b4a57971678236fb3bfa0968d091febc81bde5516503f9a2084df560e6
-	sha256sums = 9db67a88ece98c92e551857ee19b2b3ba69f476d4869661667f5f1ed325bf69a
+	source = https://soulsphere.org/projects/chocolate-doom/2.0.0/chocolate-doom-2.0.0.tar.gz
+	sha256sums = 85c58b77dad933013253b453ef01907492b4719acd56cf8cb6c76f4a361ab60c
 
 pkgname = chocolate-doom
 
diff --git a/PKGBUILD b/PKGBUILD
index 31d8398a1fd4..f45c845cee8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,31 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
-# OldMaintainer: Jason Reardon <aetherfly87@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=chocolate-doom
-pkgver=1.7.0
-pkgrel=2
-pkgdesc="A Doom port reproducing the behavior of the original DOS version"
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Doom, Heretic, Hexen, Strife port accurately reproducing the originals."
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
-license=('GPL')
+license=('GPL2')
 depends=('sdl' 'sdl_mixer' 'sdl_net')
-makedepends=('autoconf' 'automake' 'python2')
-install=$pkgname.install
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz \
-        chocolate-doom.desktop \
-        chocolate-setup.desktop)
-sha256sums=('c1cffb602e3cc3a82941b4675b9dc816a6e419076faf8f54db46df397f86bfc0'
-            '67b077b4a57971678236fb3bfa0968d091febc81bde5516503f9a2084df560e6'
-            '9db67a88ece98c92e551857ee19b2b3ba69f476d4869661667f5f1ed325bf69a')
+makedepends=('autoconf' 'python')
+install=${pkgname}.install
+source=(https://soulsphere.org/projects/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('85c58b77dad933013253b453ef01907492b4719acd56cf8cb6c76f4a361ab60c')
 
 build() {
-  cd $pkgname-$pkgver
+  cd "${pkgname}-${pkgver}"
 
-  sed 's|/games|/bin|g' -i {src,setup}/Makefile.am
-  sed 's|share/games|share|g' -i src/d_iwad.c
-  sed	-e '/samplerate/d' \
-	-e 's| CFLAGS=|: # CFLAGS=|g' \
-	-i configure.in
+  # Change binary dir from /usr/games to /usr/bin
+  sed 's|/games|/bin|g' -i src{,/setup}/Makefile.am
 
-  autoupdate
   autoreconf -i
-
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir"/usr/share/{applications,doom}
-  install -m644 ../chocolate-{doom,setup}.desktop "$pkgdir"/usr/share/applications/
-  install -m644 -D src/doom-screensaver.desktop \
-	"$pkgdir"/usr/share/applications/chocolate-doom-screensaver.desktop
 }
diff --git a/chocolate-doom.desktop b/chocolate-doom.desktop
deleted file mode 100644
index 3f3078c60869..000000000000
--- a/chocolate-doom.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Chocolate Doom
-Exec=chocolate-doom
-Icon=chocolate-doom
-Type=Application
-Comment=A Doom port
-Categories=Game;ActionGame;
diff --git a/chocolate-doom.install b/chocolate-doom.install
index b4c5b65c7b03..7faa3b09ad9f 100644
--- a/chocolate-doom.install
+++ b/chocolate-doom.install
@@ -1,3 +1,3 @@
 post_install() {
-	echo ":: Copy any Doom IWAD files to /usr/share/doom/"
+    echo ":: Copy any IWAD files to /usr/share/games/doom"
 }
diff --git a/chocolate-setup.desktop b/chocolate-setup.desktop
deleted file mode 100644
index 8b0bb402fd79..000000000000
--- a/chocolate-setup.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Chocolate Doom Setup
-Exec=chocolate-setup
-Icon=chocolate-setup
-Type=Application
-Comment=Chocolate Doom Setup
-Categories=Settings;ConsoleOnly;