refactor: major overhaul

- add missing dependencies
- remove unnecessary $pkgname.install
- simplify .gitignore
- add missing icons

4 files changed, 65 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81a4c0c015e0..1704964e85ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Mon May  2 15:31:11 UTC 2016
 pkgbase = endless-sky-git
 	pkgdesc = A space exploration and combat game similar to Escape Velocity
-	pkgver = 0.9.0.r21.g7c74390
+	pkgver = 0.9.8.r536.gee883a47
 	pkgrel = 1
 	url = http://endless-sky.github.io/
-	install = endless-sky.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -13,16 +10,17 @@ pkgbase = endless-sky-git
 	license = custom:public domain
 	makedepends = git
 	makedepends = scons
-	depends = sdl2
-	depends = libjpeg-turbo
-	depends = glew
 	depends = openal
 	depends = hicolor-icon-theme
-	depends = xdg-utils
+	depends = libjpeg-turbo
+	depends = libmad
+	depends = glew
+	depends = libpng
+	depends = sdl2
+	provides = endless-sky
+	conflicts = endless-sky
 	source = endless-sky::git+https://github.com/endless-sky/endless-sky.git#branch=master
-	source = endless-sky.install
 	md5sums = SKIP
-	md5sums = 35480c7b8a09c11ddce957f9e279637c
 
 pkgname = endless-sky-git
 
diff --git a/.gitignore b/.gitignore
index 44d319eb49a6..ece5118f22b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,16 @@
-*
-!.gitignore
-!PKGBUILD
-!*.install
-!.SRCINFO
+# Directories
+pkg
+src
+endless-sky
+
+# Archives
+*.tar
+*.tar.*
+*.zip
+*.tgz
+*.sig
+*.deb
+
+# Logs
+*.log
+*.log.*
diff --git a/PKGBUILD b/PKGBUILD
index cc7ace5d71eb..03a11925390f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,69 @@
-# Maintainer: Leonard König <leonard.r.koenig at googlemail dot com>
+# Maintainer: George Rawlinson <george@rawlinson.net.nz>
+# Contributor: Leonard König <leonard.r.koenig at googlemail dot com>
+
 pkgname='endless-sky-git'
 _gitname='endless-sky'
-pkgver=0.9.0.r21.g7c74390
+pkgver=0.9.8.r536.gee883a47
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://endless-sky.github.io/"
-# libpng and libgl are already fetched by sdl2
-# xdg-utils for icon cache
-depends=('sdl2' 'libjpeg-turbo' 'glew' 'openal' 'hicolor-icon-theme' 'xdg-utils')
+provides=('endless-sky')
+depends=('openal' 'hicolor-icon-theme' 'libjpeg-turbo' 'libmad' 'glew' 'libpng' 'sdl2')
 makedepends=('git' 'scons')
+optdepends=('endless-sky-high-dpi: high resolution graphics assets'
+            'endless-sky-editor: map editor')
+conflicts=('endless-sky')
 license=('GPL3' 'CCPL' 'custom:public domain')
 pkgdesc="A space exploration and combat game similar to Escape Velocity"
