Update prboom-plus-svn

3 files changed, 26 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d6903f37213..d0cb70e205e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = prboom-plus-svn
 	pkgdesc = An enhanced version of the PrBoom Doom engine port
-	pkgver = 4248
+	pkgver = 4355
 	pkgrel = 1
 	url = http://prboom-plus.sourceforge.net/
 	arch = i686
@@ -21,10 +21,12 @@ pkgbase = prboom-plus-svn
 	depends = sdl_mixer
 	depends = sdl_net
 	conflicts = prboom-plus
+	source = prboom-plus::svn+http://www.crowproductions.de/repos/prboom/branches/prboom-plus-24/prboom2
 	source = prboom-plus.desktop
 	source = prboom-plus-game-server.desktop
+	sha256sums = SKIP
 	sha256sums = a858c1dbb4fb10f87d1348ae5a521726e5e6f9ba4e41a392af57aa5b9b6d791d
-	sha256sums = 7f3ac5558ab763246402b25e55e8e6d0756e56dcc0c6c42510a9d21b5814f736
+	sha256sums = 013f1ebf0ff41592b44d8cd510824d258dd06a53ddedafc1e87403a70d37159a
 
 pkgname = prboom-plus-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e22fc6874aa..877852d74ab2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=prboom-plus-svn
-pkgver=4248
+pkgver=4355
 pkgrel=1
 pkgdesc="An enhanced version of the PrBoom Doom engine port"
 arch=('i686' 'x86_64')
@@ -10,59 +10,51 @@ license=('GPL')
 depends=('libgl' 'libmad' 'mesa' 'portmidi' 'sdl_image' 'sdl_mixer' 'sdl_net')
 makedepends=('subversion' 'make' 'autoconf' 'automake' 'deutex-devel' 'unzip' 'imagemagick')
 conflicts=('prboom-plus')
-source=(prboom-plus.desktop prboom-plus-game-server.desktop)
-sha256sums=('a858c1dbb4fb10f87d1348ae5a521726e5e6f9ba4e41a392af57aa5b9b6d791d'
-            '7f3ac5558ab763246402b25e55e8e6d0756e56dcc0c6c42510a9d21b5814f736')
-
-_svntrunk=http://www.crowproductions.de/repos/prboom/branches/prboom-plus-24/prboom2
-_svnmod=prboom2
+source=('prboom-plus::svn+http://www.crowproductions.de/repos/prboom/branches/prboom-plus-24/prboom2'
+        prboom-plus.desktop prboom-plus-game-server.desktop)
+sha256sums=('SKIP'
+            'a858c1dbb4fb10f87d1348ae5a521726e5e6f9ba4e41a392af57aa5b9b6d791d'
+            '013f1ebf0ff41592b44d8cd510824d258dd06a53ddedafc1e87403a70d37159a')
+
+pkgver() {
+  cd prboom-plus
+  local ver="$(svnversion)"
+  printf "%s" "${ver//[[:alpha:]]}"
+}
 
 build() {
-  cd "$srcdir"
-
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-
-  cd $_svnmod
+  cd "$srcdir/prboom-plus"
 
-  if [ ! -e /usr/share/doom/doom2.wad ]; then
-    echo "Please place doom2.wad into /usr/share/doom."
+  if [ ! -e /usr/share/games/doom/doom2.wad ]; then
+    echo "Please place doom2.wad into /usr/share/games/doom."
     echo "You may install Freedoom if you do not own DOOM II."
     echo " Press Enter to continue."
     read -a _unused
-    if [ ! -e /usr/share/doom/doom2.wad ]; then
-      echo "/usr/share/doom/doom.wad not found!"
+    if [ ! -e /usr/share/games/doom/doom2.wad ]; then
+      echo "/usr/share/games/doom/doom.wad not found!"
       return 1
     fi
   fi
 
   tr -d '\r' < bootstrap > bootstrap.fixed
   mv -f bootstrap.fixed bootstrap
-  ln -sf /usr/share/doom/doom2.wad data/
+  ln -sf /usr/share/games/doom/doom2.wad data/
   sed 's|/games|/bin|g' -i src/Makefile.am
   sed 's|CFLAGS_OPT=.*|:|g' -i configure.ac
 
   sh bootstrap
-  ./configure	--prefix=/usr --with-waddir=/usr/share/doom
+  ./configure --prefix=/usr --with-waddir=/usr/share/games/doom
 
   make || return 1
 }
 
 package() {
-  cd "${srcdir}/${_svnmod}"
+  cd "${srcdir}/prboom-plus"
   make DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}"/usr/share/{applications,pixmaps}
 
-  convert ICONS/fouch.ico ICONS/fouch.png
-  convert ICONS/god.ico ICONS/god.png
-  install -m644 ICONS/fouch.png "${pkgdir}"/usr/share/pixmaps/"${pkgname/-svn}.png"
-  install -m644 ICONS/god.png "${pkgdir}"/usr/share/pixmaps/"${pkgname/-svn}-game-server.png"
+  install -m644 ICONS/prboom-plus.svg "${pkgdir}"/usr/share/pixmaps/prboom-plus.svg
 
   cd "${srcdir}"
   install -m644 prboom-plus{,-game-server}.desktop "${pkgdir}"/usr/share/applications/
diff --git a/prboom-plus-game-server.desktop b/prboom-plus-game-server.desktop
index 47bdbeb85d03..3f65a95e0b20 100644
--- a/prboom-plus-game-server.desktop
+++ b/prboom-plus-game-server.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=PrBoom Plus Server
 Exec=prboom-plus-game-server
-Icon=prboom-plus-game-server
+Icon=prboom-plus
 Type=Application
 Terminal=true
 Comment=Run a PrBoom Plus server