Make the name of nethackdir contain version information (eg. now it's

called nethackdir340). This is to ease the lives of people who wish to
have multiple versions nethack installed at the same time. It is not fully
automated, because doing pkgsrc magic will most likely screw things up
one funny way or another. And we all know that the most important thing
in this world is the nethack scorefile ...

Manually bump version to 3.4.0nb1.

6 files changed, 144 insertions, 143 deletions

diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 2ff18e2f896..0f52b68e13e 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2002/03/22 17:26:24 pooka Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/03/25 20:32:25 pooka Exp $
 #
 
-NETHACK_VERSION=	3.4.0
+NETHACK_BASEVER=	3.4.0
+NETHACK_VERSION=	${NETHACK_BASEVER}nb1
 NETHACK_DISTVER=	340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}
@@ -12,7 +13,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		pooka@netbsd.org
 HOMEPAGE=		http://www.nethack.org/
 
-WRKSRC=			${WRKDIR}/nethack-${NETHACK_VERSION}
+WRKSRC=			${WRKDIR}/nethack-${NETHACK_BASEVER}
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
diff --git a/games/nethack-lib/PLIST b/games/nethack-lib/PLIST
index d1c926c53ce..12429b55329 100644
--- a/games/nethack-lib/PLIST
+++ b/games/nethack-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/22 17:26:24 pooka Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/25 20:32:25 pooka Exp $
 bin/nethack
 bin/recover
 man/man6/nethack.6
@@ -6,134 +6,134 @@ man/man6/lev_comp.6
 man/man6/dgn_comp.6
 man/man6/recover.6
 man/man6/dlb.6
