From f813eca7e7be72bdbfda719fbd8647eee10f35d8 Mon Sep 17 00:00:00 2001 From: pooka Date: Fri, 5 Mar 2004 15:21:01 +0000 Subject: Nethack 3.4.3 This is a bugfix-release. It should be compatible with bones files and savegames all the way back to 3.4.0 (but of course it's safer to ascend before upgrade). Assorted fixes (full list in doc/fixes34.3): * Correct several inconsistencies * Correct a potentially fatal bug caused by dropping loadstones * Handle level completely filled with monsters better * X11 player selection fixes, one of which could be fatal * Eliminated a gold-in-shop-container cheat --- games/nethack-lib/Makefile.common | 10 +++++----- games/nethack-lib/distinfo | 14 +++++++------- games/nethack-lib/patches/patch-aa | 28 ++++++++++++++-------------- games/nethack-lib/patches/patch-ab | 6 +++--- games/nethack-lib/patches/patch-ac | 17 ++++++----------- games/nethack-lib/patches/patch-af | 25 ++++++++----------------- 6 files changed, 43 insertions(+), 57 deletions(-) (limited to 'games/nethack-lib') diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common index fd4293b0ad6..2dcff5db542 100644 --- a/games/nethack-lib/Makefile.common +++ b/games/nethack-lib/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.15 2004/01/20 12:15:41 agc Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/03/05 15:21:01 pooka Exp $ # -NETHACK_BASEVER= 3.4.2 -NETHACK_VERSION= ${NETHACK_BASEVER}nb1 -NETHACK_DISTVER= 342 +NETHACK_BASEVER= 3.4.3 +NETHACK_VERSION= ${NETHACK_BASEVER} +NETHACK_DISTVER= ${NETHACK_BASEVER:S/.//g} NETHACK_DIR= nethackdir340 -DISTNAME= nethack-${NETHACK_DISTVER} +DISTNAME= nethack-${NETHACK_DISTVER}-src CATEGORIES= games MASTER_SITES= ftp://ftp.sourceforge.net/pub/sourceforge/nethack/ EXTRACT_SUFX= .tgz diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo index c1cd08dc610..1d2b9493d29 100644 --- a/games/nethack-lib/distinfo +++ b/games/nethack-lib/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2003/09/02 00:30:54 pooka Exp $ +$NetBSD: distinfo,v 1.9 2004/03/05 15:21:01 pooka Exp $ -SHA1 (nethack-342.tgz) = a630f8e1ecdc0c957dd6707acbb99dac450a57ba -Size (nethack-342.tgz) = 3475583 bytes -SHA1 (patch-aa) = 5eba647b7017f87a9f332970f6ef7c66cb1c0117 -SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db -SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81 +SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd +Size (nethack-343-src.tgz) = 3497458 bytes +SHA1 (patch-aa) = ed5c55651acf81c459867c99026e13a6c5ed34a0 +SHA1 (patch-ab) = 73a1ac287ded70f371bb38c82cdbcd36182ce3a5 +SHA1 (patch-ac) = 0825b47a638c2c888238e76f4a646a8c33c850ad SHA1 (patch-ad) = 16ec579732beba4b2cb4ab3ea06d20d4f6b191a4 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db -SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e +SHA1 (patch-af) = c7640150409d97a7930fef476191d34c08c6f741 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa index 7b5281c417c..da8d8abf4a1 100644 --- a/games/nethack-lib/patches/patch-aa +++ b/games/nethack-lib/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.8 2003/03/01 21:12:50 pooka Exp $ +$NetBSD: patch-aa,v 1.9 2004/03/05 15:21:01 pooka Exp $ ---- include/config.h.old 2003-02-23 16:43:19.000000000 +0200 -+++ include/config.h 2003-03-01 15:35:57.000000000 +0200 -@@ -167,11 +167,11 @@ +--- include/config.h.old 2004-03-05 15:39:59.000000000 +0200 ++++ include/config.h 2004-03-05 15:40:05.000000000 +0200 +@@ -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 */ ++/* #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 */ @@ -18,16 +18,16 @@ $NetBSD: patch-aa,v 1.8 2003/03/01 21:12:50 pooka Exp $ #endif #ifndef COMPRESS -@@ -205,7 +205,7 @@ - # ifdef __APPLE__ - # define HACKDIR "nethackdir" /* nethack directory */ - # else --# define HACKDIR "/usr/games/lib/nethackdir" -+# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" - # endif +@@ -204,7 +204,7 @@ + * otherwise it will be the current directory. + */ + # ifndef HACKDIR +-# define HACKDIR "/usr/games/lib/nethackdir" ++# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" # endif -@@ -302,7 +302,7 @@ + /* +@@ -300,7 +300,7 @@ * functions that have been macroized. */ diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab index 54ffe1f909b..c2aa0916c81 100644 --- a/games/nethack-lib/patches/patch-ab +++ b/games/nethack-lib/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.10 2003/09/02 00:30:54 pooka Exp $ +$NetBSD: patch-ab,v 1.11 2004/03/05 15:21:01 pooka Exp $ ---- 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 +--- sys/unix/Makefile.top.orig 2003-12-08 01:39:13.000000000 +0200 ++++ sys/unix/Makefile.top 2004-03-05 15:40:57.000000000 +0200 @@ -14,18 +14,17 @@ # MAKE = make diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac index c2e9874302a..aa7f8c71cbe 100644 --- a/games/nethack-lib/patches/patch-ac +++ b/games/nethack-lib/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.6 2003/09/02 00:30:54 pooka Exp $ +$NetBSD: patch-ac,v 1.7 2004/03/05 15:21:01 pooka Exp $ ---- include/system.h.orig 2003-08-30 03:07:23.000000000 +0300 -+++ include/system.h 2003-09-02 02:49:23.000000000 +0300 +--- include/system.h.orig 2003-12-08 01:39:13.000000000 +0200 ++++ include/system.h 2004-03-05 15:44:53.000000000 +0200 @@ -79,10 +79,10 @@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); @@ -33,17 +33,12 @@ $NetBSD: patch-ac,v 1.6 2003/09/02 00:30:54 pooka Exp $ E int FDECL(strlen, (const char *)); # endif # endif /* HPUX */ -@@ -521,11 +521,13 @@ +@@ -521,7 +521,7 @@ # endif # endif -+#ifndef __NetBSD__ - # if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || 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)) ++# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__) E time_t FDECL(time, (time_t *)); # else E long FDECL(time, (time_t *)); - # endif /* ULTRIX */ -+#endif - - #ifdef VMS - /* used in makedefs.c, but missing from gcc-vms's */ diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af index 34bd25c80b0..bcd9be75bf0 100644 --- a/games/nethack-lib/patches/patch-af +++ b/games/nethack-lib/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.4 2003/09/02 00:30:55 pooka Exp $ +$NetBSD: patch-af,v 1.5 2004/03/05 15:21:01 pooka Exp $ ---- include/unixconf.h.orig 2003-08-30 03:07:24.000000000 +0300 -+++ include/unixconf.h 2003-09-02 02:55:54.000000000 +0300 +--- include/unixconf.h.orig 2003-12-08 01:39:13.000000000 +0200 ++++ include/unixconf.h 2004-03-05 15:47:53.000000000 +0200 @@ -19,20 +19,20 @@ */ @@ -35,21 +35,12 @@ $NetBSD: patch-af,v 1.4 2003/09/02 00:30:55 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,6 +168,9 @@ - - #ifdef MAIL - # if defined(BSD) || defined(ULTRIX) -+# ifdef __NetBSD__ -+#define DEF_MAILREADER "/usr/bin/mail" -+# else +@@ -171,7 +171,7 @@ # ifdef AMS #define AMS_MAILBOX "/Mailbox" # else -@@ -177,6 +180,7 @@ +-# if defined(__FreeBSD__) || defined(__OpenBSD__) ++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #define DEF_MAILREADER "/usr/bin/mail" + # else #define DEF_MAILREADER "/usr/ucb/Mail" - # endif - # endif -+#endif - #else - # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX) - # if defined(M_XENIX) -- cgit v1.2.3