Modernize PKGBUILD

2 files changed, 99 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9917ca93123..aea784385c07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = quake2
 	pkgdesc = Quake 2 engine. You need the retail .pak files to play.
 	pkgver = r0.16.2
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.icculus.org/quake2/
 	install = quake2.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = patch
-	makedepends = unzip
+	depends = bash
 	depends = libjpeg
 	depends = sdl
 	depends = libxxf86vm
@@ -33,26 +32,26 @@ pkgbase = quake2
 	source = ctf.sh
 	source = snd_alsa.c
 	source = gnusource.patch
-	md5sums = 872fee27fb13a2a4c8876d5973c3c691
-	md5sums = 41fc4ecc4f25c068e7d1f488bd4a1e1a
-	md5sums = 7d5e052839c9e629bad0a6570aa70554
-	md5sums = 490557d4a90ff346a175d865a2bade87
-	md5sums = 04d3f1fb7fb4dada7175a41f4595c7eb
-	md5sums = fc2de3c33c23cca5f0e6fcec068ce616
-	md5sums = 221019679613a13c6d7e5f9e21701d85
-	md5sums = 0c8b49c303014e535394168aed9b668a
-	md5sums = 9628c82566535e48c59caaee5281b963
-	md5sums = 5d47605de09c458c7f1c69d8e6fea6a7
-	md5sums = 94b18e1f2d76fb7e7d0c5bd0ae8d7c69
-	md5sums = e24d79286ba3c1f3da1f9642a78c49af
-	md5sums = 070a4d00b93a2a427ca92adee2736000
-	md5sums = 4d17fc480cc413b890fa06998643edc0
-	md5sums = 50c72cc1ded252ee86db31ac8fa5b569
-	md5sums = 1a63caa4b66e6dbc63ed5c5fb15b9777
-	md5sums = 2deb322d859490f9178393abf74a3a27
-	md5sums = 3fe30c3a48f93f431ea191f13d49ea22
-	md5sums = c16644a6ddf93159ccc71e4c06e312c4
-	md5sums = 5788ed0d1bde8b00fa8b91a0c865f427
+	sha256sums = 98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9
+	sha256sums = 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
+	sha256sums = ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
+	sha256sums = f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa
+	sha256sums = 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770
+	sha256sums = 196dc096c1f4fd620c19a09593e5b770ddbeed7d864ca3a95383f7bf9538fbc3
+	sha256sums = dcddd989b568cb28aa6c2a877d81df50a71fd9a649ce6dd44f454efe13e26a73
+	sha256sums = 170af42c090940c89f1bf16e8518733bc39dac070e0d42e4eacad727b37de256
+	sha256sums = 085b22e5a9f23299e6f0519e402711725cdac51fc399ce577d0d701df0a72681
+	sha256sums = 78d3b02d20f856b3a0680035b0d67a80a16bede372eef3330b58c755387ff1ff
+	sha256sums = eb21fbc6d0bcd69fb1d3768bcb7f0bbff03e28c18c67f239497d15749913ded3
+	sha256sums = e9585c18ec1f53b95dad833f76ac2df54586d3171e0f3a93ba7c2acce8d915be
+	sha256sums = ee7d5aaee977a8dd198c61a2bcca446b2ab421ee6eaa3a18159671dd742a9540
+	sha256sums = df049ce47922b5d13784f24f7e0457ec48ee1ff19254c3d6c473da684474e490
+	sha256sums = 238f2efc57f1dc04f604932afda4da5332c3798b689bb9edff951b8e405e8fc5
+	sha256sums = ca832709e8b9dd92ff95959a884127be1804d85381f494b14713c860ae6db471
+	sha256sums = 8655b4216ea95d2408dcc28de53e53df587aa6959a95c62cc6d7f3eb63492202
+	sha256sums = ea50ae5cca9d633fe2ad30c59beb2ad350130bdd2a78f773639794f2c12d1ed1
+	sha256sums = fd434189a6242ad288e5827c8285e0dca3f26fe447be50204d4b6817cb1ae624
+	sha256sums = 9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617
 
 pkgname = quake2
 
diff --git a/PKGBUILD b/PKGBUILD
index 88632c67b832..e6c89bebfa55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,69 @@
-# Contributor: Slash <demodevil5 [at] yahoo [dot] com>
+# Maintainer: Slash <demodevil5 [at] yahoo [dot] com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: Premysl Janouch <warriant@gmail.com>
 
 pkgname=quake2
 pkgver=r0.16.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Quake 2 engine. You need the retail .pak files to play."
 url="http://www.icculus.org/quake2/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libjpeg' 'sdl' 'libxxf86vm' 'libxxf86dga')
