5 files changed, 64 insertions, 57 deletions
diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD
index ab79eca94..d0303c4b1 100644
--- a/pcr/nexuiz/PKGBUILD
+++ b/pcr/nexuiz/PKGBUILD
@@ -1,59 +1,75 @@
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (AUR):  Ainola
+# Contributor (Arch): Sven-Hendrik Haase
 # Contributor (Arch): Xyne
 # Contributor (Arch): Rick Chen (stuffcorpse)
-# Contributor (Arch): Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor (Arch): Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor (Arch): Camille Moncelier <pix@devlife.org>
+# Contributor (Arch): Jaroslaw Swierczynski
+# Contributor (Arch): Roman Kyrylych
+# Contributor (Arch): Camille Moncelier
+
+# parabola changes and rationale:
+#  - added missing makedepends: mesa
 
 pkgname=nexuiz
 pkgver=2.5.2
-_zipver=252
-pkgrel=3.1
-arch=('i686' 'x86_64')
-pkgdesc="A free software first person shooter"
-url="http://www.alientrap.org/games/nexuiz"
+pkgrel=5
+arch=('i686' 'x86_64' 'armv7h')
+pkgdesc="Free Fast-paced multiplayer first-person shooter."
+url="http://www.alientrap.org/nexuiz/"
 license=("GPL")
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0')
+depends=('alsa-lib' 'libjpeg>=8' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'hicolor-icon-theme' 'sdl')
+conflicts=('nexuiz-data')
+provides=('nexuiz-data')
 makedepends=('mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_zipver}.zip \
-        nexuiz-dedicated nexuiz-glx nexuiz-sdl nexuiz-glx.desktop \
-        nexuiz-sdl.desktop nexuiz.png libpng14.patch)
-md5sums=('d750bc328e58df8492f8d88bdcf818cb'
-         '19bfaa6e891d3309783e8366db485474'
-         '4d0ee9282a6fe153f82f7797decfd585'
-         '3e5ea741e8d55df8e7691c797c81ffa7'
-         '310f0577c39391f2d2f17cea446ce269'
-         '4561d3c5be4801399af515faf82ebcba'
-         '442fb62670bbe0a1b5370461052051a3'
-	 '60964348924ff777a92dbb171a86a1ed')
-
-build() {
-  _nexdir="$pkgdir/opt/nexuiz"
-  _enginesource_date="20091001"
-  mkdir -p "$_nexdir" || return 1
-  
-  cd $srcdir/Nexuiz
-  bsdtar -x -f sources/enginesource${_enginesource_date}.zip || return 1
-  cd darkplaces
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-  # patch -p1 < "$srcdir/nexuiz-libjpeg-fix.patch" || return 1
-  
-  # here's a working kludge to build all three binaries at once but don't use it ;)
-  # make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || return 1
-  
-  # build the binaries separately instead to avoid truncated files
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz || return 1
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver//./}.zip" \
+        "nexuiz-glx.desktop" "nexuiz-sdl.desktop" \
+        "libpng14.patch" "nex-icons.tar.gz")
+sha256sums=('a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000'
+            'bdeeb0a8eec23122311c8a574dd9a8c8616d352daa285b34b74fac17fb5d5031'
+            'bc1827a1677b48d20edc6d297cf465f0c8d511fc3ca829c63946042222d2aee0'
+            '327c45a56faa1963fa08a590694fd0c23bed448282f9473c2d483447df9a6e1f'
+            '25e478b783bb7f8cff04b7c3e538a82e8ab852d72930277e83d00777d2a7186e')
+# Prevent compressing final package
+PKGEXT='.pkg.tar'
+
+build(){
+    cd "${srcdir}/Nexuiz"
+    bsdtar -x -f "sources/enginesource20091001.zip"
+    cd darkplaces
+    patch -Np1 -i "${srcdir}/libpng14.patch"
+
+    # Build the binaries separately instead to avoid truncated files
+    make CPUOPTIMIZATIONS="$CFLAGS" DP_FS_BASEDIR=/usr/share/nexuiz/ DP_LINK_TO_LIBJPEG=1 cl-nexuiz
+    make CPUOPTIMIZATIONS="$CFLAGS" DP_FS_BASEDIR=/usr/share/nexuiz/ DP_LINK_TO_LIBJPEG=1 sdl-nexuiz
+    make CPUOPTIMIZATIONS="$CFLAGS" DP_FS_BASEDIR=/usr/share/nexuiz/ DP_LINK_TO_LIBJPEG=1 sv-nexuiz
 }
 
-package() {
-  cd $srcdir/Nexuiz/darkplaces
-  # install the compiled binaries
-  install -Dm755 nexuiz-glx nexuiz-sdl nexuiz-dedicated -t $_nexdir || return 1
+package(){
+    install -Dm755 "Nexuiz/darkplaces/nexuiz-dedicated" "${pkgdir}/usr/bin/nexuiz-dedicated"
+    install -Dm755 "Nexuiz/darkplaces/nexuiz-glx" "${pkgdir}/usr/bin/nexuiz-glx"
+    install -Dm755 "Nexuiz/darkplaces/nexuiz-sdl" "${pkgdir}/usr/bin/nexuiz-sdl"
+    install -Dm644 "${srcdir}/"*.desktop -t "${pkgdir}/usr/share/applications"
+
+    # Documentation
+    install -dm755 "${pkgdir}/usr/share/doc/nexuiz/"
+    mv "${srcdir}/Nexuiz/Docs/"* "${pkgdir}/usr/share/doc/nexuiz/"
+    find "${pkgdir}/usr/share/doc/nexuiz" -type d -exec chmod 755 {} \;
+    find "${pkgdir}/usr/share/doc/nexuiz" -type f -exec chmod 644 {} \;
+
+    # Game Data
+    install -dm755 "${pkgdir}/usr/share/nexuiz"
+    for dir in data havoc server; do
+        mv "${srcdir}/Nexuiz/${dir}" "${pkgdir}/usr/share/nexuiz/"
+        find "${pkgdir}/usr/share/nexuiz/${dir}" -type d -exec chmod 755 {} \;
+        find "${pkgdir}/usr/share/nexuiz/${dir}" -type f -exec chmod 644 {} \;
+    done
+
+    # Remove unneeded cruft
+    find "${pkgdir}/usr/share/nexuiz/server" -name "*_windows.bat" -exec rm {} \;
+    find "${pkgdir}/usr/share/nexuiz/server" -name "*_mac.sh" -exec rm {} \;
 
-  install -dm755 $pkgdir/usr/{bin,share/applications} || return 1
-  install -Dm755 $srcdir/nexuiz-{glx,sdl,dedicated} -t $pkgdir/usr/bin || return 1
-  install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications || return 1
-  install -Dm644 $srcdir/nexuiz.png $pkgdir/usr/share/pixmaps/nexuiz.png || return 1
+    # Icons
+    for size in 16 22 24 32 48 64 128 256 512; do
+        install -Dm644 "${srcdir}/nex${size}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/nexuiz.png"
+    done
 }
diff --git a/pcr/nexuiz/nexuiz-dedicated b/pcr/nexuiz/nexuiz-dedicated
deleted file mode 100644
index bf517cce7..000000000
--- a/pcr/nexuiz/nexuiz-dedicated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-dedicated $@
diff --git a/pcr/nexuiz/nexuiz-glx b/pcr/nexuiz/nexuiz-glx
deleted file mode 100644
index 5fad4db07..000000000
--- a/pcr/nexuiz/nexuiz-glx
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-glx $@
diff --git a/pcr/nexuiz/nexuiz-sdl b/pcr/nexuiz/nexuiz-sdl
deleted file mode 100644
index 36b6d5cc3..000000000
--- a/pcr/nexuiz/nexuiz-sdl
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-sdl $@
diff --git a/pcr/nexuiz/nexuiz.png b/pcr/nexuiz/nexuiz.png
deleted file mode 100644
index a0ec8b3d4..000000000
--- a/pcr/nexuiz/nexuiz.png
+++ /dev/null