-install=${_gitname}.install
-source=("${_gitname}::git+https://github.com/endless-sky/endless-sky.git#branch=master"
-        "${_gitname}.install")
-
-md5sums=('SKIP'
-         '35480c7b8a09c11ddce957f9e279637c')
-#
-# PKGEXT='.pkg.tar'
-#
+source=("${_gitname}::git+https://github.com/endless-sky/endless-sky.git#branch=master")
+md5sums=('SKIP')
 
 pkgver() {
-	cd "$_gitname"
-  # cut off the 'v'
-  git describe --long --tags| sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$_gitname"
+    # cutting off 'v' prefix that presents in the git tag
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-
 build() {
-	cd $_gitname
-	scons
-  # gzip manpage
-  gzip -f endless-sky.6
+  cd $_gitname
+  scons
 }
 
-
 package() {
-	cd $_gitname
-	# Install executables
-	install -D --mode=755 endless-sky ${pkgdir}/usr/bin/endless-sky
+  cd $_gitname
+
+  # Install executable
+  install -Dm755 -t "${pkgdir}/usr/bin" endless-sky
 
   # resources
   ## They explicitly want this path. Although one could workaround with '-r' param
-  install --directory ${pkgdir}/usr/share/games/${_gitname}
-  cp -rf data images sounds ${pkgdir}/usr/share/games/${_gitname}/
-  install -D --mode=644 credits.txt ${pkgdir}/usr/share/games/${_gitname}/credits.txt
-  install -D --mode=644 keys.txt ${pkgdir}/usr/share/games/${_gitname}/keys.txt
+  install -Dm644 -t "${pkgdir}/usr/share/games/${_gitname}" credits.txt
+  install -Dm644 -t "${pkgdir}/usr/share/games/${_gitname}" keys.txt
+  cp -rf data images sounds "${pkgdir}/usr/share/games/${_gitname}/"
+
+
+  # .desktop
+  install -Dm644 -t "${pkgdir}/usr/share/applications" endless-sky.desktop
 
-  # icons and .desktop
-  _idir=endless-sky.iconset
-  _iddir=${pkgdir}/usr/share/icons/hicolor
+  # icons
+  for res in 16 22 24 32 48 256; do
+    install -Dm644 \
+      "icons/icon_${res}x${res}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_gitname}.png"
+  done
 
-  install -D --mode=644 $_idir/icon_16x16.png ${_iddir}/16x16/apps/${_gitname}.png
-  install -D --mode=644 $_idir/icon_22x22.png ${_iddir}/22x22/apps/${_gitname}.png
-  install -D --mode=644 $_idir/icon_24x24.png ${_iddir}/24x24/apps/${_gitname}.png
-  install -D --mode=644 $_idir/icon_32x32.png ${_iddir}/32x32/apps/${_gitname}.png
-  install -D --mode=644 $_idir/icon_48x48.png ${_iddir}/48x48/apps/${_gitname}.png
-  install -D --mode=644 $_idir/icon_256x256.png ${_iddir}/256x256/apps/${_gitname}.png
-  install -D --mode=644 endless-sky.desktop ${pkgdir}/usr/share/applications/${_gitname}.desktop
+  # mac icon directory has additional icons [128+512px]
+  for res in 128 512; do
+    install -Dm644 \
+      "icons/endless-sky.iconset/icon_${res}x${res}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_gitname}.png"
+  done
 
   # manpage
-  install -D --mode=644 endless-sky.6.gz ${pkgdir}/usr/share/man/man6/${_gitname}.6.gz
+  install -Dm644 -t "${pkgdir}/usr/share/man/man6" endless-sky.6
 
   # copyright
-  install -D --mode=644 copyright ${pkgdir}/usr/share/licenses/${pkgname}/copyright
+  install -Dm644 copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/endless-sky.install b/endless-sky.install
deleted file mode 100644
index 96588ada7423..000000000000
--- a/endless-sky.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	_iddir=/usr/share/icons/hicolor
-  xdg-icon-resource install --novendor --size 16 ${_iddir}/icon_16x16.png ${_gitname}
-  xdg-icon-resource install --novendor --size 22 ${_iddir}/icon_22x22.png ${_gitname}
-  xdg-icon-resource install --novendor --size 24 ${_iddir}/icon_24x24.png ${_gitname}
-  xdg-icon-resource install --novendor --size 32 ${_iddir}/icon_32x32.png ${_gitname}
-  xdg-icon-resource install --novendor --size 48 ${_iddir}/icon_48x48.png ${_gitname}
-  xdg-icon-resource install --novendor --size 256 ${_iddir}/icon_256x256.png ${_gitname}
-#  update-desktop-database -q
-}
-
-post_remove() {
-  xdg-icon-resource uninstall --novendor --size 16 ${_iddir}/icon_16x16.png ${_gitname}
-  xdg-icon-resource uninstall --novendor --size 22 ${_iddir}/icon_22x22.png ${_gitname}
-  xdg-icon-resource uninstall --novendor --size 24 ${_iddir}/icon_24x24.png ${_gitname}
-  xdg-icon-resource uninstall --novendor --size 32 ${_iddir}/icon_32x32.png ${_gitname}
-  xdg-icon-resource uninstall --novendor --size 48 ${_iddir}/icon_48x48.png ${_gitname}
-  xdg-icon-resource uninstall --novendor --size 256 ${_iddir}/icon_256x256.png ${_gitname}
-  #  update-desktop-database -q
-}
-
-# vim:set ts=2 sw=2 et: