dwarf_fortress; tinkering with paths

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

Module Name:	pkgsrc-wip
Committed By:	i3enedek <git%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Sun Jul 24 22:58:53 2016 +0100
Changeset:	97c1c71029f05850ae9d2fc177bb9609e66dc29f

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

Log Message:
dwarf_fortress; tinkering with paths

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

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

diffstat:
 dwarf_fortress/Makefile         | 7 +++----
 dwarf_fortress/distinfo         | 6 +-----
 dwarf_fortress/patches/patch-df | 4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diffs:
diff --git a/dwarf_fortress/Makefile b/dwarf_fortress/Makefile
index 7d5bd4b..9a90f7a 100644
--- a/dwarf_fortress/Makefile
+++ b/dwarf_fortress/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.bay12games.com/dwarves/
 COMMENT=	Single-player fantasy game in a randomly generated, persistent world
 
-UNPRIVILEGED= yes
+#UNPRIVILEGED= yes
 
 EMUL_PLATFORMS=         linux-i386 linux-x86_64
 EMUL_MODULES.linux=	base compat expat gtk2 libSDL glx x11
@@ -36,11 +36,11 @@ INSTALLATION_DIRS=bin df_linux
 
 DFDIR=        df_linux
 
-PREFIX=	#empty	
+PREFIX=	#empty
 do-install:
 
 	${RM} -r ${WRKDIR}/${DFDIR}/g_src
-	#cd ${DESTDIR} && ${MKDIR} bin df_linux/data df_linux/data/movies df_linux/data/art df_linux/data/init df_linux/data/init/macros df_linux/data/announcement df_linux/data/dipscript df_linux/data/dipscript/text df_linux/data/help df_linux/data/speech df_linux/data/initial_movies df_linux/data/sound df_linux/raw df_linux/raw/graphics df_linux/raw/graphics/example df_linux/raw/interaction\ examples df_linux/raw/objects df_linux/raw/objects/notes df_linux/raw/objects/text df_linux/sdl df_linux/libs  
+	#cd ${DESTDIR} && ${MKDIR} bin df_linux/data df_linux/data/movies df_linux/data/art df_linux/data/init df_linux/data/init/macros df_linux/data/announcement df_linux/data/dipscript df_linux/data/dipscript/text df_linux/data/help df_linux/data/speech df_linux/data/initial_movies df_linux/data/sound df_linux/raw df_linux/raw/graphics df_linux/raw/graphics/example df_linux/raw/interaction\ examples df_linux/raw/objects df_linux/raw/objects/notes df_linux/raw/objects/text df_linux/sdl df_linux/libs
 	#cd ${WRKSRC} && find ./data -exec chmod 666 {} \;
 	#cd ${WRKSRC} && find ./raw -exec chmod 666 {} \;
 	#cd ${WRKSRC} && find . -type d -exec chmod 755 {} \;
@@ -48,7 +48,6 @@ do-install:
 	${CP} ${WRKDIR}/df_linux/df ${DESTDIR}${PREFIX}/bin/df_linux
 	cd ${WRKSRC} && pax -rw ./ ${DESTDIR}${PREFIX}/df_linux
 SUBST_CLASSES+= fix-paths
-SUBST_SKIP_TEXT_CHECK.fix-paths= yes
 SUBST_MESSAGE.fix-paths= Fixing pngs to bmps.
 SUBST_STAGE.fix-paths= post-configure
 SUBST_FILES.fix-paths= libs/Dwarf_Fortress
diff --git a/dwarf_fortress/distinfo b/dwarf_fortress/distinfo
index e53f0f4..33d4da3 100644
--- a/dwarf_fortress/distinfo
+++ b/dwarf_fortress/distinfo
@@ -4,8 +4,4 @@ SHA1 (df_43_05_linux.tar.bz2) = 1f0bfdb6a14a801b8f2cdc6fb6880b967e6a24bf
 RMD160 (df_43_05_linux.tar.bz2) = d2e99c1991f48c63096dfb301faf25d89b4f6ba7
 SHA512 (df_43_05_linux.tar.bz2) = 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
 Size (df_43_05_linux.tar.bz2) = 11580594 bytes
-SHA1 (df_43_05_linux32.tar.bz2) = bb855c363b14fbef5210644b6923feb8ce6e2774
-RMD160 (df_43_05_linux32.tar.bz2) = dcc935aa762acdd35ac94b35e6ad96e91a64fef6
-SHA512 (df_43_05_linux32.tar.bz2) = d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
-Size (df_43_05_linux32.tar.bz2) = 12158550 bytes
-SHA1 (patch-df) = b2e2bfcb119f83f5308a809798365acaeae82925
+SHA1 (patch-df) = fc5414f27e63eb280bb61914c4603715f7ff4734
diff --git a/dwarf_fortress/patches/patch-df b/dwarf_fortress/patches/patch-df
index 0a8edbc..16a0481 100644
--- a/dwarf_fortress/patches/patch-df
+++ b/dwarf_fortress/patches/patch-df
@@ -1,12 +1,12 @@
 $NetBSD$
-
+libGL fix
 --- df.orig	2016-01-17 21:44:56.000000000 +0000
 +++ df
 @@ -1,6 +1,7 @@
  #!/bin/sh
  DF_DIR=$(dirname "$0")
  cd "${DF_DIR}"
-+export LIBGL_DRIVERS_PATH=/usr/X11R7/lib/modules/dri
++export LIBGL_DRIVERS_PATH=${X11BASE}
  export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
  #export SDL_VIDEO_CENTERED=1 # Centre the screen.  Messes up resizing.
  ./libs/Dwarf_Fortress "$@" # Go, go, go! :)