-makedepends=('patch' 'unzip')
+depends=('bash' 'libjpeg' 'sdl' 'libxxf86vm' 'libxxf86dga')
 install="quake2.install"
-source=("http://www.icculus.org/quake2/files/quake2-$pkgver.tar.gz" \
-'http://cesium.di.uminho.pt/pub/games/quake2/source/xatrixsrc320.shar.Z' \
-'http://cesium.di.uminho.pt/pub/games/quake2/source/roguesrc320.shar.Z' \
-'ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe' \
-'http://www.icculus.org/quake2/files/maxpak.pak' \
-'http://www.icculus.org/quake2/files/pak10.pak' \
-'http://www.icculus.org/quake2/files/pak11.pak' \
-'http://www.icculus.org/quake2/files/pak12.pak' \
-'http://www.icculus.org/quake2/files/pak13.pak' \
-'http://www.icculus.org/quake2/files/pak14.pak' \
-'http://www.icculus.org/quake2/files/pak16.pak' \
-'http://www.icculus.org/quake2/files/pak17.pak' \
-'http://www.icculus.org/quake2/files/pak19.pak' \
-'quake2.sh' 'q2ded.sh' 'xatrix.sh' 'rogue.sh' 'ctf.sh' 'snd_alsa.c' 'gnusource.patch')
-md5sums=('872fee27fb13a2a4c8876d5973c3c691'
-         '41fc4ecc4f25c068e7d1f488bd4a1e1a'
-         '7d5e052839c9e629bad0a6570aa70554'
-         '490557d4a90ff346a175d865a2bade87'
-         '04d3f1fb7fb4dada7175a41f4595c7eb'
-         'fc2de3c33c23cca5f0e6fcec068ce616'
-         '221019679613a13c6d7e5f9e21701d85'
-         '0c8b49c303014e535394168aed9b668a'
-         '9628c82566535e48c59caaee5281b963'
-         '5d47605de09c458c7f1c69d8e6fea6a7'
-         '94b18e1f2d76fb7e7d0c5bd0ae8d7c69'
-         'e24d79286ba3c1f3da1f9642a78c49af'
-         '070a4d00b93a2a427ca92adee2736000'
-         '4d17fc480cc413b890fa06998643edc0'
-         '50c72cc1ded252ee86db31ac8fa5b569'
-         '1a63caa4b66e6dbc63ed5c5fb15b9777'
-         '2deb322d859490f9178393abf74a3a27'
-         '3fe30c3a48f93f431ea191f13d49ea22'
-         'c16644a6ddf93159ccc71e4c06e312c4'
-         '5788ed0d1bde8b00fa8b91a0c865f427')
+source=("http://www.icculus.org/quake2/files/quake2-${pkgver}.tar.gz" \
+    'http://cesium.di.uminho.pt/pub/games/quake2/source/xatrixsrc320.shar.Z' \
+    'http://cesium.di.uminho.pt/pub/games/quake2/source/roguesrc320.shar.Z' \
+    'ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe' \
+    'http://www.icculus.org/quake2/files/maxpak.pak' \
+    'http://www.icculus.org/quake2/files/pak10.pak' \
+    'http://www.icculus.org/quake2/files/pak11.pak' \
+    'http://www.icculus.org/quake2/files/pak12.pak' \
+    'http://www.icculus.org/quake2/files/pak13.pak' \
+    'http://www.icculus.org/quake2/files/pak14.pak' \
+    'http://www.icculus.org/quake2/files/pak16.pak' \
+    'http://www.icculus.org/quake2/files/pak17.pak' \
+    'http://www.icculus.org/quake2/files/pak19.pak' \
+    'quake2.sh' 'q2ded.sh' 'xatrix.sh' 'rogue.sh' 'ctf.sh' 'snd_alsa.c' \
+    'gnusource.patch')
+sha256sums=('98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9'
+            '94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589'
+            'ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919'
+            'f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa'
+            '653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770'
+            '196dc096c1f4fd620c19a09593e5b770ddbeed7d864ca3a95383f7bf9538fbc3'
+            'dcddd989b568cb28aa6c2a877d81df50a71fd9a649ce6dd44f454efe13e26a73'
+            '170af42c090940c89f1bf16e8518733bc39dac070e0d42e4eacad727b37de256'
+            '085b22e5a9f23299e6f0519e402711725cdac51fc399ce577d0d701df0a72681'
+            '78d3b02d20f856b3a0680035b0d67a80a16bede372eef3330b58c755387ff1ff'
+            'eb21fbc6d0bcd69fb1d3768bcb7f0bbff03e28c18c67f239497d15749913ded3'
+            'e9585c18ec1f53b95dad833f76ac2df54586d3171e0f3a93ba7c2acce8d915be'
+            'ee7d5aaee977a8dd198c61a2bcca446b2ab421ee6eaa3a18159671dd742a9540'
+            'df049ce47922b5d13784f24f7e0457ec48ee1ff19254c3d6c473da684474e490'
+            '238f2efc57f1dc04f604932afda4da5332c3798b689bb9edff951b8e405e8fc5'
+            'ca832709e8b9dd92ff95959a884127be1804d85381f494b14713c860ae6db471'
+            '8655b4216ea95d2408dcc28de53e53df587aa6959a95c62cc6d7f3eb63492202'
+            'ea50ae5cca9d633fe2ad30c59beb2ad350130bdd2a78f773639794f2c12d1ed1'
+            'fd434189a6242ad288e5827c8285e0dca3f26fe447be50204d4b6817cb1ae624'
+            '9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617')
+PKGEXT='.pkg.tar'
+
+# Computer Architecture Variable used by Quake2
+[ "${CARCH}" = "i686" ] && _dirarch=i386
+[ "${CARCH}" = "x86_64" ] && _dirarch=x86_64
 
 build() {
-    cd $srcdir
-
-    # Computer Architecture Variable used by Quake2
-    [ "$CARCH" = "i686" ] && _dirarch=i386
-    [ "$CARCH" = "x86_64" ] && _dirarch=x86_64
+    cd ${srcdir}
 
     # Create Temporary Directories
-    install -d $pkgname-$pkgver/src/xatrix $pkgname-$pkgver/src/rogue
+    install -d ${pkgname}-${pkgver}/src/xatrix ${pkgname}-${pkgver}/src/rogue
 
     # Decompress and patch The Reckoning (xatrix) and Ground Zero (rouge) Expansions
     for _addon in xatrix rogue; do
         _shar=${_addon}src320.shar
 
-        cp $srcdir/${_shar}.Z $srcdir/$pkgname-$pkgver/src/${_addon}
-        cd $srcdir/$pkgname-$pkgver/src/${_addon}
+        cp ${srcdir}/${_shar}.Z ${srcdir}/${pkgname}-${pkgver}/src/${_addon}
+        cd ${srcdir}/${pkgname}-${pkgver}/src/${_addon}
 
         # Decompress
         msg "Unpacking ${_shar}.Z"
@@ -91,73 +92,76 @@ build() {
 
     msg "The Reckoning and Ground Zero Expansion install complete"
 
-    cd $srcdir/$pkgname-$pkgver/
+    cd ${srcdir}/${pkgname}-${pkgver}/
 
     # Patch from SVN
-    cp $srcdir/snd_alsa.c ./src/linux/snd_alsa.c
+    cp ${srcdir}/snd_alsa.c ./src/linux/snd_alsa.c
 
     # x86_64 patch from Gentoo
-    patch -p1 < $srcdir/gnusource.patch
+    patch -p1 < ${srcdir}/gnusource.patch
 
     # libjpeg Fix
     /bin/sed -i -e 's:jpeg_mem_src:_&:' \
-        $srcdir/$pkgname-$pkgver/src/ref_candygl/gl_image.c
+        ${srcdir}/${pkgname}-${pkgver}/src/ref_candygl/gl_image.c
 
     msg "Compiling Quake 2"
 
     # Compile Quake 2
     make -s BUILD_XATRIX=YES BUILD_ROGUE=YES BUILD_DEDICATED=YES BUILD_CTF=YES BUILD_QMAX=YES build_release
+}
 
-    cd $srcdir/$pkgname-$pkgver/release$_dirarch
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}/release${_dirarch}
 
     # Create Destination Directories
-    install -d $pkgdir/opt/quake2/{baseq2,ctf,xatrix,rogue}
+    install -d ${pkgdir}/opt/quake2/{baseq2,ctf,xatrix,rogue}
 
     # Install Binary
-    install -m 755 quake2 $pkgdir/opt/quake2/quake2
+    install -m 755 quake2 ${pkgdir}/opt/quake2/quake2
 
     # Install Binary (SDL)
-    install -m 755 sdlquake2 $pkgdir/opt/quake2/sdlquake2
+    install -m 755 sdlquake2 ${pkgdir}/opt/quake2/sdlquake2
 
     # Install Base Game Library
-    install -m 755 game$_dirarch.so $pkgdir/opt/quake2/baseq2/
+    install -m 755 game${_dirarch}.so ${pkgdir}/opt/quake2/baseq2/
 
     # Install CTF Library
-    install -m 755 ctf/game$_dirarch.so $pkgdir/opt/quake2/ctf/
+    install -m 755 ctf/game${_dirarch}.so ${pkgdir}/opt/quake2/ctf/
 
     # Install Xatrix Library
-    install -m 755 xatrix/game$_dirarch.so $pkgdir/opt/quake2/xatrix/
+    install -m 755 xatrix/game${_dirarch}.so ${pkgdir}/opt/quake2/xatrix/
 
     # Install Rogue Library
