From c5a7af18eed69eee5a98cb7536502b5335c5ccc0 Mon Sep 17 00:00:00 2001 From: pooka Date: Tue, 2 Sep 2003 00:30:54 +0000 Subject: Update to NetHack 3.4.2 This is a bugfix release which fixes over 100 bugs including but not limited to: * Fixed a fatal bug that triggered a panic when your secondary weapon was cursed during bones file creation * Fixed a fatal bug that caused a crash when applying figurine, candle, or bell that gets used up for a complete list, see doc/fixes34.2 Old savegames and bones levels from nethack 3.4.1 (and 3.4.0) should still work, but as usual, caution is advised. --- games/nethack-x11/patches/patch-aa | 20 ++++++++++---------- games/nethack-x11/patches/patch-ab | 16 ++++++++-------- games/nethack-x11/patches/patch-ac | 14 +++++++------- games/nethack-x11/patches/patch-ae | 8 ++++---- games/nethack-x11/patches/patch-af | 25 +++++++++++++------------ games/nethack-x11/patches/patch-ag | 2 +- games/nethack-x11/patches/patch-ah | 18 +++++++++--------- 7 files changed, 52 insertions(+), 51 deletions(-) (limited to 'games/nethack-x11/patches') diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa index f8efb2c63f9..345f89edc4f 100644 --- a/games/nethack-x11/patches/patch-aa +++ b/games/nethack-x11/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.6 2003/03/01 21:12:52 pooka Exp $ +$NetBSD: patch-aa,v 1.7 2003/09/02 00:30:56 pooka Exp $ ---- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200 -+++ include/config.h 2003-03-01 22:17:08.000000000 +0200 +--- include/config.h.orig 2003-08-30 03:07:15.000000000 +0300 ++++ include/config.h 2003-09-02 03:04:54.000000000 +0300 @@ -42,8 +42,8 @@ * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. */ -#define TTY_GRAPHICS /* good old tty based graphics */ -/* #define X11_GRAPHICS */ /* X11 interface */ -+/* #define TTY_GRAPHICS /* good old tty based graphics */ -+#define X11_GRAPHICS /* X11 interface */ ++/* #define TTY_GRAPHICS *//* good old tty based graphics */ ++#define X11_GRAPHICS /* X11 interface */ /* #define QT_GRAPHICS */ /* Qt interface */ /* #define GNOME_GRAPHICS */ /* Gnome interface */ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ @@ -37,12 +37,12 @@ $NetBSD: patch-aa,v 1.6 2003/03/01 21:12:52 pooka Exp $ /* 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 */ ++/* #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 "@GZIP_PROGRAM@" /* FSF gzip compression */ ++#define COMPRESS "@GZIP_PROGRAM@" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.6 2003/03/01 21:12:52 pooka Exp $ # define HACKDIR "nethackdir" /* nethack directory */ # else -# define HACKDIR "/usr/games/lib/nethackdir" -+# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" ++# define HACKDIR PREFIX "/share/nethackdir340" # endif # endif @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.6 2003/03/01 21:12:52 pooka Exp $ */ -/* #define VISION_TABLES */ /* use vision tables generated at compile time */ -+#define VISION_TABLES /* use vision tables generated at compile time */ ++#define VISION_TABLES /* use vision tables generated at compile time */ #ifndef VISION_TABLES # ifndef NO_MACRO_CPATH # define MACRO_CPATH /* use clear_path macros instead of functions */ diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 9a81327d933..128b31958ec 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ +$NetBSD: patch-ab,v 1.10 2003/09/02 00:30:56 pooka Exp $ ---- 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 +--- sys/unix/Makefile.top.orig 2003-08-30 03:08:04.000000000 +0300 ++++ sys/unix/Makefile.top 2003-09-02 02:42:07.000000000 +0300 @@ -14,18 +14,17 @@ # MAKE = make @@ -39,8 +39,8 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ # per discussion in Install.X11 and Install.Qt -VARDATND = +VARDATND = pet_mark.xbm rip.xpm - # VARDATND = x11tiles pet_mark.xbm - # VARDATND = x11tiles pet_mark.xbm rip.xpm + # VARDATND = x11tiles NetHack.ad pet_mark.xbm + # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm # for Atari/Gem @@ -87,9 +86,12 @@ $(GAME): @@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ # Note: many of the dependencies below are here to allow parallel make # to generate valid output -@@ -180,18 +182,15 @@ +@@ -183,18 +185,15 @@ -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} @@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) chmod $(EXEPERM) $(SHELLDIR)/$(GAME) -@@ -227,16 +226,16 @@ +@@ -230,16 +229,16 @@ # and a reminder @echo You may also want to install the man pages via the doc Makefile. @@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:52 pooka Exp $ # set up the game files ( $(MAKE) dofiles ) # set up some additional files -@@ -244,9 +243,20 @@ +@@ -247,9 +246,20 @@ -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ $(CHGRP) $(GAMEGRP) perm record logfile ; \ chmod $(FILEPERM) perm record logfile ) diff --git a/games/nethack-x11/patches/patch-ac b/games/nethack-x11/patches/patch-ac index cf458224b96..3431095c1c3 100644 --- a/games/nethack-x11/patches/patch-ac +++ b/games/nethack-x11/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.3 2003/06/25 14:22:12 pooka Exp $ +$NetBSD: patch-ac,v 1.4 2003/09/02 00:30:56 pooka Exp $ ---- include/system.h.orig 2003-02-23 16:43:22.000000000 +0200 -+++ include/system.h 2003-03-01 16:34:46.000000000 +0200 +--- include/system.h.orig 2003-08-30 03:07:23.000000000 +0300 ++++ include/system.h 2003-09-02 02:49:23.000000000 +0300 @@ -79,10 +79,10 @@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); # endif --# if !defined(SUNOS4) || defined(RANDOM) -+# if !defined(SUNOS4) && !defined(__FreeBSD__) && !defined(__NetBSD__) || defined(RANDOM) +-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) ++# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__)) || defined(RANDOM) E void FDECL(srandom, (unsigned int)); # else -# if !defined(bsdi) && !defined(__FreeBSD__) -+# if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) ++# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) E int FDECL(srandom, (unsigned int)); # endif # endif @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.3 2003/06/25 14:22:12 pooka Exp $ # endif +#ifndef __NetBSD__ - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) + # if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) E time_t FDECL(time, (time_t *)); # else E long FDECL(time, (time_t *)); diff --git a/games/nethack-x11/patches/patch-ae b/games/nethack-x11/patches/patch-ae index 2b078332f38..9c202d31f32 100644 --- a/games/nethack-x11/patches/patch-ae +++ b/games/nethack-x11/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2002/03/22 17:26:28 pooka Exp $ +$NetBSD: patch-ae,v 1.2 2003/09/02 00:30:56 pooka Exp $ ---- sys/unix/Makefile.doc.orig Fri Jan 14 22:49:48 2000 -+++ sys/unix/Makefile.doc Thu Aug 10 18:17:40 2000 -@@ -34,7 +34,7 @@ +--- sys/unix/Makefile.doc.orig 2003-02-23 16:43:39.000000000 +0200 ++++ sys/unix/Makefile.doc 2003-03-01 16:36:19.000000000 +0200 +@@ -38,7 +38,7 @@ GAME = nethack diff --git a/games/nethack-x11/patches/patch-af b/games/nethack-x11/patches/patch-af index 72bd923f725..fc0bf72d66a 100644 --- a/games/nethack-x11/patches/patch-af +++ b/games/nethack-x11/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.2 2003/03/01 21:12:52 pooka Exp $ +$NetBSD: patch-af,v 1.3 2003/09/02 00:30:57 pooka Exp $ ---- include/unixconf.h.orig Thu Mar 21 01:42:56 2002 -+++ include/unixconf.h Fri Mar 22 17:42:50 2002 +--- include/unixconf.h.orig 2003-08-30 03:07:24.000000000 +0300 ++++ include/unixconf.h 2003-09-02 02:55:54.000000000 +0300 @@ -19,20 +19,20 @@ */ /* define exactly one of the following four choices */ --/* #define BSD 1 */ /* define for 4.n BSD */ -+#define BSD 1 /* define for 4.n BSD */ +-/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */ ++#define BSD 1 /* define for 4.n/Free/Open/Net BSD */ /* also for relatives like SunOS 4.x, DG/UX, and */ /* older versions of Linux */ /* #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 */ ++/* #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 */ @@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.2 2003/03/01 21:12:52 pooka Exp $ /* 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 */ ++/* #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 */ @@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.2 2003/03/01 21:12:52 pooka Exp $ /* Should be defined for most SYSV, SVR4 (including * Solaris 2+), HPUX, and Linux systems. In * particular, it should NOT be defined for the UNIXPC -@@ -168,11 +168,15 @@ +@@ -168,6 +168,9 @@ #ifdef MAIL # if defined(BSD) || defined(ULTRIX) @@ -45,10 +45,11 @@ $NetBSD: patch-af,v 1.2 2003/03/01 21:12:52 pooka Exp $ # ifdef AMS #define AMS_MAILBOX "/Mailbox" # else +@@ -177,6 +180,7 @@ #define DEF_MAILREADER "/usr/ucb/Mail" --# endif -+# endif -+# endif + # endif + # endif ++#endif #else # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX) - # if defined(M_XENIX) || defined(__FreeBSD__) + # if defined(M_XENIX) diff --git a/games/nethack-x11/patches/patch-ag b/games/nethack-x11/patches/patch-ag index a97ee98e6fc..94597f838d8 100644 --- a/games/nethack-x11/patches/patch-ag +++ b/games/nethack-x11/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 2003/03/01 21:12:52 pooka Exp $ +$NetBSD: patch-ag,v 1.3 2003/09/02 00:30:57 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 051d57e7322..4b4b3d22035 100644 --- a/games/nethack-x11/patches/patch-ah +++ b/games/nethack-x11/patches/patch-ah @@ -1,19 +1,19 @@ -$NetBSD: patch-ah,v 1.3 2003/03/01 21:12:52 pooka Exp $ +$NetBSD: patch-ah,v 1.4 2003/09/02 00:30:57 pooka Exp $ ---- 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 @@ +--- sys/unix/Makefile.src.orig 2003-08-30 03:08:04.000000000 +0300 ++++ sys/unix/Makefile.src 2003-09-02 03:08:18.000000000 +0300 +@@ -151,8 +151,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include --LFLAGS = +-LFLAGS = +CFLAGS += -I../include -I${X11BASE}/include +LFLAGS = ${LDFLAGS} # 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 -@@ -204,8 +204,8 @@ + # NetHack is standard C. If using Qt, uncomment the LINK line here to get +@@ -214,8 +214,8 @@ # # @@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/01 21:12:52 pooka 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 -@@ -225,7 +225,7 @@ +@@ -235,7 +235,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.3 2003/03/01 21:12:52 pooka 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 -@@ -245,7 +245,7 @@ +@@ -255,7 +255,7 @@ # libraries for BeOS WINBELIB = -lbe -- cgit v1.2.3