Upgrade nethack packages to NetHack 3.4.0

Highlights of the new release:
* numerous bugfixes

* stamina affects ability to throw heavy things
* objects merge in containers
* several small refinements to race/role separation
* more feedback about skill advancement from #enhance command
* "autodig" option
* option for starting without a pet
+ many more, read doc/fixes34.0

Old savegames naturally don't work, so make sure you finish old ones
before upgrading the package.

Also fixes the rest of pkg/15717 by Bernd Ernesti. Solution was the same
as what Thomas Klausner used to fix angband (ie. simply duplicate the
patches)

7 files changed, 57 insertions, 50 deletions

diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index d1c00f186eb..2ff18e2f896 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.5 2001/04/21 13:09:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/03/22 17:26:24 pooka Exp $
 #
 
-NETHACK_VERSION=	3.3.1
-NETHACK_DISTVER=	331
+NETHACK_VERSION=	3.4.0
+NETHACK_DISTVER=	340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}
 CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.nethack.org/pub/nethack/nh331/src/
+MASTER_SITES=		ftp://ftp.nethack.org/pub/nethack/nh340/src/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pooka@netbsd.org
@@ -25,6 +25,7 @@ pre-configure:
 post-patch:
 	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre
 	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g'				\
-		-e 's|@GZIP_PROGRAM@|'`${ECHO} ${GZIP_CMD} | ${AWK} '{ print $$1 }'`'|g' \
+		-e 's|@GZIP_PROGRAM@|'`${ECHO} ${GZIP_CMD}		\
+		| ${AWK} '{ print $$1 }'`'|g'				\
 		< ${WRKSRC}/config.h-pre > ${WRKSRC}/include/config.h
 	@${RM} -f ${WRKSRC}/config.h-pre
diff --git a/games/nethack-lib/PLIST b/games/nethack-lib/PLIST
index 49d14005d3b..d1c926c53ce 100644
--- a/games/nethack-lib/PLIST
+++ b/games/nethack-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:54:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/22 17:26:24 pooka Exp $
 bin/nethack
 bin/recover
 man/man6/nethack.6
@@ -29,6 +29,12 @@ share/nethackdir/tower1.lev
 share/nethackdir/sanctum.lev
 share/nethackdir/orcus.lev
 share/nethackdir/oracle.lev
+share/nethackdir/minetn-7.lev
+share/nethackdir/minetn-6.lev
+share/nethackdir/minetn-5.lev
+share/nethackdir/minetn-4.lev
+share/nethackdir/minetn-3.lev
+share/nethackdir/minend-3.lev
 share/nethackdir/minetn-2.lev
 share/nethackdir/minetn-1.lev
 share/nethackdir/minefill.lev
diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo
index 77600030358..322275dd034 100644
--- a/games/nethack-lib/distinfo
+++ b/games/nethack-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:31 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/03/22 17:26:24 pooka Exp $
 
-SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
-Size (nethack-331.tgz) = 3061094 bytes
-SHA1 (patch-aa) = 97422fc0ae195d7515383c314729246943e8abcc
-SHA1 (patch-ab) = af8ec94ee38c91407a9b2986b6fe308eed37281e
+SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523
+Size (nethack-340.tgz) = 3270905 bytes
+SHA1 (patch-aa) = 12de71bdeddaae9f863b894e797d1b3e5995046b
+SHA1 (patch-ab) = f6ef749e8082f22fe97efdcf40a0475182b8299f
 SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
-SHA1 (patch-ad) = 0ee6772cae1414cc144c1c75bbec3cd5f507ed34
+SHA1 (patch-ad) = bddad346674c4242b8ec1f4689d05db58fa175bf
 SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
-SHA1 (patch-af) = ad2e532c884706af384a295b4d546ca06f9a753a
+SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa
index 1a0cbbccd06..e719bbf32c8 100644
--- a/games/nethack-lib/patches/patch-aa
+++ b/games/nethack-lib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2000/08/10 17:50:06 pooka Exp $
+$NetBSD: patch-aa,v 1.6 2002/03/22 17:26:25 pooka Exp $
 
---- include/config.h.orig	Sat Jul 22 04:13:51 2000
-+++ include/config.h	Thu Aug 10 17:39:35 2000
-@@ -151,11 +151,11 @@
+--- include/config.h.old	Thu Mar 21 01:42:43 2002
++++ include/config.h	Fri Mar 22 15:00:37 2002
+@@ -163,11 +163,11 @@
  
  #ifdef UNIX
  /* path and file name extension for compression program */
@@ -13,21 +13,21 @@ $NetBSD: patch-aa,v 1.5 2000/08/10 17:50:06 pooka Exp $
  /* 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
-@@ -186,7 +186,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "XXXPREFIXXXX/share/nethackdir"	/* nethack directory */
+@@ -201,7 +201,7 @@
+ #  ifdef __APPLE__
+ #    define HACKDIR "nethackdir"	/* nethack directory */
+ #  else
+-#    define HACKDIR "/usr/games/lib/nethackdir"
++#    define HACKDIR "XXXPREFIXXXX/share/nethackdir"
+ #  endif
  # endif
  
