Update packaging standards

2 files changed, 15 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22bf05e68de0..8737d9c63df7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 # Generated by mksrcinfo v8
-# Thu Mar  3 23:26:00 UTC 2016
+# Mon Dec  4 22:09:03 UTC 2017
 pkgbase = prboom-plus-svn
 	pkgdesc = An enhanced version of the PrBoom Doom engine port
-	pkgver = 4492
+	pkgver = 4531
 	pkgrel = 1
 	url = http://prboom-plus.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = subversion
-	makedepends = make
-	makedepends = autoconf
-	makedepends = automake
-	makedepends = deutex-devel
-	makedepends = unzip
+	makedepends = deutex
+	makedepends = freedoom2
 	makedepends = imagemagick
+	makedepends = subversion
 	depends = libgl
 	depends = libmad
 	depends = mesa
diff --git a/PKGBUILD b/PKGBUILD
index 90c4eeeb87b1..bbe326dffa27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=prboom-plus-svn
-pkgver=4492
+pkgver=4531
 pkgrel=1
 pkgdesc="An enhanced version of the PrBoom Doom engine port"
 arch=('i686' 'x86_64')
 url="http://prboom-plus.sourceforge.net/"
 license=('GPL')
-depends=('libgl' 'libmad' 'mesa' 'portmidi' 'sdl_image' 'sdl_mixer' 'sdl_net')
-makedepends=('subversion' 'make' 'autoconf' 'automake' 'deutex-devel' 'unzip' 'imagemagick')
+depends=('libgl' 'libmad' 'mesa' 'portmidi' 'sdl_image'
+	 'sdl_mixer' 'sdl_net')
+makedepends=('deutex' 'freedoom2' 'imagemagick' 'subversion')
 conflicts=('prboom-plus')
 source=('prboom-plus::svn+https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2'
         prboom-plus.desktop prboom-plus-game-server.desktop)
@@ -23,39 +24,23 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/prboom-plus"
-
-  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/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/games/doom/doom2.wad data/
+  cd prboom-plus
+
   sed 's|/games|/bin|g' -i src/Makefile.am
   sed 's|CFLAGS_OPT=.*|:|g' -i configure.ac
 
-  sh bootstrap
+  ./bootstrap
   ./configure --prefix=/usr --with-waddir=/usr/share/games/doom
 
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/prboom-plus"
   make DESTDIR="${pkgdir}" install
 
-  install -d -m755 "${pkgdir}"/usr/share/{applications,pixmaps}
-
+  install -dm755 "${pkgdir}"/usr/share/{applications,pixmaps}
   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/
+  install -m644 ../prboom-plus{,-game-server}.desktop "${pkgdir}"/usr/share/applications/
 }