Hello NetHack 3.4.1

This is a bugfix release, no new features introduced.

As a compensation for no new features, savegames and bones levels
from NetHack 3.4.0 should work, and that's why I kept the datafile
directory named nethackdir340. In theory you should be able to
simply update the nethack pkgs and continue playing, but I'll not
accept any death threats if it doesn't work, so please make sure
you make the appropriate backups before trying.

7 files changed, 56 insertions, 88 deletions

diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 271da9d3b65..768fa29fc92 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.8 2003/02/19 20:25:20 pooka Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/03/01 21:12:49 pooka Exp $
 #
 
-NETHACK_BASEVER=	3.4.0
-NETHACK_VERSION=	${NETHACK_BASEVER}nb2
-NETHACK_DISTVER=	340
+NETHACK_BASEVER=	3.4.1
+NETHACK_VERSION=	${NETHACK_BASEVER}
+NETHACK_DISTVER=	341
+NETHACK_DIR=		nethackdir340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}
 CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.nethack.org/pub/nethack/nh340/src/
+MASTER_SITES=		ftp://ftp.nethack.org/pub/nethack/nh${NETHACK_DISTVER}/src/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pooka@netbsd.org
diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo
index 30b2486de31..74388f737c9 100644
--- a/games/nethack-lib/distinfo
+++ b/games/nethack-lib/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.5 2003/02/19 20:25:20 pooka Exp $
+$NetBSD: distinfo,v 1.6 2003/03/01 21:12:50 pooka Exp $
 
-SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523
-Size (nethack-340.tgz) = 3270905 bytes
-SHA1 (patch-aa) = d603889257c10a2affa4996c32d50e9ff7e36368
-SHA1 (patch-ab) = 3c4fd5e4d9e1bdf685cfafaba74ee158f6d52072
-SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
+SHA1 (nethack-341.tgz) = 91eec5d20fb0fe676f92e1149e3b0360470aef77
+Size (nethack-341.tgz) = 3492419 bytes
+SHA1 (patch-aa) = 5eba647b7017f87a9f332970f6ef7c66cb1c0117
+SHA1 (patch-ab) = fa217d8540a550d669a9037c5861ac4d685941ee
+SHA1 (patch-ac) = a2a23324ec9859962064c9f520cad27439442a77
 SHA1 (patch-ad) = c5e86cda66b36bfdd3d6460ec5b3c65706692dba
-SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
+SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
 SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = 12763f8759de2c9b13d0e77f18e8e6aa69a031dc
diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa
index d0bf232a55b..7b5281c417c 100644
--- a/games/nethack-lib/patches/patch-aa
+++ b/games/nethack-lib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/03/25 20:32:26 pooka Exp $
+$NetBSD: patch-aa,v 1.8 2003/03/01 21:12:50 pooka Exp $
 
---- 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 @@
+--- 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 @@
  
  #ifdef UNIX
  /* path and file name extension for compression program */
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:26 pooka Exp $
  #endif
  
  #ifndef COMPRESS
-@@ -201,7 +201,7 @@
+@@ -205,7 +205,7 @@
  #  ifdef __APPLE__
  #    define HACKDIR "nethackdir"	/* nethack directory */
  #  else
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:26 pooka Exp $
  #  endif
  # endif
  
-@@ -298,7 +298,7 @@
+@@ -302,7 +302,7 @@
   * functions that have been macroized.
   */
  
diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab
index 2feb22539a8..382305152c8 100644
--- a/games/nethack-lib/patches/patch-ab
+++ b/games/nethack-lib/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2002/03/25 20:32:26 pooka Exp $
+$NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $
 
---- sys/unix/Makefile.top.orig	Fri Mar 22 17:15:28 2002
-+++ sys/unix/Makefile.top	Fri Mar 22 17:24:57 2002
+--- 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
 @@ -14,18 +14,17 @@
  # MAKE = make
  
@@ -46,43 +46,23 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:26 pooka Exp $
  $(GAME):
  	( cd src ; $(MAKE) )
  