-    install -m 755 rogue/game$_dirarch.so $pkgdir/opt/quake2/rogue/
+    install -m 755 rogue/game${_dirarch}.so ${pkgdir}/opt/quake2/rogue/
 
     # Install Additional Libraries
-    cp ref_*.so $pkgdir/opt/quake2/
+    cp ref_*.so ${pkgdir}/opt/quake2/
 
-    cd $srcdir
+    cd ${srcdir}
 
     # Decompress and Install CTF Patch Data
-    mkdir $srcdir/q2
-    cp $srcdir/q2-3.20-x86-full-ctf.exe $srcdir/q2
-    cd $srcdir/q2
+    mkdir ${srcdir}/q2
+    cp ${srcdir}/q2-3.20-x86-full-ctf.exe ${srcdir}/q2
+    cd ${srcdir}/q2
     unzip -L q2-3.20-x86-full-ctf.exe
-    cp baseq2/pak1.pak baseq2/pak2.pak $pkgdir/opt/quake2/baseq2/
-    cp -r baseq2/players $pkgdir/opt/quake2/baseq2/
-    cp ctf/* $pkgdir/opt/quake2/ctf/
+    cp baseq2/pak1.pak baseq2/pak2.pak ${pkgdir}/opt/quake2/baseq2/
+    cp -r baseq2/players ${pkgdir}/opt/quake2/baseq2/
+    cp ctf/* ${pkgdir}/opt/quake2/ctf/
 
     # Install Q2Max Pak File
-    install $srcdir/maxpak.pak $pkgdir/opt/quake2/baseq2/
+    install ${srcdir}/maxpak.pak ${pkgdir}/opt/quake2/baseq2/
 
     # Install Additional pak Files
     for i in {10,11,12,13,14,16,17,19}; do
-        install -m 644 $srcdir/pak${i}.pak $pkgdir/opt/quake2/baseq2/pak${i}.pak
+        install -m 644 ${srcdir}/pak${i}.pak \
+            ${pkgdir}/opt/quake2/baseq2/pak${i}.pak
     done;
 
     # Install Game Launchers
-    install -D -m 755 $startdir/quake2.sh $pkgdir/usr/bin/quake2
-    install -D -m 755 $startdir/q2ded.sh  $pkgdir/usr/bin/q2ded
-    install -D -m 755 $startdir/xatrix.sh $pkgdir/usr/bin/quake2-the-reckoning
-    install -D -m 755 $startdir/rogue.sh  $pkgdir/usr/bin/quake2-ground-zero
-    install -D -m 755 $startdir/ctf.sh    $pkgdir/usr/bin/quake2-ctf
+    install -D -m 755 ${srcdir}/quake2.sh ${pkgdir}/usr/bin/quake2
+    install -D -m 755 ${srcdir}/q2ded.sh  ${pkgdir}/usr/bin/q2ded
+    install -D -m 755 ${srcdir}/xatrix.sh ${pkgdir}/usr/bin/quake2-the-reckoning
+    install -D -m 755 ${srcdir}/rogue.sh  ${pkgdir}/usr/bin/quake2-ground-zero
+    install -D -m 755 ${srcdir}/ctf.sh    ${pkgdir}/usr/bin/quake2-ctf
 }