dwarf fortress: update to 0.47.04

[i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Fri Aug 21 17:27:31 2020 +0100
Changeset:	0199d2aaa9d125a93717e6f9a21b828dcff38019

Modified Files:
	dwarf_fortress/Makefile
	dwarf_fortress/PLIST
	dwarf_fortress/TODO
	dwarf_fortress/distinfo
	dwarf_fortress/patches/patch-df

Log Message:
dwarf fortress: update to 0.47.04

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0199d2aaa9d125a93717e6f9a21b828dcff38019

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dwarf_fortress/Makefile         | 13 ++++++++++---
 dwarf_fortress/PLIST            |  2 ++
 dwarf_fortress/TODO             |  4 +---
 dwarf_fortress/distinfo         | 16 ++++++++++------
 dwarf_fortress/patches/patch-df |  2 +-
 5 files changed, 24 insertions(+), 13 deletions(-)

diffs:
diff --git a/dwarf_fortress/Makefile b/dwarf_fortress/Makefile
index 93b5e18485..3cbbaf2460 100644
--- a/dwarf_fortress/Makefile
+++ b/dwarf_fortress/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	df_44_12_linux
-PKGNAME=	dwarf_fortress-44.12
+DISTNAME=	df_47_04_linux
+PKGNAME=	dwarf_fortress-47.04
 CATEGORIES=	games
 MASTER_SITES=	http://www.bay12games.com/dwarves/
 EXTRACT_SUFX=	.tar.bz2
@@ -29,7 +29,7 @@ DISTFILES=	${DISTNAME}32${EXTRACT_SUFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
-INSTALLATION_DIRS=	bin df_linux
+#INSTALLATION_DIRS=	bin df_linux
 
 AUTO_MKDIRS=	yes
 DFDIR=		df_linux
@@ -63,5 +63,12 @@ SUBST_STAGE.fix-paths-1=	post-configure
 SUBST_FILES.fix-paths-1=	data/init/init.txt
 SUBST_SED.fix-paths-1=		-e 's,SOUND:YES,SOUND:NO,g'
 
+#Because "Patches must not hard-code the pkgsrc PREFIX."
+SUBST_CLASSES+=			fix-paths-2
+SUBST_MESSAGE.fix-paths-2=	Patching PREFIX.
+SUBST_STAGE.fix-paths-2=	post-configure
+SUBST_FILES.fix-paths-2=	df
+SUBST_SED.fix-paths-2=		-e 's,PREFIX,${PREFIX},g'
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/dwarf_fortress/PLIST b/dwarf_fortress/PLIST
index 70183a118c..6a1ec016c4 100644
--- a/dwarf_fortress/PLIST
+++ b/dwarf_fortress/PLIST
@@ -208,6 +208,8 @@ df_linux/libs/libgraphics.so
 df_linux/libs/libstdc++.so.6
 df_linux/raw/graphics/example/dwarves.bmp
 df_linux/raw/graphics/graphics_example.txt
+df_linux/raw/interaction examples/example - bogeyman transformation.txt
+df_linux/raw/interaction examples/example - shrine effects.txt
 df_linux/raw/interaction examples/interaction_disturbance.txt
 df_linux/raw/interaction examples/interaction_region.txt
 df_linux/raw/interaction examples/interaction_secret.txt
diff --git a/dwarf_fortress/TODO b/dwarf_fortress/TODO
index 14c87e6d88..97caa8ebeb 100644
--- a/dwarf_fortress/TODO
+++ b/dwarf_fortress/TODO
@@ -1,3 +1 @@
-Fix sound.
-
-Workaround for png issues; use bitmaps instead.
+Fix sound by importing suse-openal.
diff --git a/dwarf_fortress/distinfo b/dwarf_fortress/distinfo
index e629a884f7..b23f3c69e0 100644
--- a/dwarf_fortress/distinfo
+++ b/dwarf_fortress/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.2 2015/05/08 22:58:43 i3enedek Exp $
+$NetBSD$
 
-SHA1 (df_44_12_linux.tar.bz2) = f6157e52239a3edb9f90fae28994049bffcf1d72
-RMD160 (df_44_12_linux.tar.bz2) = e688eeede58f3eda505f39126c88c388a3298cb2
-SHA512 (df_44_12_linux.tar.bz2) = 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
-Size (df_44_12_linux.tar.bz2) = 12081683 bytes
-SHA1 (patch-df) = 079651012bccfd59411faa1f390961e252c74dff
+SHA1 (df_47_04_linux32.tar.bz2) = 2a512b94fdb53c016e318a8ff63b52b91a5f3784
+RMD160 (df_47_04_linux32.tar.bz2) = d650e8216dab6c031459aa1d40d7785b89e92d9c
+SHA512 (df_47_04_linux32.tar.bz2) = d76286957ed3f1e677519c45b9644463e45c07c226ce3200f2db6a776396e77fc8aa3f5fdd697fdbde5efa49b7d0dce47b98dfe0a880b666e227ccb8b288a6c0
+Size (df_47_04_linux32.tar.bz2) = 13481027 bytes
+SHA1 (df_47_04_linux.tar.bz2) = 564d3ccb53104239e993576ef2e394f4c7aafd1d
+RMD160 (df_47_04_linux.tar.bz2) = caf7f76c1fedce5feda731a81b50fc1b83473574
+SHA512 (df_47_04_linux.tar.bz2) = 65f6cd39187afbb7b60ba72d0caf23c39d95674615ab718ad55c25cad23c08e42c1b911cfde7015b05a280325504f3b931f2c7defb34ee2ee6b725101c536cea
+Size (df_47_04_linux.tar.bz2) = 12719630 bytes
+SHA1 (patch-df) = 7e25d6c0145521d2eb6417acdc792f1e496a7828
diff --git a/dwarf_fortress/patches/patch-df b/dwarf_fortress/patches/patch-df
index 7b03360e05..56433fa02b 100644
--- a/dwarf_fortress/patches/patch-df
+++ b/dwarf_fortress/patches/patch-df
@@ -12,7 +12,7 @@ $NetBSD$
 +if [ ! -f ~/df_linux ]
 +then
 +        echo "Copying..."
-+        cp -r /usr/pkg/df_linux ~/
++        cp -r PREFIX/df_linux ~/
 +fi
 +
 +DF_DIR="~/df_linux"