-share/nethackdir/rip.xpm
-share/nethackdir/pet_mark.xbm
-share/nethackdir/license
-share/nethackdir/quest.dat
-share/nethackdir/options
-share/nethackdir/oracles
-share/nethackdir/data
-share/nethackdir/water.lev
-share/nethackdir/fire.lev
-share/nethackdir/earth.lev
-share/nethackdir/air.lev
-share/nethackdir/astral.lev
-share/nethackdir/wizard3.lev
-share/nethackdir/wizard2.lev
-share/nethackdir/dungeon
-share/nethackdir/wizard1.lev
-share/nethackdir/valley.lev
-share/nethackdir/tower3.lev
-share/nethackdir/tower2.lev
-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
-share/nethackdir/minend-2.lev
-share/nethackdir/minend-1.lev
-share/nethackdir/medusa-2.lev
-share/nethackdir/medusa-1.lev
-share/nethackdir/knox.lev
-share/nethackdir/juiblex.lev
-share/nethackdir/fakewiz2.lev
-share/nethackdir/fakewiz1.lev
-share/nethackdir/castle.lev
-share/nethackdir/bigrm-5.lev
-share/nethackdir/bigrm-4.lev
-share/nethackdir/bigrm-3.lev
-share/nethackdir/wizhelp
-share/nethackdir/bigrm-2.lev
-share/nethackdir/bigrm-1.lev
-share/nethackdir/baalz.lev
-share/nethackdir/asmodeus.lev
-share/nethackdir/Arc-fila.lev
-share/nethackdir/Arc-filb.lev
-share/nethackdir/Arc-goal.lev
-share/nethackdir/Arc-loca.lev
-share/nethackdir/Arc-strt.lev
-share/nethackdir/Bar-fila.lev
-share/nethackdir/Bar-filb.lev
-share/nethackdir/Bar-goal.lev
-share/nethackdir/Bar-loca.lev
-share/nethackdir/Bar-strt.lev
-share/nethackdir/Cav-fila.lev
-share/nethackdir/Cav-filb.lev
-share/nethackdir/Cav-goal.lev
-share/nethackdir/Cav-loca.lev
-share/nethackdir/Cav-strt.lev
-share/nethackdir/Hea-fila.lev
-share/nethackdir/Hea-filb.lev
-share/nethackdir/Hea-goal.lev
-share/nethackdir/Hea-loca.lev
-share/nethackdir/Hea-strt.lev
-share/nethackdir/Kni-fila.lev
-share/nethackdir/Kni-filb.lev
-share/nethackdir/Kni-goal.lev
-share/nethackdir/Kni-loca.lev
-share/nethackdir/Kni-strt.lev
-share/nethackdir/Mon-fila.lev
-share/nethackdir/Mon-filb.lev
-share/nethackdir/Mon-goal.lev
-share/nethackdir/Mon-loca.lev
-share/nethackdir/Mon-strt.lev
-share/nethackdir/Pri-fila.lev
-share/nethackdir/Pri-filb.lev
-share/nethackdir/Pri-goal.lev
-share/nethackdir/Pri-loca.lev
-share/nethackdir/Pri-strt.lev
-share/nethackdir/Ran-fila.lev
-share/nethackdir/Ran-filb.lev
-share/nethackdir/Ran-goal.lev
-share/nethackdir/Ran-loca.lev
-share/nethackdir/Ran-strt.lev
-share/nethackdir/Rog-fila.lev
-share/nethackdir/Rog-filb.lev
-share/nethackdir/Rog-goal.lev
-share/nethackdir/Rog-loca.lev
-share/nethackdir/Rog-strt.lev
-share/nethackdir/Sam-fila.lev
-share/nethackdir/Sam-filb.lev
-share/nethackdir/Sam-goal.lev
-share/nethackdir/Sam-loca.lev
-share/nethackdir/Sam-strt.lev
-share/nethackdir/Tou-fila.lev
-share/nethackdir/Tou-filb.lev
-share/nethackdir/Tou-goal.lev
-share/nethackdir/Tou-loca.lev
-share/nethackdir/Tou-strt.lev
-share/nethackdir/Val-fila.lev
-share/nethackdir/Val-filb.lev
-share/nethackdir/Val-goal.lev
-share/nethackdir/Val-loca.lev
-share/nethackdir/Val-strt.lev
-share/nethackdir/Wiz-fila.lev
-share/nethackdir/Wiz-filb.lev
-share/nethackdir/Wiz-goal.lev
-share/nethackdir/Wiz-loca.lev
-share/nethackdir/Wiz-strt.lev
-share/nethackdir/soko1-1.lev
-share/nethackdir/soko1-2.lev
-share/nethackdir/soko2-1.lev
-share/nethackdir/soko2-2.lev
-share/nethackdir/soko3-1.lev
-share/nethackdir/soko3-2.lev
-share/nethackdir/soko4-1.lev
-share/nethackdir/soko4-2.lev
-share/nethackdir/opthelp
-share/nethackdir/history
-share/nethackdir/cmdhelp
-share/nethackdir/hh
-share/nethackdir/help
-share/nethackdir/rumors
-share/nethackdir/perm
+share/nethackdir340/rip.xpm
+share/nethackdir340/pet_mark.xbm
+share/nethackdir340/license
+share/nethackdir340/quest.dat
+share/nethackdir340/options
+share/nethackdir340/oracles
+share/nethackdir340/data
+share/nethackdir340/water.lev
+share/nethackdir340/fire.lev
+share/nethackdir340/earth.lev
+share/nethackdir340/air.lev
+share/nethackdir340/astral.lev
+share/nethackdir340/wizard3.lev
+share/nethackdir340/wizard2.lev
+share/nethackdir340/dungeon
+share/nethackdir340/wizard1.lev
+share/nethackdir340/valley.lev
+share/nethackdir340/tower3.lev
+share/nethackdir340/tower2.lev
+share/nethackdir340/tower1.lev
+share/nethackdir340/sanctum.lev
+share/nethackdir340/orcus.lev
+share/nethackdir340/oracle.lev
+share/nethackdir340/minetn-7.lev
+share/nethackdir340/minetn-6.lev
+share/nethackdir340/minetn-5.lev
+share/nethackdir340/minetn-4.lev
+share/nethackdir340/minetn-3.lev
+share/nethackdir340/minend-3.lev
+share/nethackdir340/minetn-2.lev
+share/nethackdir340/minetn-1.lev
+share/nethackdir340/minefill.lev
+share/nethackdir340/minend-2.lev
+share/nethackdir340/minend-1.lev
+share/nethackdir340/medusa-2.lev
+share/nethackdir340/medusa-1.lev
+share/nethackdir340/knox.lev
+share/nethackdir340/juiblex.lev
+share/nethackdir340/fakewiz2.lev
+share/nethackdir340/fakewiz1.lev
+share/nethackdir340/castle.lev
+share/nethackdir340/bigrm-5.lev
+share/nethackdir340/bigrm-4.lev
+share/nethackdir340/bigrm-3.lev
+share/nethackdir340/wizhelp
+share/nethackdir340/bigrm-2.lev
+share/nethackdir340/bigrm-1.lev
+share/nethackdir340/baalz.lev
+share/nethackdir340/asmodeus.lev
+share/nethackdir340/Arc-fila.lev
+share/nethackdir340/Arc-filb.lev
+share/nethackdir340/Arc-goal.lev
+share/nethackdir340/Arc-loca.lev
+share/nethackdir340/Arc-strt.lev
+share/nethackdir340/Bar-fila.lev
+share/nethackdir340/Bar-filb.lev
+share/nethackdir340/Bar-goal.lev
+share/nethackdir340/Bar-loca.lev
+share/nethackdir340/Bar-strt.lev
+share/nethackdir340/Cav-fila.lev
+share/nethackdir340/Cav-filb.lev
+share/nethackdir340/Cav-goal.lev
+share/nethackdir340/Cav-loca.lev
+share/nethackdir340/Cav-strt.lev
+share/nethackdir340/Hea-fila.lev
+share/nethackdir340/Hea-filb.lev
+share/nethackdir340/Hea-goal.lev
+share/nethackdir340/Hea-loca.lev
+share/nethackdir340/Hea-strt.lev
+share/nethackdir340/Kni-fila.lev
+share/nethackdir340/Kni-filb.lev
+share/nethackdir340/Kni-goal.lev
+share/nethackdir340/Kni-loca.lev
+share/nethackdir340/Kni-strt.lev
+share/nethackdir340/Mon-fila.lev
+share/nethackdir340/Mon-filb.lev
+share/nethackdir340/Mon-goal.lev
+share/nethackdir340/Mon-loca.lev
+share/nethackdir340/Mon-strt.lev
+share/nethackdir340/Pri-fila.lev
+share/nethackdir340/Pri-filb.lev
+share/nethackdir340/Pri-goal.lev
+share/nethackdir340/Pri-loca.lev
+share/nethackdir340/Pri-strt.lev
+share/nethackdir340/Ran-fila.lev
+share/nethackdir340/Ran-filb.lev
+share/nethackdir340/Ran-goal.lev
+share/nethackdir340/Ran-loca.lev
+share/nethackdir340/Ran-strt.lev
+share/nethackdir340/Rog-fila.lev
+share/nethackdir340/Rog-filb.lev
+share/nethackdir340/Rog-goal.lev
+share/nethackdir340/Rog-loca.lev
+share/nethackdir340/Rog-strt.lev
+share/nethackdir340/Sam-fila.lev
+share/nethackdir340/Sam-filb.lev
+share/nethackdir340/Sam-goal.lev
+share/nethackdir340/Sam-loca.lev
+share/nethackdir340/Sam-strt.lev
+share/nethackdir340/Tou-fila.lev
+share/nethackdir340/Tou-filb.lev
+share/nethackdir340/Tou-goal.lev
+share/nethackdir340/Tou-loca.lev
+share/nethackdir340/Tou-strt.lev
+share/nethackdir340/Val-fila.lev
+share/nethackdir340/Val-filb.lev
+share/nethackdir340/Val-goal.lev
+share/nethackdir340/Val-loca.lev
+share/nethackdir340/Val-strt.lev
+share/nethackdir340/Wiz-fila.lev
+share/nethackdir340/Wiz-filb.lev
+share/nethackdir340/Wiz-goal.lev
+share/nethackdir340/Wiz-loca.lev
+share/nethackdir340/Wiz-strt.lev
+share/nethackdir340/soko1-1.lev
+share/nethackdir340/soko1-2.lev
+share/nethackdir340/soko2-1.lev
+share/nethackdir340/soko2-2.lev
+share/nethackdir340/soko3-1.lev
+share/nethackdir340/soko3-2.lev
+share/nethackdir340/soko4-1.lev
+share/nethackdir340/soko4-2.lev
+share/nethackdir340/opthelp
+share/nethackdir340/history
+share/nethackdir340/cmdhelp
+share/nethackdir340/hh
+share/nethackdir340/help
+share/nethackdir340/rumors
+share/nethackdir340/perm
 share/doc/nethack/Guidebook
 @dirrm share/doc/nethack
diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo
index 322275dd034..28da6647809 100644
--- a/games/nethack-lib/distinfo
+++ b/games/nethack-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2002/03/22 17:26:24 pooka Exp $
+$NetBSD: distinfo,v 1.4 2002/03/25 20:32:25 pooka Exp $
 
 SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523
 Size (nethack-340.tgz) = 3270905 bytes
-SHA1 (patch-aa) = 12de71bdeddaae9f863b894e797d1b3e5995046b
-SHA1 (patch-ab) = f6ef749e8082f22fe97efdcf40a0475182b8299f
+SHA1 (patch-aa) = d603889257c10a2affa4996c32d50e9ff7e36368
+SHA1 (patch-ab) = 3c4fd5e4d9e1bdf685cfafaba74ee158f6d52072
 SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
-SHA1 (patch-ad) = bddad346674c4242b8ec1f4689d05db58fa175bf
+SHA1 (patch-ad) = c5e86cda66b36bfdd3d6460ec5b3c65706692dba
 SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
 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 e719bbf32c8..d0bf232a55b 100644
--- a/games/nethack-lib/patches/patch-aa
+++ b/games/nethack-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/03/22 17:26:25 pooka Exp $
+$NetBSD: patch-aa,v 1.7 2002/03/25 20:32:26 pooka Exp $
 
 --- include/config.h.old	Thu Mar 21 01:42:43 2002
 +++ include/config.h	Fri Mar 22 15:00:37 2002
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/22 17:26:25 pooka Exp $
  #    define HACKDIR "nethackdir"	/* nethack directory */
  #  else
 -#    define HACKDIR "/usr/games/lib/nethackdir"