- /*
-@@ -282,7 +282,7 @@
+@@ -298,7 +298,7 @@
   * functions that have been macroized.
   */
  
diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab
index 807e3524c47..b0e3eee9652 100644
--- a/games/nethack-lib/patches/patch-ab
+++ b/games/nethack-lib/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
+$NetBSD: patch-ab,v 1.7 2002/03/22 17:26:25 pooka Exp $
 
---- sys/unix/Makefile.top.orig	Tue Jul  4 03:42:05 2000
-+++ sys/unix/Makefile.top	Mon Nov 27 23:14:25 2000
+--- sys/unix/Makefile.top.orig	Fri Mar 22 17:15:28 2002
++++ sys/unix/Makefile.top	Fri Mar 22 17:24:57 2002
 @@ -14,18 +14,17 @@
  # MAKE = make
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
  
  # per discussion in Install.X11 and Install.Qt
 -VARDATND = 
-+VARDATND = pet_mark.xbm rip.xpm
++VARDATND =  pet_mark.xbm rip.xpm
  # VARDATND = x11tiles pet_mark.xbm
  # VARDATND = x11tiles pet_mark.xbm rip.xpm
  # for Atari/Gem
@@ -53,20 +53,20 @@ $NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
 +datastuff: Guidebook $(VARDAT) dungeon spec_levs check-dlb recover
 +	@echo "Data Sets Built."
 +
- Guidebook:
- 	( cd doc ; $(MAKE) Guidebook )
+ # Note: many of the dependencies below are here to allow parallel make
+ # to generate valid output
  
-@@ -99,6 +101,9 @@
- data:
+@@ -102,6 +104,9 @@
+ data: $(GAME)
  	( cd dat ; $(MAKE) data )
  
 +recover:
 +	( cd util ; $(MAKE) recover )
 +
- rumors:
+ rumors: $(GAME)
  	( cd dat ; $(MAKE) rumors )
  
-@@ -156,6 +161,11 @@
+@@ -164,6 +169,11 @@
  	( cd util ; $(MAKE) dlb )
  	( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
  
@@ -74,11 +74,11 @@ $NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
 +	cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE)
 +	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \
 +		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
-+	chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
++	 chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
  
  dofiles:
  	target=`sed -n					\
-@@ -165,16 +175,13 @@
+@@ -173,16 +183,13 @@
  		-e '}' 					\
  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
@@ -96,7 +96,7 @@ $NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
  	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
  	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
  	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
-@@ -210,16 +217,16 @@
+@@ -218,16 +225,16 @@
  # and a reminder
  	@echo You may also want to install the man pages via the doc Makefile.
  
@@ -116,7 +116,7 @@ $NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
-@@ -227,6 +234,14 @@
+@@ -235,6 +242,14 @@
  	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
  			$(CHGRP) $(GAMEGRP) perm record logfile ; \
  			chmod $(FILEPERM) perm record logfile )
diff --git a/games/nethack-lib/patches/patch-ad b/games/nethack-lib/patches/patch-ad
index bb524d75ca7..d9f68bf59f4 100644
--- a/games/nethack-lib/patches/patch-ad
+++ b/games/nethack-lib/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.2 1999/12/24 22:30:00 pooka Exp $
+$NetBSD: patch-ad,v 1.3 2002/03/22 17:26:25 pooka Exp $
 
---- sys/unix/nethack.sh.orig	Sat Dec 11 07:21:05 1999
-+++ sys/unix/nethack.sh	Fri Dec 17 14:14:54 1999
+--- sys/unix/nethack.sh.orig	Thu Mar 21 01:43:54 2002
++++ sys/unix/nethack.sh	Fri Mar 22 17:39:00 2002
 @@ -1,9 +1,15 @@
  #!/bin/sh
- #	SCCS Id: @(#)nethack.sh	3.3	90/02/26
+ #	SCCS Id: @(#)nethack.sh	3.4	1990/02/26
  
 -HACKDIR=/usr/games/lib/nethackdir
 +if [ "$1" = "" ]; then
-+   TTY=tty
++	TTY=tty
 +else
-+   TTY=$1
++	TTY=$1
 +fi
 +
 +HACKDIR=XXXPREFIXXXX/share/nethackdir
diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af
index 9b8feae32b3..c9259679f4c 100644
--- a/games/nethack-lib/patches/patch-af
+++ b/games/nethack-lib/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2000/08/10 17:50:07 pooka Exp $
+$NetBSD: patch-af,v 1.3 2002/03/22 17:26:25 pooka Exp $
 
---- include/unixconf.h.orig	Mon Jul 17 04:03:51 2000
-+++ include/unixconf.h	Thu Aug 10 18:30:45 2000
+--- include/unixconf.h.orig	Thu Mar 21 01:42:56 2002
++++ include/unixconf.h	Fri Mar 22 17:42:50 2002
 @@ -19,20 +19,20 @@
   */
  
@@ -50,5 +50,5 @@ $NetBSD: patch-af,v 1.2 2000/08/10 17:50:07 pooka Exp $
 +# endif
 +# endif
  #else
- # if defined(SYSV) || defined(DGUX) || defined(HPUX)
+ # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
  #  if defined(M_XENIX) || defined(__FreeBSD__)