--- ./sys/unix/Makefile.src Sun Feb 23 09:43:39 2003 +++ ../nethack-3.4.1/./sys/unix/Makefile.src Thu Mar 20 23:01:03 2003 @@ -204,8 +204,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 @@ -225,9 +225,9 @@ # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 +# WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXt -lX11 -# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm +WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 # # libraries for Qt @@ -245,7 +245,7 @@ # libraries for BeOS WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINTTYLIB) $(WINX11LIB) # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) --- ./sys/unix/Makefile.top Sun Feb 23 09:43:39 2003 +++ ../nethack-3.4.1/./sys/unix/Makefile.top Thu Mar 20 23:01:03 2003 @@ -14,11 +14,11 @@ # MAKE = make # make NetHack -PREFIX = /usr +PREFIX = /usr/freeware GAME = nethack # GAME = nethack.prg -GAMEUID = games -GAMEGRP = bin +GAMEUID = demos +GAMEGRP = sys # Permissions - some places use setgid instead of setuid, for instance # See also the option "SECURE" in include/config.h @@ -35,14 +35,14 @@ # 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 +GAMEDIR = $(PREFIX)/lib/$(GAME)dir VARDIR = $(GAMEDIR) -SHELLDIR = $(PREFIX)/games +SHELLDIR = $(PREFIX)/bin # per discussion in Install.X11 and Install.Qt -VARDATND = +# VARDATND = # VARDATND = x11tiles pet_mark.xbm -# VARDATND = x11tiles pet_mark.xbm rip.xpm +VARDATND = x11tiles pet_mark.xbm rip.xpm # for Atari/Gem # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img # for BeOS --- ./sys/unix/Makefile.utl Sun Feb 23 09:43:39 2003 +++ ../nethack-3.4.1/./sys/unix/Makefile.utl Thu Mar 20 23:01:03 2003 @@ -101,11 +101,11 @@ # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c. # if, instead of yacc/lex you have bison/flex, comment/uncomment the following. -YACC = yacc -LEX = lex -# YACC = bison -y +# YACC = yacc +# LEX = lex +YACC = bison -y # YACC = byacc -# LEX = flex +LEX = flex # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ --- ./win/X11/NetHack.ad Sun Feb 23 09:43:48 2003 +++ ../nethack-3.4.1/./win/X11/NetHack.ad Thu Mar 20 23:01:03 2003 @@ -19,7 +19,7 @@ ! the custom format - to enlarge an XPM file, use processing tools ! such as XV or preferably PBMplus. ! -!NetHack.tile_file: x11tiles +NetHack.tile_file: x11tiles !NetHack.double_tile_size: True ! ! The annotation of pets. --- ./include/system.h Sun Feb 23 09:43:22 2003 +++ ../nethack-3.4.1/./include/system.h Thu Mar 20 23:01:03 2003 @@ -157,7 +157,7 @@ E int FDECL(write, (int,char *,int)); E int FDECL(link, (const char *, const char*)); # else -# ifndef bsdi +# if !defined(bsdi) && !defined(__sgi) E long FDECL(lseek, (int,long,int)); # endif # if defined(POSIX_TYPES) || defined(__TURBOC__) --- ./include/config.h Sun Feb 23 09:43:19 2003 +++ ../nethack-3.4.1/./include/config.h Thu Mar 20 23:01:03 2003 @@ -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 */ @@ -124,7 +124,7 @@ * would allow: * xpmtoppm 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 @@ -141,10 +141,10 @@ #ifndef WIZARD /* allow for compile-time or Makefile changes */ # ifndef KR1ED -# define WIZARD "wizard" /* the person allowed to use the -D option */ +# define WIZARD "root" /* the person allowed to use the -D option */ # else # define WIZARD -# define WIZARD_NAME "wizard" +# define WIZARD_NAME "root" # endif #endif @@ -167,11 +167,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/sbin/gzip" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS @@ -205,7 +205,7 @@ # ifdef __APPLE__ # define HACKDIR "nethackdir" /* nethack directory */ # else -# define HACKDIR "/usr/games/lib/nethackdir" +# define HACKDIR "/usr/freeware/lib/nethackdir" # endif # endif @@ -216,7 +216,7 @@ * since the user might create files in a directory of his choice. * Of course SECURE is meaningful only if HACKDIR is defined. */ -/* #define SECURE */ /* do setuid(getuid()) after chdir() */ +#define SECURE /* do setuid(getuid()) after chdir() */ /* * If it is desirable to limit the number of people that can play Hack