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

17 files changed, 122 insertions, 175 deletions

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 <time.h> */
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)
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];
diff --git a/games/nethack-tty/distinfo b/games/nethack-tty/distinfo
index 05d468a9aa0..1d2b9493d29 100644
--- a/games/nethack-tty/distinfo
+++ b/games/nethack-tty/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2003/09/02 00:30:56 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-x11/distinfo b/games/nethack-x11/distinfo
index 1c1a71a0bca..2459ac66af6 100644
--- a/games/nethack-x11/distinfo
+++ b/games/nethack-x11/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2003/10/14 11:06:34 pooka Exp $
+$NetBSD: distinfo,v 1.14 2004/03/05 15:21:01 pooka Exp $
 
-SHA1 (nethack-342.tgz) = a630f8e1ecdc0c957dd6707acbb99dac450a57ba
-Size (nethack-342.tgz) = 3475583 bytes
-SHA1 (patch-aa) = f6a36e65ed16c30ec4042f12ca122df6f4c0d221
-SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db
-SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81
+SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
+Size (nethack-343-src.tgz) = 3497458 bytes
+SHA1 (patch-aa) = b20a15dcb6db150aab19648068a186156bf76b90
+SHA1 (patch-ab) = 73a1ac287ded70f371bb38c82cdbcd36182ce3a5
+SHA1 (patch-ac) = 0825b47a638c2c888238e76f4a646a8c33c850ad
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
-SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e
+SHA1 (patch-af) = c7640150409d97a7930fef476191d34c08c6f741
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
 SHA1 (patch-ah) = 48b5972b9db3330d7087ff16816e0ae9b4ff208e
diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa
index 5bf96afbe01..440d7f1e5b1 100644
--- a/games/nethack-x11/patches/patch-aa
+++ b/games/nethack-x11/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.8 2003/10/14 11:06:34 pooka Exp $
+$NetBSD: patch-aa,v 1.9 2004/03/05 15:21:01 pooka Exp $
 
---- include/config.h.orig	2003-08-30 03:07:15.000000000 +0300
-+++ include/config.h	2003-09-02 03:04:54.000000000 +0300
+--- include/config.h.orig	2003-12-08 01:39:13.000000000 +0200
++++ include/config.h	2004-03-05 16:26:56.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.
   */
 -#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 */
-@@ -112,7 +112,7 @@
+@@ -114,7 +114,7 @@
  #endif
  
  #ifndef DEFAULT_WINDOW_SYS
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2003/10/14 11:06:34 pooka Exp $
  #endif
  
  #ifdef X11_GRAPHICS
-@@ -124,7 +124,7 @@
+@@ -126,7 +126,7 @@
   * would allow:
   *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
   */
@@ -31,37 +31,37 @@ $NetBSD: patch-aa,v 1.8 2003/10/14 11:06:34 pooka Exp $
  # ifdef USE_XPM
  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
  # endif
-@@ -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 "@GZIP_PROGRAM@"	 	/* 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.
   */
  
 -/* #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 128b31958ec..c2aa0916c81 100644
--- a/games/nethack-x11/patches/patch-ab
+++ b/games/nethack-x11/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2003/09/02 00:30:56 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-x11/patches/patch-ac b/games/nethack-x11/patches/patch-ac
index 3431095c1c3..6b83e27d0d8 100644
--- a/games/nethack-x11/patches/patch-ac
+++ b/games/nethack-x11/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2003/09/02 00:30:56 pooka Exp $
+$NetBSD: patch-ac,v 1.5 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.4 2003/09/02 00:30:56 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 <time.h> */
diff --git a/games/nethack-x11/patches/patch-ae b/games/nethack-x11/patches/patch-ae
index 9c202d31f32..897d633eb7b 100644
--- a/games/nethack-x11/patches/patch-ae
+++ b/games/nethack-x11/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2003/09/02 00:30:56 pooka Exp $
+$NetBSD: patch-ae,v 1.3 2004/03/05 15:21:01 pooka Exp $
 
 --- 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
diff --git a/games/nethack-x11/patches/patch-af b/games/nethack-x11/patches/patch-af
index fc0bf72d66a..be80d38a973 100644
--- a/games/nethack-x11/patches/patch-af
+++ b/games/nethack-x11/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2003/09/02 00:30:57 pooka Exp $
+$NetBSD: patch-af,v 1.4 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.3 2003/09/02 00:30:57 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)
diff --git a/games/nethack-x11/patches/patch-ag b/games/nethack-x11/patches/patch-ag
index 94597f838d8..380089daeb9 100644
--- a/games/nethack-x11/patches/patch-ag
+++ b/games/nethack-x11/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2003/09/02 00:30:57 pooka Exp $
+$NetBSD: patch-ag,v 1.4 2004/03/05 15:21:01 pooka Exp $
 
 --- src/mail.c.orig	Wed Aug  9 21:02:04 2000
 +++ src/mail.c	Thu Aug 10 18:32:30 2000