--all:	$(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
+-all:	$(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
 +all:	$(GAME) datastuff
  	@echo "Done."
  
-+datastuff: Guidebook $(VARDAT) dungeon spec_levs check-dlb recover
++datastuff: recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
 +	@echo "Data Sets Built."
 +
  # Note: many of the dependencies below are here to allow parallel make
  # to generate valid output
  
-@@ -102,6 +104,9 @@
- data: $(GAME)
- 	( cd dat ; $(MAKE) data )
- 
-+recover:
-+	( cd util ; $(MAKE) recover )
-+
- rumors: $(GAME)
- 	( cd dat ; $(MAKE) rumors )
- 
-@@ -164,6 +169,11 @@
- 	( cd util ; $(MAKE) dlb )
- 	( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
- 
-+binfiles: $(GAME)
-+	cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE)
-+	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \
-+		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
-+	 chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
- 
- dofiles:
- 	target=`sed -n					\
-@@ -173,16 +183,13 @@
+@@ -180,18 +182,15 @@
  		-e '}' 					\
  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
 -	cp src/$(GAME) $(GAMEDIR)
+-	cp util/recover $(GAMEDIR)
++	cp util/recover $(PREFIX)/bin
  	-rm -f $(SHELLDIR)/$(GAME)
  	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
@@ -90,18 +70,20 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:26 pooka Exp $
  		< sys/unix/nethack.sh \
  		> $(SHELLDIR)/$(GAME)
  # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
--			$(CHGRP) $(GAMEGRP) $(GAME) )
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+-			$(CHGRP) $(GAMEGRP) $(GAME) recover )
 -	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
+-	chmod $(EXEPERM) $(GAMEDIR)/recover
++	chmod $(EXEPERM) $(PREFIX)/bin/recover
  	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
  	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
  	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
-@@ -218,16 +225,16 @@
+@@ -227,16 +226,16 @@
  # and a reminder
  	@echo You may also want to install the man pages via the doc Makefile.
  
--install: $(GAME) $(VARDAT) dungeon spec_levs
-+install-dat: $(VARDAT) dungeon spec_levs
+-install: $(GAME) recover $(VARDAT) dungeon spec_levs
++install-dat: recover $(VARDAT) dungeon spec_levs
  # set up the directories
  # not all mkdirs have -p; those that don't will create a -p directory
  	-mkdir -p $(SHELLDIR)
@@ -116,18 +98,24 @@ $NetBSD: patch-ab,v 1.8 2002/03/25 20:32:26 pooka Exp $
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
-@@ -235,6 +242,14 @@
+@@ -244,9 +243,20 @@
  	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
  			$(CHGRP) $(GAMEGRP) perm record logfile ; \
  			chmod $(FILEPERM) perm record logfile )
++	-touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
++	-touch -c $(VARDIR)/save/*
 +	-mkdir -p $(PREFIX)/share/doc/nethack
 +	cp doc/Guidebook $(PREFIX)/share/doc/nethack
 +	chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/nethack/Guidebook
 +	chmod $(FILEPERM) $(PREFIX)/share/doc/nethack/Guidebook
-+	cp util/recover $(PREFIX)/bin/recover
-+	chown 0:0 $(PREFIX)/bin/recover
-+	chmod 755 $(PREFIX)/bin/recover
-+
  # and a reminder
  	@echo You may also want to reinstall the man pages via the doc Makefile.
  
++binfiles: $(GAME)
++	cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE)
++	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \
++		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
++	 chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
+ 
+ # 'make clean' removes all the .o files, but leaves around all the executables
+ # and compiled data files
diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac
index 52eed9f850a..052aca68ed3 100644
--- a/games/nethack-lib/patches/patch-ac
+++ b/games/nethack-lib/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $
+$NetBSD: patch-ac,v 1.4 2003/03/01 21:12:50 pooka Exp $
 
---- include/system.h.orig	Thu Jan  6 21:20:08 2000
-+++ include/system.h	Thu Aug 10 18:16:03 2000
-@@ -77,10 +77,10 @@
+--- include/system.h.orig	2003-02-23 16:43:22.000000000 +0200
++++ include/system.h	2003-03-01 16:34:46.000000000 +0200
+@@ -79,10 +79,10 @@
  # if !defined(__SC__) && !defined(LINUX)
  E  long NDECL(random);
  # endif
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $
  E int FDECL(srandom, (unsigned int));
  #  endif
  # endif
-@@ -130,7 +130,7 @@
+@@ -132,7 +132,7 @@
  E void FDECL(qsort, (genericptr_t,size_t,size_t,
  		     int(*)(const genericptr,const genericptr)));
  #else
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $
  E  int qsort();
  # else
  #  if !defined(LATTICE) && !defined(AZTEC_50)
-@@ -413,7 +413,7 @@
+@@ -421,7 +421,7 @@
  # ifdef HPUX
  E unsigned int	FDECL(strlen, (char *));
  #  else
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $
  E int	FDECL(strlen, (const char *));
  #   endif
  #  endif /* HPUX */
-@@ -513,11 +513,13 @@
+@@ -521,11 +521,13 @@
  #  endif
  # endif
  
diff --git a/games/nethack-lib/patches/patch-ae b/games/nethack-lib/patches/patch-ae
index b2fb32669d3..3d2a8568385 100644
--- a/games/nethack-lib/patches/patch-ae
+++ b/games/nethack-lib/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2000/08/10 17:50:07 pooka Exp $
+$NetBSD: patch-ae,v 1.4 2003/03/01 21:12:50 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-lib/patches/patch-ah b/games/nethack-lib/patches/patch-ah
deleted file mode 100644
index 529a53b51de..00000000000
--- a/games/nethack-lib/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/02/19 20:25:20 pooka Exp $
-
-*** src/topten.c.orig	Mon Feb  4 08:06:07 2002
---- src/topten.c	Mon Feb 10 10:48:55 2003
-***************
-*** 856,861 ****
---- 856,867 ----
-  	    else {
-  		if (playerct > 1) Strcat(pbuf, "any of ");
-  		for (i = 0; i < playerct; i++) {
-+ 		    /* stop printing players if there are too many to fit */
-+ 		    if (strlen(pbuf) + strlen(players[i]) + 2 >= BUFSZ) {
-+ 			if (strlen(pbuf) < BUFSZ-4) Strcat(pbuf, "...");
-+ 			else Strcpy(pbuf+strlen(pbuf)-4, "...");
-+ 			break;
-+ 		    }
-  		    Strcat(pbuf, players[i]);
-  		    if (i < playerct-1) {
-  			if (players[i][0] == '-' &&
-