[arch-commits] Commit in frotz/trunk (PKGBUILD)

[Ivy Foster]

    Date: Sunday, March 29, 2020 @ 18:27:43
  Author: escondida
Revision: 606314

update to 2.51

Modified:
  frotz/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-29 18:27:17 UTC (rev 606313)
+++ PKGBUILD	2020-03-29 18:27:43 UTC (rev 606314)
@@ -1,8 +1,8 @@
-# Maintainer: Ivy Foster <code at iff.ink>
+# Maintainer: Ivy Foster <iff at archlinux.org>
 
 pkgbase=frotz
 pkgname=(frotz-dumb frotz-ncurses frotz-sdl)
-pkgver=2.50
+pkgver=2.51
 pkgrel=1
 pkgdesc='Z-machine interpreter for interactive fiction games'
 
@@ -26,16 +26,17 @@
 arch=(x86_64)
 url='https://gitlab.com/DavidGriffith/frotz'
 license=(GPL)
-source=("https://gitlab.com/DavidGriffith/frotz/-/archive/$pkgver/frotz-$pkgver.tar.gz")
+# In the interest of reproducibility, use the Makefile at a specific commit
+source=(
+	"https://gitlab.com/DavidGriffith/frotz/-/archive/$pkgver/frotz-$pkgver.tar.gz"
+	https://gitlab.com/DavidGriffith/frotz/-/raw/588845ef704d2341bf5d3cd8e0c8850919b04500/Makefile
+)
 # Warning: checksums provided by packager, not upstream.
-sha256sums=(0352dfc458fb5cc7a932c568bd86aabdde943bee25ea0cce58c46f8c893f554f)
+sha256sums=(
+	7916f17061e845e4fa5047c841306c4be2614e9c941753f9739c5d39c7e9f05b
+	91c09f404895855aefa7018575951720cd5ed6ce03586533d10344efee021f9c
+)
 
-prepare() {
-	cd "frotz-$pkgver"
-	# I guess there was a last-minute change to the Makefile
-	sed 's/^ \+/	/g' -i Makefile
-}
-
 build() {
 	cd "frotz-$pkgver"
 	make PREFIX=/usr dumb ncurses sdl
@@ -46,7 +47,8 @@
 	provides=(dfrotz)
 
 	cd "frotz-$pkgver"
-	make DESTDIR="$pkgdir" PREFIX=/usr install_dumb
+	# Inexplicably, the latest tarball lacks DESTDIR in its Makefile. It's back in git, though.
+	make -f ../Makefile DESTDIR="$pkgdir" PREFIX=/usr install_dumb
 }
 
 package_frotz-ncurses() {
@@ -63,7 +65,8 @@
 	)
 
 	cd "frotz-$pkgver"
-	make DESTDIR="$pkgdir" PREFIX=/usr install_frotz
+	# Inexplicably, the latest tarball lacks DESTDIR in its Makefile. It's back in git, though.
+	make -f ../Makefile DESTDIR="$pkgdir" PREFIX=/usr install_frotz
 }
 
 package_frotz-sdl() {
@@ -85,5 +88,6 @@
 	)
 
 	cd "frotz-$pkgver"
-	make DESTDIR="$pkgdir" PREFIX=/usr install_sdl
+	# Inexplicably, the latest tarball lacks DESTDIR in its Makefile. It's back in git, though.
+	make -f ../Makefile DESTDIR="$pkgdir" PREFIX=/usr install_sdl
 }