--- include/config.h.old	Sun Dec  7 15:39:13 2003

+++ include/config.h	Sun Mar 30 12:37:01 2008

@@ -43,7 +43,7 @@

  * Some combinations make no sense.  See the installation document.

  */

 #define TTY_GRAPHICS	/* good old tty based graphics */

-/* #define X11_GRAPHICS */	/* X11 interface */

+#define X11_GRAPHICS	/* X11 interface */

 /* #define QT_GRAPHICS */	/* Qt interface */

 /* #define GNOME_GRAPHICS */	/* Gnome interface */

 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */

@@ -126,7 +126,7 @@

  * would allow:

  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm

  */

-/* # define USE_XPM */		/* Disable if you do not have the XPM library */

+# define USE_XPM		/* Disable if you do not have the XPM library */

 # ifdef USE_XPM

 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */

 # endif

@@ -169,11 +169,11 @@

 #ifdef UNIX

 /* path and file name extension for compression program */

-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */

-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */

+/* #define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */

+/* #define COMPRESS_EXTENSION ".Z"		/* compress's extension */

 /* An example of one alternative you might want to use: */

-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */

-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */

+#define COMPRESS "/usr/bin/gzip"	/* FSF gzip compression */

+#define COMPRESS_EXTENSION ".gz"		/* normal gzip extension */

 #endif

 #ifndef COMPRESS

@@ -204,7 +204,7 @@

  * otherwise it will be the current directory.

  */

 # ifndef HACKDIR

-#  define HACKDIR "/usr/games/lib/nethackdir"

+#  define HACKDIR "/usr/lib/nethack"

 # endif

 /*

@@ -300,7 +300,7 @@

  * functions that have been macroized.

  */

-/* #define VISION_TABLES */ /* use vision tables generated at compile time */

+#define VISION_TABLES 1 /* use vision tables generated at compile time */

 #ifndef VISION_TABLES

 # ifndef NO_MACRO_CPATH

 #  define MACRO_CPATH	/* use clear_path macros instead of functions */

--- include/unixconf.h.old	2003-12-07 15:39:13.000000000 -0800

+++ include/unixconf.h	2007-09-27 09:12:36.692549857 -0700

@@ -96,13 +96,13 @@

  */

 /* #define NO_FILE_LINKS */	/* if no hard links */

-/* #define LOCKDIR "/usr/games/lib/nethackdir" */	/* where to put locks */

+#define LOCKDIR "/var/games/nethack" /* where to put locks */

 /*

  * If you want the static parts of your playground on a read-only file

  * system, define VAR_PLAYGROUND to be where the variable parts are kept.

  */

-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */

+#define VAR_PLAYGROUND "/var/games/nethack"

 /*

@@ -132,7 +132,7 @@

  * "extra output" method is used, but not all systems provide access to

  * a fine-grained timer.

  */

-/* #define TIMED_DELAY */	/* usleep() */

+#define TIMED_DELAY 1	/* usleep() */

 #endif

 /*

--- sys/unix/Makefile.src.old	Sun Dec  7 15:39:13 2003

+++ sys/unix/Makefile.src	Sun Mar 30 12:38:36 2008

@@ -214,8 +214,8 @@

 #

 #

-WINSRC = $(WINTTYSRC)

-WINOBJ = $(WINTTYOBJ)

+WINSRC = $(WINTTYSRC) $(WINX11SRC)

+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)

 # on some systems the termcap library is in -ltermcap or -lcurses

 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead

@@ -235,7 +235,7 @@

 #

 # libraries for X11

 # If USE_XPM is defined in config.h, you will also need -lXpm here.

-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11

+WINX11LIB = -L/usr/openwin/lib -R/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lXpm

 # WINX11LIB = -lXaw -lXmu -lXt -lX11

 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm

 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0

@@ -255,7 +255,7 @@

 # libraries for BeOS 

 WINBELIB = -lbe

-WINLIB = $(WINTTYLIB)

+WINLIB = -Wl,-zignore $(WINTTYLIB) $(WINX11LIB)

 # any other strange libraries your system needs (for Sysunix only -- the more

 # specialized targets should already be right)

--- sys/unix/Makefile.top.old	Sun Dec  7 15:39:13 2003

+++ sys/unix/Makefile.top	Sun Mar 30 12:42:20 2008

@@ -22,7 +22,7 @@

 # Permissions - some places use setgid instead of setuid, for instance

 # See also the option "SECURE" in include/config.h

-GAMEPERM = 04755

+GAMEPERM = 02755

 FILEPERM = 0644

 EXEPERM  = 0755

 DIRPERM  = 0755

@@ -35,14 +35,15 @@

 # therefore there should not be anything in GAMEDIR that you want to keep

 # (if there is, you'll have to do the installation by hand or modify the

 # instructions)

-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir

-VARDIR  = $(GAMEDIR)

-SHELLDIR = $(PREFIX)/games

+GAMEDIR  = $(ROOT)/$(PREFIX)/lib/$(GAME)

+CLIENT_GAMEDIR = $(PREFIX)/lib/$(GAME)

+VARDIR  = $(ROOT)/var/games/nethack

+SHELLDIR = $(ROOT)/$(PREFIX)/bin

 # per discussion in Install.X11 and Install.Qt

 VARDATND = 

 # VARDATND = x11tiles NetHack.ad pet_mark.xbm

-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm

+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm

 # for Atari/Gem

 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img

 # for BeOS

@@ -186,7 +187,7 @@

 	cp src/$(GAME) $(GAMEDIR)

 	cp util/recover $(GAMEDIR)

 	-rm -f $(SHELLDIR)/$(GAME)

-	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \

+	sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_GAMEDIR);' \

 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \

 		< sys/unix/nethack.sh \

 		> $(SHELLDIR)/$(GAME)