Huge PKGBUILD cleanup

2 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b63eb480601f..aab998f41811 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = stone-soup-tiles-git
 	pkgdesc = Community maintained variant of Linley's Dungeon Crawl (tiles) - git version
-	pkgver = 0.27.a0.r797.g27d10ad80f
+	pkgver = 0.27.a0.r906.g0a00ce863d
 	pkgrel = 1
 	url = http://crawl.develz.org
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = custom
 	makedepends = pngcrush
 	makedepends = git
 	makedepends = python-yaml
-	depends = lua
+	makedepends = lua
 	depends = sdl2_image
 	depends = xdg-utils
 	depends = freetype2
@@ -19,8 +19,8 @@ pkgbase = stone-soup-tiles-git
 	conflicts = stone-soup-tiles
 	source = git://github.com/crawl/crawl.git
 	source = stone-soup-tiles-git.desktop
-	sha1sums = SKIP
-	sha1sums = f598ea37ab97dd34f0d35f33b0b4b3bfc928067d
+	sha256sums = SKIP
+	sha256sums = bc6985944bd5fc44d96fe705725430e97161b5e428ab17e6cf7a0d7976681119
 
 pkgname = stone-soup-tiles-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e04c67bef84f..c146ff4bb833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,19 @@
 
 pkgname=stone-soup-tiles-git
 _pkgname=crawl
-pkgver=0.27.a0.r797.g27d10ad80f
+pkgver=0.27.a0.r906.g0a00ce863d
 pkgrel=1
 pkgdesc="Community maintained variant of Linley's Dungeon Crawl (tiles) - git version"
 arch=('i686' 'x86_64')
 url="http://crawl.develz.org"
-depends=(lua sdl2_image xdg-utils freetype2 glu sqlite)
-makedepends=(pngcrush git python-yaml)
-license=('GPL2')
+depends=(sdl2_image xdg-utils freetype2 glu sqlite)
+makedepends=(pngcrush git python-yaml lua)
+license=('custom')
 conflicts=('crawl' 'stone-soup-tiles')
 source=(git://github.com/crawl/crawl.git
 stone-soup-tiles-git.desktop)
-sha1sums=('SKIP'
-          'f598ea37ab97dd34f0d35f33b0b4b3bfc928067d')
+sha256sums=('SKIP'
+            'bc6985944bd5fc44d96fe705725430e97161b5e428ab17e6cf7a0d7976681119')
 
 prepare() {
 	cd "${srcdir}/${_pkgname}"
@@ -29,20 +29,22 @@ pkgver() {
   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  cd "${srcdir}/${_pkgname}/crawl-ref/source"
-  make prefix=/usr/bin \
-       DESTDIR="${pkgdir}" \
-       SAVEDIR="~/.crawl/" \
-       DATADIR="/usr/share/${pkgname}/data" \
-       TILES=y SAVEDIR='~/.crawl'
-
-}
-
 package() {
   cd "${srcdir}/${_pkgname}/crawl-ref/source"
-  make install prefix="${pkgdir}/usr/" DATADIR="${pkgdir}/usr/share/${pkgname}/data" TILES=y SAVEDIR='~/.crawl'
+  
+  make prefix=/usr DESTDIR="${pkgdir}" SAVEDIR="~/.stone-soup/" \
+         DATADIR="/usr/share/${_pkgname}/data" \
+         USE_UNICODE=y TILES=y install
+  
+  # Some dirty operations needed to get everything working.
+  
   mkdir -p $pkgdir/usr/share/{applications,pixmaps}
+  mkdir -p $pkgdir/usr/bin/
+  mv "${pkgdir}/usr/games/crawl" "${pkgdir}/usr/bin/crawl"
+  rm -rf $pkgdir/usr/games/
+  
+  install -D -m644 $srcdir/$_pkgname/LICENSE "${pkgdir}/usr/share/licenses/$pkgname/license.txt"
+  
   cp ${srcdir}/${_pkgname}/crawl-ref/source/dat/tiles/stone_soup_icon-32x32.png $pkgdir/usr/share/pixmaps/$pkgname.png
   cp $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/
 }