diff options
Diffstat (limited to 'games/nethack-x11/patches')
| -rw-r--r-- | games/nethack-x11/patches/patch-aa | 16 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ab | 64 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ac | 14 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-af | 2 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ag | 2 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ah | 12 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ai | 20 |
7 files changed, 49 insertions, 81 deletions
diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa index 20811b3fce0..f8efb2c63f9 100644 --- a/games/nethack-x11/patches/patch-aa +++ b/games/nethack-x11/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ +$NetBSD: patch-aa,v 1.6 2003/03/01 21:12:52 pooka Exp $ ---- include/config.h.orig Thu Mar 21 01:42:43 2002 -+++ include/config.h Fri Mar 22 18:24:20 2002 +--- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200 ++++ include/config.h 2003-03-01 22:17:08.000000000 +0200 @@ -42,8 +42,8 @@ * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ /* #define QT_GRAPHICS */ /* Qt interface */ /* #define GNOME_GRAPHICS */ /* Gnome interface */ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ #endif #ifndef DEFAULT_WINDOW_SYS @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ #endif #ifdef X11_GRAPHICS -@@ -122,7 +122,7 @@ +@@ -124,7 +124,7 @@ * would allow: * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm */ @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif -@@ -163,11 +163,11 @@ +@@ -167,11 +167,11 @@ #ifdef UNIX /* path and file name extension for compression program */ @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ #endif #ifndef COMPRESS -@@ -201,7 +201,7 @@ +@@ -205,7 +205,7 @@ # ifdef __APPLE__ # define HACKDIR "nethackdir" /* nethack directory */ # else @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/25 20:32:30 pooka Exp $ # endif # endif -@@ -298,7 +298,7 @@ +@@ -302,7 +302,7 @@ * functions that have been macroized. */ diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 130f799a13c..9a81327d933 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.8 2002/03/25 20:32:30 pooka Exp $ +$NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ ---- sys/unix/Makefile.top.orig Fri Mar 22 17:15:28 2002 -+++ sys/unix/Makefile.top Fri Mar 22 17:24:57 2002 +--- sys/unix/Makefile.top.orig 2003-02-23 16:43:39.000000000 +0200 ++++ sys/unix/Makefile.top 2003-03-01 22:06:45.000000000 +0200 @@ -14,18 +14,17 @@ # MAKE = make @@ -46,43 +46,23 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:30 pooka Exp $ $(GAME): ( cd src ; $(MAKE) ) --all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb +-all: $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb +all: $(GAME) datastuff @echo "Done." -+datastuff: Guidebook $(VARDAT) dungeon spec_levs check-dlb recover ++datastuff: recover Guidebook $(VARDAT) dungeon spec_levs check-dlb + @echo "Data Sets Built." + # Note: many of the dependencies below are here to allow parallel make # to generate valid output -@@ -102,6 +104,9 @@ - data: $(GAME) - ( cd dat ; $(MAKE) data ) - -+recover: -+ ( cd util ; $(MAKE) recover ) -+ - rumors: $(GAME) - ( cd dat ; $(MAKE) rumors ) - -@@ -164,6 +169,11 @@ - ( cd util ; $(MAKE) dlb ) - ( cd dat ; ../util/dlb cf nhdat $(DATDLB) ) - -+binfiles: $(GAME) -+ cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE) -+ -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \ -+ $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) ) -+ chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE) - - dofiles: - target=`sed -n \ -@@ -173,16 +183,13 @@ +@@ -180,18 +182,15 @@ -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} - cp src/$(GAME) $(GAMEDIR) +- cp util/recover $(GAMEDIR) ++ cp util/recover $(PREFIX)/bin -rm -f $(SHELLDIR)/$(GAME) sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ @@ -90,18 +70,20 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:30 pooka Exp $ < sys/unix/nethack.sh \ > $(SHELLDIR)/$(GAME) # set up their permissions -- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \ -- $(CHGRP) $(GAMEGRP) $(GAME) ) +- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \ +- $(CHGRP) $(GAMEGRP) $(GAME) recover ) - chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) +- chmod $(EXEPERM) $(GAMEDIR)/recover ++ chmod $(EXEPERM) $(PREFIX)/bin/recover -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) chmod $(EXEPERM) $(SHELLDIR)/$(GAME) -@@ -218,16 +225,16 @@ +@@ -227,16 +226,16 @@ # and a reminder @echo You may also want to install the man pages via the doc Makefile. --install: $(GAME) $(VARDAT) dungeon spec_levs -+install-dat: $(VARDAT) dungeon spec_levs +-install: $(GAME) recover $(VARDAT) dungeon spec_levs ++install-dat: 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) @@ -116,18 +98,24 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:30 pooka Exp $ # set up the game files ( $(MAKE) dofiles ) # set up some additional files -@@ -235,6 +242,14 @@ +@@ -244,9 +243,20 @@ -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ $(CHGRP) $(GAMEGRP) perm record logfile ; \ chmod $(FILEPERM) perm record logfile ) ++ -touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard* ++ -touch -c $(VARDIR)/save/* + -mkdir -p $(PREFIX)/share/doc/nethack + cp doc/Guidebook $(PREFIX)/share/doc/nethack + chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/nethack/Guidebook + chmod $(FILEPERM) $(PREFIX)/share/doc/nethack/Guidebook -+ cp util/recover $(PREFIX)/bin/recover -+ chown 0:0 $(PREFIX)/bin/recover -+ chmod 755 $(PREFIX)/bin/recover -+ # and a reminder @echo You may also want to reinstall the man pages via the doc Makefile. ++binfiles: $(GAME) ++ cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE) ++ -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \ ++ $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) ) ++ chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE) + + # 'make clean' removes all the .o files, but leaves around all the executables + # and compiled data files diff --git a/games/nethack-x11/patches/patch-ac b/games/nethack-x11/patches/patch-ac index dc587e4f7d5..2a66f6d01f0 100644 --- a/games/nethack-x11/patches/patch-ac +++ b/games/nethack-x11/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2002/03/22 17:26:28 pooka Exp $ +$NetBSD: patch-ac,v 1.2 2003/03/01 21:12:52 pooka Exp $ ---- include/system.h.orig Thu Jan 6 21:20:08 2000 -+++ include/system.h Thu Aug 10 18:16:03 2000 -@@ -77,10 +77,10 @@ +--- include/system.h.orig 2003-02-23 16:43:22.000000000 +0200 ++++ include/system.h 2003-03-01 16:34:46.000000000 +0200 +@@ -79,10 +79,10 @@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); # endif @@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.1 2002/03/22 17:26:28 pooka Exp $ E int FDECL(srandom, (unsigned int)); # endif # endif -@@ -130,7 +130,7 @@ +@@ -132,7 +132,7 @@ E void FDECL(qsort, (genericptr_t,size_t,size_t, int(*)(const genericptr,const genericptr))); #else @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1 2002/03/22 17:26:28 pooka Exp $ E int qsort(); # else # if !defined(LATTICE) && !defined(AZTEC_50) -@@ -413,7 +413,7 @@ +@@ -421,7 +421,7 @@ # ifdef HPUX E unsigned int FDECL(strlen, (char *)); # else @@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.1 2002/03/22 17:26:28 pooka Exp $ E int FDECL(strlen, (const char *)); # endif # endif /* HPUX */ -@@ -513,11 +513,13 @@ +@@ -521,11 +521,13 @@ # endif # endif diff --git a/games/nethack-x11/patches/patch-af b/games/nethack-x11/patches/patch-af index f24171f23aa..72bd923f725 100644 --- a/games/nethack-x11/patches/patch-af +++ b/games/nethack-x11/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 2002/03/22 17:26:29 pooka Exp $ +$NetBSD: patch-af,v 1.2 2003/03/01 21:12:52 pooka Exp $ --- include/unixconf.h.orig Thu Mar 21 01:42:56 2002 +++ include/unixconf.h Fri Mar 22 17:42:50 2002 diff --git a/games/nethack-x11/patches/patch-ag b/games/nethack-x11/patches/patch-ag index ad6589bbc5c..a97ee98e6fc 100644 --- a/games/nethack-x11/patches/patch-ag +++ b/games/nethack-x11/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/03/22 17:26:29 pooka Exp $ +$NetBSD: patch-ag,v 1.2 2003/03/01 21:12:52 pooka Exp $ --- src/mail.c.orig Wed Aug 9 21:02:04 2000 +++ src/mail.c Thu Aug 10 18:32:30 2000 diff --git a/games/nethack-x11/patches/patch-ah b/games/nethack-x11/patches/patch-ah index 81810e9aec1..051d57e7322 100644 --- a/games/nethack-x11/patches/patch-ah +++ b/games/nethack-x11/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.2 2002/09/23 10:10:52 jlam Exp $ +$NetBSD: patch-ah,v 1.3 2003/03/01 21:12:52 pooka Exp $ ---- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 -+++ sys/unix/Makefile.src Thu Aug 10 19:28:31 2000 +--- sys/unix/Makefile.src.orig 2003-02-23 16:43:39.000000000 +0200 ++++ sys/unix/Makefile.src 2003-03-01 22:13:45.000000000 +0200 @@ -144,8 +144,8 @@ # flags for debugging: # CFLAGS = -g -I../include @@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/23 10:10:52 jlam Exp $ # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LD line here to get -@@ -203,8 +203,8 @@ +@@ -204,8 +204,8 @@ # # @@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/23 10:10:52 jlam Exp $ # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -224,7 +224,7 @@ +@@ -225,7 +225,7 @@ # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -33,7 +33,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/23 10:10:52 jlam Exp $ # 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 -@@ -244,7 +244,7 @@ +@@ -245,7 +245,7 @@ # libraries for BeOS WINBELIB = -lbe diff --git a/games/nethack-x11/patches/patch-ai b/games/nethack-x11/patches/patch-ai deleted file mode 100644 index 7586a2f963c..00000000000 --- a/games/nethack-x11/patches/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2003/02/19 20:25:22 pooka Exp $ - -*** src/topten.c.orig Mon Feb 4 08:06:07 2002 ---- src/topten.c Mon Feb 10 10:48:55 2003 -*************** -*** 856,861 **** ---- 856,867 ---- - else { - if (playerct > 1) Strcat(pbuf, "any of "); - for (i = 0; i < playerct; i++) { -+ /* stop printing players if there are too many to fit */ -+ if (strlen(pbuf) + strlen(players[i]) + 2 >= BUFSZ) { -+ if (strlen(pbuf) < BUFSZ-4) Strcat(pbuf, "..."); -+ else Strcpy(pbuf+strlen(pbuf)-4, "..."); -+ break; -+ } - Strcat(pbuf, players[i]); - if (i < playerct-1) { - if (players[i][0] == '-' && - |