3 files changed, 31 insertions, 62 deletions
diff --git a/pcr/prboom-plus/PKGBUILD b/pcr/prboom-plus/PKGBUILD
new file mode 100644
index 000000000..e0555f122
--- /dev/null
+++ b/pcr/prboom-plus/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer (AUR): Kingan <kingan201 at gmail dot com>
+# Contributor (AUR): Frederic Bezies <fredbezies at gmail dot com>
+# Contributor (AUR): Valsu [arch(at)hylia.de]
+
+pkgname=prboom-plus
+pkgver=2.5.1.4
+pkgrel=1
+pkgdesc='An advanced, Vanilla-compatible Doom engine based on PrBoom'
+url='http://prboom-plus.sourceforge.net/'
+arch=('x86_64' 'i686')
+arch+=('armv7h')
+license=('GPL2')
+depends=('fluidsynth' 'glu' 'libmad' 'portmidi' 'sdl_image' 'sdl_mixer' 'sdl_net')
+conflicts=('prboom')
+replaces=('prboom')
+provides=('prboom')
+source=("http://download.sourceforge.net/prboom-plus/prboom-plus-$pkgver.tar.gz")
+sha256sums=('e0e2241d174839b107f1a42b191aa9895dc6749e477cbc850ad520fba2353b94')
+
+build() {
+  cd "prboom-plus-$pkgver"
+
+  ./configure --prefix=/usr --without-dumb
+  make
+}
+
+package() {
+  cd "prboom-plus-$pkgver"
+
+  make DESTDIR="$pkgdir" gamesdir=/usr/bin install
+}
diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD
deleted file mode 100644
index 577d7b4e5..000000000
--- a/pcr/prboom/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer (AUR): carstene1ns <url/mail: arch carsten-teibes de>
-# Contributor (AUR): Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor (AUR): Thayer Williams <thayer@archlinux.org>
-# Contributor (AUR): dale <dale@archlinux.org>
-
-pkgname=prboom
-pkgver=2.5.0
-pkgrel=7
-arch=('i686' 'x86_64')
-arch+=('armv7h')
-pkgdesc='A game engine which provides a program to play Doom levels.'
-url='http://prboom.sourceforge.net/'
-license=('GPL2')
-depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/prboom/$pkgname-$pkgver.tar.gz"
-        'libpng-1.4.patch')
-sha256sums=('226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae'
-            'eb3b41139b8269f9223b084f8444e306dac60dc6fc190d7fabf41b162adca385')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # path fix
-  sed "s|/games|/bin|g" -i src/Makefile.in
-  # allow building with newer libpng
-  patch -p1 < ../libpng-1.4.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --disable-i386-asm
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch
deleted file mode 100644
index a2215e37b..000000000
--- a/pcr/prboom/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
---- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
-+++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }