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

3 files changed, 26 insertions, 51 deletions

diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index a6864dce72a..f9c8e3c9a05 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2003/10/14 11:06:34 pooka Exp $
+$NetBSD: distinfo,v 1.16 2004/03/05 15:21:01 pooka Exp $
 
-SHA1 (nethack-342.tgz) = a630f8e1ecdc0c957dd6707acbb99dac450a57ba
-Size (nethack-342.tgz) = 3475583 bytes
-SHA1 (patch-aa) = efbf4b0236ed39861a7c90fc49c782e5e9d32b17
+SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
+Size (nethack-343-src.tgz) = 3497458 bytes
+SHA1 (patch-aa) = 6439ddb86b4600aa39e6b52cabaf4f6696dd1023
 SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db
 SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
@@ -10,4 +10,3 @@ SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
 SHA1 (patch-ah) = 9ebeb33744c86f2d2dd2f6a09eae17a0c2d81c90
 SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
-SHA1 (patch-aj) = 9df6d1c4af8526e0d1dd2b44960847f6653fe445
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index 442fa597945..029edf71a06 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,65 +1,54 @@
-$NetBSD: patch-aa,v 1.10 2003/10/14 11:06:35 pooka Exp $
+$NetBSD: patch-aa,v 1.11 2004/03/05 15:21:01 pooka Exp $
 
---- include/config.h.orig	2003-02-23 16:43:19.000000000 +0200
-+++ include/config.h	2003-03-01 22:54:41.000000000 +0200
+--- include/config.h.old	2003-12-08 01:39:13.000000000 +0200
++++ include/config.h	2004-03-05 17:00:59.000000000 +0200
 @@ -42,9 +42,9 @@
   * 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 TTY_GRAPHICS	/* good old tty based graphics */
++/* #define TTY_GRAPHICS */	/* good old tty based graphics */
  /* #define X11_GRAPHICS */	/* X11 interface */
 -/* #define QT_GRAPHICS */	/* Qt interface */
 +#define QT_GRAPHICS		/* Qt interface */
  /* #define GNOME_GRAPHICS */	/* Gnome interface */
  /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
  
-@@ -84,8 +84,8 @@
- 
+@@ -85,7 +85,7 @@
  #ifdef QT_GRAPHICS
  # define DEFAULT_WC_TILED_MAP   /* Default to tiles if users doesn't say wc_ascii_map */
--# define USER_SOUNDS		/* Use sounds */
--# define USER_SOUNDS_REGEX
-+/* # define USER_SOUNDS		 Use sounds */
-+/* # define USER_SOUNDS_REGEX */
+ # define USER_SOUNDS		/* Use sounds */
+-# ifndef __APPLE__
++# if !(defined(__APPLE__) || defined(__NetBSD__))
+ #  define USER_SOUNDS_REGEX
+ # endif
  # define USE_XPM		/* Use XPM format for images (required) */
- # define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.ppm) */
- # ifndef DEFAULT_WINDOW_SYS
-@@ -112,7 +112,7 @@
- #endif
- 
- #ifndef DEFAULT_WINDOW_SYS
--# define DEFAULT_WINDOW_SYS "tty"
-+# define DEFAULT_WINDOW_SYS "Qt"
- #endif
- 
- #ifdef X11_GRAPHICS
-@@ -167,11 +167,11 @@
+@@ -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 */
-+#define COMPRESS "/usr/bin/gzip"		/* FSF gzip compression */
++#define COMPRESS "@GZIP_PROGRAM@"		/* 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 "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-qt/patches/patch-aj b/games/nethack-qt/patches/patch-aj
deleted file mode 100644
index 9a6de3afa44..00000000000
--- a/games/nethack-qt/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/03/01 21:14:55 pooka Exp $
-
---- src/files.c.orig	2003-02-23 16:43:26.000000000 +0200
-+++ src/files.c	2003-03-01 22:57:10.000000000 +0200
-@@ -47,6 +47,8 @@
- # define O_BINARY 0
- #endif
- 
-+#include <sys/syslimits.h>
-+
- #ifdef PREFIXES_IN_USE
- #define FQN_NUMBUF 4
- static char fqn_filename_buffer[FQN_NUMBUF][FQN_MAX_FILENAME];