diff options
Diffstat (limited to 'games/nethack/patches')
-rw-r--r-- | games/nethack/patches/Makefile_doc.patch | 28 | ||||
-rw-r--r-- | games/nethack/patches/Makefile_src.patch | 83 | ||||
-rw-r--r-- | games/nethack/patches/Makefile_top.patch | 140 | ||||
-rw-r--r-- | games/nethack/patches/Makefile_utl.patch | 51 | ||||
-rw-r--r-- | games/nethack/patches/config_h.patch | 74 | ||||
-rw-r--r-- | games/nethack/patches/unixconf_h.patch | 43 |
6 files changed, 419 insertions, 0 deletions
diff --git a/games/nethack/patches/Makefile_doc.patch b/games/nethack/patches/Makefile_doc.patch new file mode 100644 index 0000000000..f0347b8adc --- /dev/null +++ b/games/nethack/patches/Makefile_doc.patch @@ -0,0 +1,28 @@ +--- doc/Makefile 2008-05-15 15:33:13.000000000 -0500 ++++ doc/Makefile-doc.slack 2008-05-15 15:29:34.000000000 -0500 +@@ -45,6 +45,7 @@ + MANEXT = 6 + + # manual installation for most BSD-style systems ++MANDIRCREATE = mkdir -p $(DESTDIR)/$(MANDIR) + GAMEMANCREATE = cp nethack.6 + LEVMANCREATE = cp lev_comp.6 + DGNMANCREATE = cp dgn_comp.6 +@@ -58,11 +59,12 @@ + # DLBMANCREATE = nroff -man dlb.6 > + + manpages: +- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT) +- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT) +- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT) +- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT) +- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT) ++ -$(MANDIRCREATE) ++ -$(GAMEMANCREATE) $(DESTDIR)/$(MANDIR)/$(GAME).$(MANEXT) ++ -$(LEVMANCREATE) $(DESTDIR)/$(MANDIR)/lev_comp.$(MANEXT) ++ -$(DGNMANCREATE) $(DESTDIR)/$(MANDIR)/dgn_comp.$(MANEXT) ++ -$(RCVRMANCREATE) $(DESTDIR)/$(MANDIR)/recover.$(MANEXT) ++ -$(DLBMANCREATE) $(DESTDIR)/$(MANDIR)/dlb.$(MANEXT) + + # manual creation for distribution + DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt diff --git a/games/nethack/patches/Makefile_src.patch b/games/nethack/patches/Makefile_src.patch new file mode 100644 index 0000000000..1e304a2427 --- /dev/null +++ b/games/nethack/patches/Makefile_src.patch @@ -0,0 +1,83 @@ +--- sys/unix/Makefile.src 2003-12-07 17:39:13.000000000 -0600 ++++ sys/unix/Makefile.src.slack 2008-05-15 15:29:14.000000000 -0500 +@@ -61,7 +61,7 @@ + # if you get setcgtty() warnings during execution, you are feeding gcc + # a non-ANSI <sys/ioctl.h> -- either run fixincludes on it or use + # -traditional in CFLAGS +-# CC = gcc ++CC = gcc + # + # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: + # +@@ -125,7 +125,7 @@ + # flags for Linux + # compile normally + # CFLAGS = -O2 -fomit-frame-pointer -I../include +-# LFLAGS = -L/usr/X11R6/lib ++LFLAGS = -L/usr/lib + # OR compile backwards compatible a.out format + # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include + # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib +@@ -186,7 +186,8 @@ + # Files for a Qt port + # + WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp ../win/Qt/qttableview.cpp +-WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o ++# WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o ++WINQTOBJ = qt_win.o qt_clust.o qttableview.o + # + # Files for a Gnome port + # +@@ -214,8 +215,8 @@ + + # + # +-WINSRC = $(WINTTYSRC) +-WINOBJ = $(WINTTYOBJ) ++WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC) $(WINKDESRC) ++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ) $(WINKDEOBJ) + + # on some systems the termcap library is in -ltermcap or -lcurses + # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead +@@ -230,18 +231,19 @@ + # WINTTYLIB = -ltermcap + # WINTTYLIB = -lcurses + # WINTTYLIB = -lcurses16 +-# WINTTYLIB = -lncurses +-WINTTYLIB = -ltermlib ++WINTTYLIB = -lncurses ++# WINTTYLIB = -ltermlib + # + # 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 -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 ++WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 + # + # libraries for Qt +-WINQTLIB = -L$(QTDIR)/lib -lqt ++WINQTLIB = -L$(QTDIR)/lib -lqt-mt + # + # libraries for KDE (with Qt) + WINKDELIB = -lkdecore -lkdeui -lXext +@@ -255,7 +257,7 @@ + # libraries for BeOS + WINBELIB = -lbe + +-WINLIB = $(WINTTYLIB) ++WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB) $(WINKDELIB) + + # any other strange libraries your system needs (for Sysunix only -- the more + # specialized targets should already be right) +@@ -295,7 +297,7 @@ + + + # used by `make depend' to reconstruct this Makefile; you shouldn't need this +-AWK = nawk ++AWK = gawk + + # ---------------------------------------- + # diff --git a/games/nethack/patches/Makefile_top.patch b/games/nethack/patches/Makefile_top.patch new file mode 100644 index 0000000000..27ef3b7da0 --- /dev/null +++ b/games/nethack/patches/Makefile_top.patch @@ -0,0 +1,140 @@ +--- sys/unix/Makefile.top 2003-12-07 17:39:13.000000000 -0600 ++++ sys/unix/Makefile.top.slack 2008-05-15 15:29:20.000000000 -0500 +@@ -17,15 +17,15 @@ + PREFIX = /usr + GAME = nethack + # GAME = nethack.prg +-GAMEUID = games +-GAMEGRP = bin ++GAMEUID = root ++GAMEGRP = games + + # Permissions - some places use setgid instead of setuid, for instance + # See also the option "SECURE" in include/config.h +-GAMEPERM = 04755 +-FILEPERM = 0644 ++GAMEPERM = 02755 ++FILEPERM = 0664 + EXEPERM = 0755 +-DIRPERM = 0755 ++DIRPERM = 0775 + + # GAMEDIR also appears in config.h as "HACKDIR". + # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR +@@ -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 +-VARDIR = $(GAMEDIR) +-SHELLDIR = $(PREFIX)/games ++GAMEDIR = $(PREFIX)/share/games/nethack ++VARDIR = /var/lib/nethack ++SHELLDIR = $(PREFIX)/bin + + # per discussion in Install.X11 and Install.Qt +-VARDATND = ++# 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 nhsplash.xpm + # for Atari/Gem + # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img + # for BeOS +@@ -183,68 +183,68 @@ + -e '}' \ + -e '$$s/.*/nodlb/p' < dat/options` ; \ + $(MAKE) dofiles-$${target-nodlb} +- cp src/$(GAME) $(GAMEDIR) +- cp util/recover $(GAMEDIR) +- -rm -f $(SHELLDIR)/$(GAME) ++ cp src/$(GAME) $(DESTDIR)/$(GAMEDIR) ++ cp util/recover $(DESTDIR)/$(GAMEDIR) ++ -rm -f $(DESTDIR)/$(SHELLDIR)/$(GAME) + sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ + -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ + < sys/unix/nethack.sh \ +- > $(SHELLDIR)/$(GAME) ++ > $(DESTDIR)/$(SHELLDIR)/$(GAME) + # set up their permissions +- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \ ++ -( cd $(DESTDIR)/$(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \ + $(CHGRP) $(GAMEGRP) $(GAME) recover ) +- chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) +- chmod $(EXEPERM) $(GAMEDIR)/recover +- -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) +- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) +- chmod $(EXEPERM) $(SHELLDIR)/$(GAME) ++ chmod $(GAMEPERM) $(DESTDIR)/$(GAMEDIR)/$(GAME) ++ chmod $(EXEPERM) $(DESTDIR)/$(GAMEDIR)/recover ++ -$(CHOWN) $(GAMEUID) $(DESTDIR)/$(SHELLDIR)/$(GAME) ++ $(CHGRP) $(GAMEGRP) $(DESTDIR)/$(SHELLDIR)/$(GAME) ++ chmod $(EXEPERM) $(DESTDIR)/$(SHELLDIR)/$(GAME) + + dofiles-dlb: check-dlb +- ( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) ) ++ ( cd dat ; cp nhdat $(DATNODLB) $(DESTDIR)/$(GAMEDIR) ) + # set up their permissions +- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \ ++ -( cd $(DESTDIR)/$(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \ + $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \ + chmod $(FILEPERM) nhdat $(DATNODLB) ) + + dofiles-nodlb: + # copy over the game files +- ( cd dat ; cp $(DAT) $(GAMEDIR) ) ++ ( cd dat ; cp $(DAT) $(DESTDIR)/$(GAMEDIR) ) + # set up their permissions +- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \ ++ -( cd $(DESTDIR)/$(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \ + $(CHGRP) $(GAMEGRP) $(DAT) ; \ + chmod $(FILEPERM) $(DAT) ) + + update: $(GAME) recover $(VARDAT) dungeon spec_levs + # (don't yank the old version out from under people who're playing it) +- -mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old ++ -mv $(DESTDIR)/$(GAMEDIR)/$(GAME) $(DESTDIR)/$(GAMEDIR)/$(GAME).old + # quest.dat is also kept open and has the same problems over NFS + # (quest.dat may be inside nhdat if dlb is in use) +- -mv $(GAMEDIR)/quest.dat $(GAMEDIR)/quest.dat.old +- -mv $(GAMEDIR)/nhdat $(GAMEDIR)/nhdat.old ++ -mv $(DESTDIR)/$(GAMEDIR)/quest.dat $(DESTDIR)/$(GAMEDIR)/quest.dat.old ++ -mv $(DESTDIR)/$(GAMEDIR)/nhdat $(DESTDIR)/$(GAMEDIR)/nhdat.old + # set up new versions of the game files + ( $(MAKE) dofiles ) + # touch time-sensitive files +- -touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard* +- -touch -c $(VARDIR)/save/* +- touch $(VARDIR)/perm $(VARDIR)/record ++ -touch -c $(DESTDIR)/$(VARDIR)/bones* $(DESTDIR)/$(VARDIR)/?lock* $(DESTDIR)/$(VARDIR)/wizard* ++ -touch -c $(DESTDIR)/$(VARDIR)/save/* ++ touch $(DESTDIR)/$(VARDIR)/perm $(DESTDIR)/$(VARDIR)/record + # and a reminder + @echo You may also want to install the man pages via the doc Makefile. + + install: $(GAME) recover $(VARDAT) dungeon spec_levs + # set up the directories + # not all mkdirs have -p; those that don't will create a -p directory +- -mkdir -p $(SHELLDIR) +- -rm -rf $(GAMEDIR) $(VARDIR) +- -mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save ++ -mkdir -p $(DESTDIR)/$(SHELLDIR) ++ -rm -rf $(DESTDIR)/$(GAMEDIR) $(DESTDIR)/$(VARDIR) ++ -mkdir -p $(DESTDIR)/$(GAMEDIR) $(DESTDIR)/$(VARDIR) $(DESTDIR)/$(VARDIR)/save + -rmdir ./-p +- -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save +- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save +- chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save ++ -$(CHOWN) $(GAMEUID) $(DESTDIR)/$(GAMEDIR) $(DESTDIR)/$(VARDIR) $(DESTDIR)/$(VARDIR)/save ++ $(CHGRP) $(GAMEGRP) $(DESTDIR)/$(GAMEDIR) $(DESTDIR)/$(VARDIR) $(DESTDIR)/$(VARDIR)/save ++ chmod $(DIRPERM) $(DESTDIR)/$(GAMEDIR) $(DESTDIR)/$(VARDIR) $(DESTDIR)/$(VARDIR)/save + # set up the game files + ( $(MAKE) dofiles ) + # set up some additional files +- touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile +- -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ ++ touch $(DESTDIR)/$(VARDIR)/perm $(DESTDIR)/$(VARDIR)/record $(DESTDIR)/$(VARDIR)/logfile ++ -( cd $(DESTDIR)/$(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ + $(CHGRP) $(GAMEGRP) perm record logfile ; \ + chmod $(FILEPERM) perm record logfile ) + # and a reminder diff --git a/games/nethack/patches/Makefile_utl.patch b/games/nethack/patches/Makefile_utl.patch new file mode 100644 index 0000000000..6a5c4d34cd --- /dev/null +++ b/games/nethack/patches/Makefile_utl.patch @@ -0,0 +1,51 @@ +--- sys/unix/Makefile.utl 2003-12-07 17:39:13.000000000 -0600 ++++ sys/unix/Makefile.utl.slack 2008-05-15 15:29:29.000000000 -0500 +@@ -15,7 +15,7 @@ + + # if you are using gcc as your compiler, + # uncomment the CC definition below if it's not in your environment +-# CC = gcc ++CC = gcc + # + # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: + # +@@ -73,7 +73,7 @@ + # flags for Linux + # compile normally + # CFLAGS = -O2 -fomit-frame-pointer -I../include +-# LFLAGS = -L/usr/X11R6/lib ++LFLAGS = -L/usr/lib + # OR compile backwards compatible a.out format + # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include + # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib +@@ -90,7 +90,7 @@ + # CFLAGS = -g -I../include + + CFLAGS = -O -I../include +-LFLAGS = ++# LFLAGS = + + LIBS = + +@@ -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 +@@ -400,4 +400,4 @@ + + tileedit: tileedit.cpp $(TEXT_IO) + $(QTDIR)/bin/moc -o tileedit.moc tileedit.h +- $(CC) -o tileedit -I../include -I$(QTDIR)/include -L$(QTDIR)/lib tileedit.cpp $(TEXT_IO) -lqt ++ $(CC) -o tileedit -I../include -I$(QTDIR)/include -L$(QTDIR)/lib tileedit.cpp $(TEXT_IO) -lqt-mt diff --git a/games/nethack/patches/config_h.patch b/games/nethack/patches/config_h.patch new file mode 100644 index 0000000000..caf35fc180 --- /dev/null +++ b/games/nethack/patches/config_h.patch @@ -0,0 +1,74 @@ +--- include/config.h 2003-12-07 17:39:13.000000000 -0600 ++++ include/config.h.slack 2008-05-15 16:52:38.000000000 -0500 +@@ -43,8 +43,8 @@ + * Some combinations make no sense. See the installation document. + */ + #define TTY_GRAPHICS /* good old tty based graphics */ +-/* #define X11_GRAPHICS */ /* X11 interface */ +-/* #define QT_GRAPHICS */ /* Qt interface */ ++#define X11_GRAPHICS /* X11 interface */ ++#define QT_GRAPHICS /* Qt interface */ + /* #define GNOME_GRAPHICS */ /* Gnome interface */ + /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ + +@@ -91,7 +91,7 @@ + # define USE_XPM /* Use XPM format for images (required) */ + # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */ + # ifndef DEFAULT_WINDOW_SYS +-# define DEFAULT_WINDOW_SYS "Qt" ++# define DEFAULT_WINDOW_SYS "tty" + # endif + #endif + +@@ -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 +@@ -185,7 +185,7 @@ + * a tar-like file, thus making a neater installation. See *conf.h + * for detailed configuration. + */ +-/* #define DLB */ /* not supported on all platforms */ ++#define DLB /* not supported on all platforms */ + + /* + * Defining INSURANCE slows down level changes, but allows games that +@@ -204,7 +204,7 @@ + * otherwise it will be the current directory. + */ + # ifndef HACKDIR +-# define HACKDIR "/usr/games/lib/nethackdir" ++# define HACKDIR "/usr/share/games/nethack" + # endif + + /* +@@ -349,7 +349,7 @@ + */ + + /*#define GOLDOBJ */ /* Gold is kept on obj chains - Helge Hafting */ +-/*#define AUTOPICKUP_EXCEPTIONS */ /* exceptions to autopickup */ ++#define AUTOPICKUP_EXCEPTIONS /* exceptions to autopickup */ + + /* End of Section 5 */ + diff --git a/games/nethack/patches/unixconf_h.patch b/games/nethack/patches/unixconf_h.patch new file mode 100644 index 0000000000..9b32de5b55 --- /dev/null +++ b/games/nethack/patches/unixconf_h.patch @@ -0,0 +1,43 @@ +--- include/unixconf.h 2003-12-07 17:39:13.000000000 -0600 ++++ include/unixconf.h.slack 2008-05-15 15:29:04.000000000 -0500 +@@ -25,19 +25,19 @@ + /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */ + /* Use BSD for < v3.0 */ + /* "ULTRIX" not to be confused with "ultrix" */ +-#define SYSV /* define for System V, Solaris 2.x, newer versions */ ++/* #define SYSV */ /* define for System V, Solaris 2.x, newer versions */ + /* of Linux */ + /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */ + /* use SYSV for < v6.5 */ + + + /* define any of the following that are appropriate */ +-#define SVR4 /* use in addition to SYSV for System V Release 4 */ ++/* #define SVR4 */ /* use in addition to SYSV for System V Release 4 */ + /* including Solaris 2+ */ + #define NETWORK /* if running on a networked system */ + /* e.g. Suns sharing a playground through NFS */ + /* #define SUNOS4 */ /* SunOS 4.x */ +-/* #define LINUX */ /* Another Unix clone */ ++#define LINUX /* Another Unix clone */ + /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ + /* #define GENIX */ /* Yet Another Unix Clone */ + /* #define HISX */ /* Bull Unix for XPS Machines */ +@@ -102,7 +102,7 @@ + * 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/lib/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 /* usleep() */ + #endif + + /* |