-+#    define HACKDIR "XXXPREFIXXXX/share/nethackdir"
++#    define HACKDIR "XXXPREFIXXXX/share/nethackdir340"
  #  endif
  # endif
  
diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab
index b0e3eee9652..2feb22539a8 100644
--- a/games/nethack-lib/patches/patch-ab
+++ b/games/nethack-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2002/03/22 17:26:25 pooka Exp $
+$NetBSD: patch-ab,v 1.8 2002/03/25 20:32:26 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
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.7 2002/03/22 17:26:25 pooka Exp $
  # (if there is, you'll have to do the installation by hand or modify the
  # instructions)
 -GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
-+GAMEDIR  = $(PREFIX)/share/$(GAME)dir
++GAMEDIR  = $(PREFIX)/share/$(GAME)dir340
  VARDIR  = $(GAMEDIR)
 -SHELLDIR = $(PREFIX)/games
 +SHELLDIR = $(PREFIX)/bin
diff --git a/games/nethack-lib/patches/patch-ad b/games/nethack-lib/patches/patch-ad
index d9f68bf59f4..4a8c5553903 100644
--- a/games/nethack-lib/patches/patch-ad
+++ b/games/nethack-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/03/22 17:26:25 pooka Exp $
+$NetBSD: patch-ad,v 1.4 2002/03/25 20:32:26 pooka Exp $
 
 --- sys/unix/nethack.sh.orig	Thu Mar 21 01:43:54 2002
 +++ sys/unix/nethack.sh	Fri Mar 22 17:39:00 2002
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.3 2002/03/22 17:26:25 pooka Exp $
 +	TTY=$1
 +fi
 +
-+HACKDIR=XXXPREFIXXXX/share/nethackdir
++HACKDIR=XXXPREFIXXXX/share/nethackdir340
  export HACKDIR
 -HACK=$HACKDIR/nethack
 +HACK=XXXPREFIXXXX/bin/nethack-$TTY