libre/angband: updated to 4.1.2

1 files changed, 21 insertions, 31 deletions

diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD
index df002c2ed..28f16b9ce 100644
--- a/libre/angband/PKGBUILD
+++ b/libre/angband/PKGBUILD
@@ -6,58 +6,49 @@
 # Contributor (Arch): Callan Barrett <wizzomafizzo@gmail.com>
 # Contributor (Arch): Christian Schmidt <xmucknertx@googlemail.com>
 # Contributor (Arch): Sebastian Sareyko <public@nooms.de>
-# Contributor (Hyperbola): André Silva <emulatorman@parabola.nu>
-# Contributor (Hyperbola): Márcio Silva <coadde@parabola.nu>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+# parabola changes and rationale:
+#  - removed nonfree artwork and sound effects
 
 pkgname=angband
-_pkgname=$pkgname-libre
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1.parabola1
 pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url="http://rephial.org/"
 license=('GPL2' 'custom')
-replaces=($_pkgname)
-conflicts=($_pkgname)
 depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses')
 makedepends=('python-docutils')
-mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz")
-source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" 'libre.patch')
-
-mksource() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # remove nonfree stuff from source
-  rm -v lib/sounds/*.mp3
-  rm -v lib/tiles/shockbolt/64x64.png
-}
+source=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz"
+        "libre.patch")
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/angband-${pkgver}"
 
   # Fix detection of ncurses config script for ncurses 6.0
   sed -i 's/ncursesw5-config/ncursesw6-config/g' acinclude.m4
 
-  # remove nonfree references
+  # remove nonfree artwork and sound effects
+  rm -v lib/sounds/*.mp3
+  rm -v lib/tiles/shockbolt/64x64.png
   patch -Np1 -i ../libre.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # ld fix for 4.1.0-1.parabola1
-  sed -i 's/-Wl,-r/& -no-pie/' src/Makefile
+  cd "${srcdir}/angband-${pkgver}"
 
   ./autogen.sh
 
   ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
-    --sysconfdir=/usr/share/$pkgname \
-    --with-configpath=/usr/share/$pkgname \
-    --with-libpath=/usr/share/$pkgname \
+    --sysconfdir=/usr/share/angband \
+    --with-configpath=/usr/share/angband \
+    --with-libpath=/usr/share/angband \
     --enable-gtk \
     --enable-sdl \
     --enable-sdl-mixer
@@ -66,14 +57,13 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/angband-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
-  rm -f "${pkgdir}/usr/share/$pkgname/*/delete.me"
+  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
   install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-mksha256sums=('3fd19b109acfbf75a1a4b40eb0110c267ed1d0cc80f6edfb2f377d68add9853f')
-sha256sums=('71cb3b6984fb26054dfce72ca36c741d035fb73b045cef8a42d75b234aaad55c'
-            'fa1524d1a3c5768b9090630d16393274fe007f87f3c0a00c4ffb5fc66e84fee9')
+md5sums=('d5499e26f59beb745d68a66d67050fc6'
+         'e5c50ec178e2ff617a00b3d7a10ea803')