From fb235f6b2ca2daefb27bc5177f8d087e51e713ed Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Sat, 24 Dec 2005 14:52:40 +0000
Subject: [PATCH] Benjamin Schieder: 	make nethack honor
 ROCKCFG_PKG_GAMES_*DIR

[2005120910105109496] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6756 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/blindcoder/nethack/nethack.conf       | 28 +++++++++++++++----
 .../blindcoder/nethack/subconfig-games.hlp    |  4 ---
 package/blindcoder/nethack/subconfig-games.in |  1 -
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/package/blindcoder/nethack/nethack.conf b/package/blindcoder/nethack/nethack.conf
index 07bb35873..d8cefc4f2 100644
--- a/package/blindcoder/nethack/nethack.conf
+++ b/package/blindcoder/nethack/nethack.conf
@@ -22,6 +22,25 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 nethack_premake () {
+#export ROCKCFG_PKG_GAMES_BINDIR='usr/games'
+#export ROCKCFG_PKG_GAMES_DATADIR='usr/share'
+#export ROCKCFG_PKG_GAMES_SCOREDIR='var/games/scores'
+# ROCK configuration
+	sed -e "s,^/\* #define VAR_PLAYGROUND \"/var/lib/games/nethack\" \*/,#define VAR_PLAYGROUND \"/${ROCKCFG_PKG_GAMES_SCOREDIR}/${xpkg}\",g" -i include/unixconf.h
+	sed -e "s,^/\* #define LOCKDIR \"/usr/games/lib/nethackdir\" \*/,#define LOCKDIR \"/${ROCKCFG_PKG_GAMES_SCOREDIR}/${xpkg}\",g" -i include/unixconf.h
+	sed -e "s,define HACKDIR \"[^\"]*\",define HACKDIR \"/${ROCKCFG_PKG_GAMES_DATADIR}/${xpkg}\",g" -i include/config.h
+	sed -e "s,/\* #define SECURE \*/,#define SECURE,g" -i include/config.h
+	var_append makeopt " " "SHELLDIR=\"/${ROCKCFG_PKG_GAMES_BINDIR}\""
+	var_append makeopt " " "GAMEDIR=\"/${ROCKCFG_PKG_GAMES_DATADIR}/${xpkg}\""
+	var_append makeopt " " "VARDIR=\"/${ROCKCFG_PKG_GAMES_SCOREDIR}/${xpkg}\""
+	var_append makeinstopt " " "SHELLDIR=\"/${ROCKCFG_PKG_GAMES_BINDIR}\""
+	var_append makeinstopt " " "GAMEDIR=\"/${ROCKCFG_PKG_GAMES_DATADIR}/${xpkg}\""
+	var_append makeinstopt " " "VARDIR=\"/${ROCKCFG_PKG_GAMES_SCOREDIR}/${xpkg}\""
+	var_append makeopt " " "GAMEUID=root"
+	var_append makeopt " " "GAMEGRP=games"
+	var_append makeinstopt " " "GAMEUID=root"
+	var_append makeinstopt " " "GAMEGRP=games"
+
 # yes, we are linux
 	sed -e 's,^/\* #define LINUX \*/.*,#define LINUX,g' -i include/unixconf.h
 # Timed Delay
@@ -111,12 +130,6 @@ nethack_premake () {
 		    -i include/config.h
 	fi
 
-# Hackdir
-	if [ "$ROCKCFG_PKG_NETHACK_HACKDIR" != "/usr/games/lib/nethackdir" ] ; then
-		sed -e "s,define HACKDIR \"/usr/games/lib/nethackdir\",define HACKDIR \"$ROCKCFG_PKG_NETHACK_HACKDIR\",g" \
-		    -i include/config.h
-	fi
-
 # Max number of players
 	if [ $ROCKCFG_PKG_NETHACK_MAX -gt 0 ] ; then
 		sed -e "s, \\* #define MAX_NR_OF_PLAYERS 6, * */\\n#define MAX_NR_OF_PLAYERS $ROCKCFG_PKG_NETHACK_MAX\\n/*,g" \
@@ -178,6 +191,9 @@ nethack_premake () {
 		sed -e 's,^#define GOLDOBJ,/* #define GOLDOBJ */,g' \
 		    -i include/config.h
 	fi
+
+# DLB, makes a less messy installation
+	sed -e 's,/\* #define DLB \*/,#define DLB,g' -i include/config.h
 }
 
 runconf='0'
diff --git a/package/blindcoder/nethack/subconfig-games.hlp b/package/blindcoder/nethack/subconfig-games.hlp
index 1d24583e8..2ad6811ea 100644
--- a/package/blindcoder/nethack/subconfig-games.hlp
+++ b/package/blindcoder/nethack/subconfig-games.hlp
@@ -47,10 +47,6 @@ path and file name extension for compression program
 ROCKCFG_PKG_NETHACK_COM_EXT
 compress's extension
 
-ROCKCFG_PKG_NETHACK_HACKDIR
-  If you define HACKDIR, then this will be the default playground;
-  otherwise it will be the current directory.
-
 ROCKCFG_PKG_NETHACK_MAX
   If it is desirable to limit the number of people that can play Hack
   simultaneously, define it here. Set to 0 for infinite
diff --git a/package/blindcoder/nethack/subconfig-games.in b/package/blindcoder/nethack/subconfig-games.in
index 3edfbddc6..598f38afd 100644
--- a/package/blindcoder/nethack/subconfig-games.in
+++ b/package/blindcoder/nethack/subconfig-games.in
@@ -55,7 +55,6 @@ then
 					text 'Compress Program' ROCKCFG_PKG_NETHACK_COM '/usr/bin/compress'
 				block_end
 			fi
-			text 'Hack-Directory' ROCKCFG_PKG_NETHACK_HACKDIR '/usr/games/lib/nethackdir'
 			text 'Max number of simultaneous hacks' ROCKCFG_PKG_NETHACK_MAX '6'
 		block_end
 		comment '- The Fun Stuff'