Cleaned up PKGBUILD based on recent AUR changes

1 files changed, 41 insertions, 35 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6e797d9..5ac0410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,69 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
 # Maintainer (AUR): Max Zhao <alcasa dot mz at gmail dot com>
 # Contributor (AUR): Leonard König <leonard.r.koenig at googlemail dot com>
+# Contributor (AUR): George Rawlinson <george@rawlinson.net.nz>
 
 # # I maintain this because:
-# AUR version doesn't use pkgname for source package
 # AUR version uses /usr/share/games
-# AUR version is cluttered
 
-pkgname='endless-sky'
+pkgname=endless-sky
 pkgver=0.9.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://endless-sky.github.io/"
-depends=('sdl2' 'libjpeg-turbo' 'glew' 'openal' 'hicolor-icon-theme' 'libmad')
-makedepends=('scons')
+depends=(openal libpng glew hicolor-icon-theme libjpeg-turbo sdl2 libmad)
+makedepends=(scons)
+optdepends=('endless-sky-high-dpi: high resolution graphics assets'
+            'endless-sky-editor: map editor')
 license=('GPL3' 'CCPL' 'custom:public domain')
 pkgdesc="A space exploration and combat game similar to Escape Velocity"
 source=(
-        ${pkgname}-${pkgver}.tar.gz::https://github.com/endless-sky/endless-sky/archive/v${pkgver}.tar.gz
-        $pkgname.desktop)
+        "$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
+        $pkgname.desktop
+        )
 
-sha256sums=('69078c67656709646deb0c46fd960aa905601c23bb47c1696b0962ae8dff6d1e'
-            'c4487992730c9b562a806b432d1ecdbe7a79136d34240e92f588376879d09e0e')
+sha512sums=('521026cb70372fd380b14a1a1d296f86015e5999dc233f4d9c05d958092e1f3982d2f12e913a435d5827fb45945bd4b60bbae293c2c90685024cdae96e352078'
+            '8948a286a84df381171888ab44da877476594b1f0877a3e54699a072fc0a85713767af7e1edbaf24d9fc8de49f1fe3d8e7955b1908eb2d02a5ea6d1027834527')
 
 build() {
-	cd $pkgname-$pkgver
-	scons -j 2
-  # gzip manpage
-  gzip -f endless-sky.6
+  cd $pkgname-$pkgver
+  scons -j 2
 }
 
 
 package() {
-	cd $pkgname-$pkgver
-	# Install executables
-	install -Dm755 endless-sky ${pkgdir}/usr/bin/${pkgname}
+  cd $pkgname-$pkgver
+
+  # Install executable
+  install -Dm755 endless-sky $pkgdir/usr/bin/$pkgname
 
   # resources
   ## They explicitly want this path. Although one could workaround with '-r' param
-  install --directory ${pkgdir}/usr/lib/${pkgname}
-  cp -rf data images sounds ${pkgdir}/usr/lib/${pkgname}/
-  install -Dm644 credits.txt ${pkgdir}/usr/lib/${pkgname}/credits.txt
-  install -Dm644 keys.txt ${pkgdir}/usr/lib/${pkgname}/keys.txt
-
-  # icons and .desktop
-  _idir=endless-sky.iconset
-  _iddir=${pkgdir}/usr/share/icons/hicolor
-
-  install -Dm644 icons/icon_16x16.png ${_iddir}/16x16/apps/${pkgname}.png
-  install -Dm644 icons/icon_22x22.png ${_iddir}/22x22/apps/${pkgname}.png
-  install -Dm644 icons/icon_24x24.png ${_iddir}/24x24/apps/${pkgname}.png
-  install -Dm644 icons/icon_32x32.png ${_iddir}/32x32/apps/${pkgname}.png
-  install -Dm644 icons/icon_48x48.png ${_iddir}/48x48/apps/${pkgname}.png
-  install -Dm644 icons/icon_256x256.png ${_iddir}/256x256/apps/${pkgname}.png
-  install -Dm644 $srcdir/$pkgname.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install --directory "$pkgdir/usr/lib/$pkgname"
+  cp -rf data images sounds "$pkgdir/usr/lib/$pkgname/"
+  install -Dm644 credits.txt "$pkgdir/usr/lib/$pkgname/credits.txt"
+  install -Dm644 keys.txt "$pkgdir/usr/lib/$pkgname/keys.txt"
+
+  # .desktop
+  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+
+  # icons
+  for res in 16 22 24 32 48 256; do
+    install -Dm644 \
+      "${srcdir}/${pkgname}-${pkgver}/icons/icon_${res}x${res}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png"
+  done
+
+  # mac icon directory has additional icons [128+512px]
+  for res in 128 512; do
+    install -Dm644 \
+      "${srcdir}/${pkgname}-${pkgver}/icons/endless-sky.iconset/icon_${res}x${res}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png"
+  done
 
   # manpage
-  install -Dm644 endless-sky.6.gz ${pkgdir}/usr/share/man/man6/${pkgname}.6.gz
+  install -Dm644 -t "${pkgdir}/usr/share/man/man6" endless-sky.6
 
   # copyright
-  install -Dm644 copyright ${pkgdir}/usr/share/licenses/${pkgname}/copyright
+  install -Dm644 copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }