Update the Nethack package to 3.3.0. nethack-qt will be non-functional

until we get qt2.0 or greater into pkgsrc.

7 files changed, 254 insertions, 69 deletions

diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa
index 89e8b1030ef..28d3c770759 100644
--- a/games/nethack-lib/patches/patch-aa
+++ b/games/nethack-lib/patches/patch-aa
@@ -1,31 +1,47 @@
-$NetBSD: patch-aa,v 1.1 1998/08/27 12:58:51 garbled Exp $
---- include/config.h.orig	Sat Aug  8 06:06:46 1998
-+++ include/config.h	Sat Aug  8 06:08:27 1998
-@@ -298,8 +298,8 @@
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
-+/* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:00 pooka Exp $
+
+--- include/config.h.orig	Sat Dec 11 07:20:49 1999
++++ include/config.h	Fri Dec 17 13:51:24 1999
+@@ -133,11 +133,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 */
  /* 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_EXTENSION ".gz"	     /* normal gzip extension */
+-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
++#define COMPRESS "/usr/local/bin/gzip"   	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
  #endif
-@@ -333,3 +333,3 @@
+ 
+ #ifndef COMPRESS
+@@ -168,7 +168,7 @@
+  * otherwise it will be the current directory.
+  */
  # ifndef HACKDIR
 -#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "XXXLOCALBASEXXX/share/nethackdir"	/* nethack directory */
++#  define HACKDIR "XXXPREFIXXXX/share/nethackdir"	/* nethack directory */
  # endif
-@@ -429,3 +429,3 @@
  
--/*#define VISION_TABLES	/* use vision tables generated at compile time */
-+#define VISION_TABLES	/* use vision tables generated at compile time */
+ /*
+@@ -264,7 +264,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 */
  #ifndef VISION_TABLES
-@@ -467,3 +467,3 @@
+ # ifndef NO_MACRO_CPATH
+ #  define MACRO_CPATH	/* use clear_path macros instead of functions */
+@@ -302,7 +302,7 @@
+ #endif
+ 
  #define EXP_ON_BOTL	/* Show experience on bottom line */
--/* #define SCORE_ON_BOTL	/* added by Gary Erickson (erickson@ucivax) */
-+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson@ucivax) */
+-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson@ucivax) */
++#define SCORE_ON_BOTL 	/* added by Gary Erickson (erickson@ucivax) */
+ 
+ #include "global.h"	/* Define everything else according to choices above */
  
diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab
index 09a1317ff79..b93e7376145 100644
--- a/games/nethack-lib/patches/patch-ab
+++ b/games/nethack-lib/patches/patch-ab
@@ -1,14 +1,19 @@
-$NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $
---- sys/unix/Makefile.top.orig	Tue Dec 10 13:20:10 1996
-+++ sys/unix/Makefile.top	Sat Aug  8 06:10:41 1998
-@@ -17,4 +17,4 @@
+$NetBSD: patch-ab,v 1.2 1999/12/24 22:30:00 pooka Exp $
+
+--- sys/unix/Makefile.top.orig	Sat Dec 11 07:21:05 1999
++++ sys/unix/Makefile.top	Wed Dec 22 20:18:19 1999
+@@ -14,17 +14,16 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
  GAME     = nethack
 -GAMEUID  = games
 -GAMEGRP  = bin
-+GAMEUID  = bin
++GAMEUID  = root
 +GAMEGRP  = games
  
-@@ -22,6 +22,6 @@
+ # Permissions - some places use setgid instead of setuid, for instance
  # See also the option "SECURE" in include/config.h
 -GAMEPERM = 04755
 -FILEPERM = 0644
@@ -18,19 +23,28 @@ $NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $
 -DIRPERM  = 0755
 +DIRPERM  = 0775
  
-@@ -34,4 +34,4 @@
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ #
+@@ -33,13 +32,13 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
  # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = $(LOCALBASE)/share/$(GAME)dir
-+SHELLDIR = $(LOCALBASE)/bin
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
+-SHELLDIR = $(PREFIX)/games
++GAMEDIR  = $(PREFIX)/share/$(GAME)dir
++SHELLDIR = $(PREFIX)/bin
  
-@@ -40,3 +40,3 @@
+ # per discussion in Install.X11 and Install.Qt
+ VARDATND = 
  # VARDATND = x11tiles pet_mark.xbm
 -# VARDATND = x11tiles pet_mark.xbm rip.xpm
 +VARDATND = x11tiles pet_mark.xbm rip.xpm
  
-@@ -76,5 +76,8 @@
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
+@@ -76,9 +75,12 @@
+ $(GAME):
+ 	( cd src ; $(MAKE) )
  
 -all:	$(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
 +all:	$(GAME) datastuff
@@ -40,37 +54,58 @@ $NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $
 +	@echo "Data Sets Built"
 +
  Guidebook:
-@@ -128,2 +131,7 @@
+ 	( cd doc ; $(MAKE) Guidebook )
+ 
+@@ -128,7 +130,12 @@
+ 	( 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) )
++		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
 +	chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
- 
-@@ -137,3 +145,2 @@
++ 
+ dofiles:
+ 	target=`sed -n					\
+ 		-e '/librarian/{' 			\
+@@ -137,16 +144,13 @@
+ 		-e '}' 					\
+ 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
 -	cp src/$(GAME) $(GAMEDIR)
  	-rm -f $(SHELLDIR)/$(GAME)
-@@ -141,2 +148,3 @@
+ 	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
-+		-e 's;XXXPREFIXXXX;$(LOCALBASE);' \
++		-e 's;XXXPREFIXXXX;$(PREFIX);' \
  		< sys/unix/nethack.sh \
-@@ -144,5 +152,2 @@
+ 		> $(SHELLDIR)/$(GAME)
  # set up their permissions
 -	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
 -			$(CHGRP) $(GAMEGRP) $(GAME) )
 -	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
  	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
-@@ -182,3 +187,3 @@
+ 	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
+ 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
+@@ -182,7 +186,7 @@
+ # 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
  # set up the directories
-@@ -197,2 +202,6 @@
+ 	-mkdir $(SHELLDIR)
+ 	-rm -rf $(GAMEDIR)
+@@ -197,6 +201,11 @@
+ 	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
+ 			$(CHGRP) $(GAMEGRP) perm record logfile ; \
  			chmod $(FILEPERM) perm record logfile )
-+	-mkdir -p $(LOCALBASE)/share/doc/nethack
-+	cp doc/Guidebook $(LOCALBASE)/share/doc/nethack
-+	chown $(GAMEUID):$(GAMEGRP) $(LOCALBASE)/share/doc/nethack/Guidebook
-+	chmod $(FILEPERM) $(LOCALBASE)/share/doc/nethack/Guidebook
++	-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
++
  # and a reminder
+ 	@echo You may also want to reinstall the man pages via the doc Makefile.
+ 
diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac
index 9ad08fde339..cff66dccea1 100644
--- a/games/nethack-lib/patches/patch-ac
+++ b/games/nethack-lib/patches/patch-ac
@@ -1,26 +1,49 @@
-$NetBSD: patch-ac,v 1.1 1998/08/27 12:58:51 garbled Exp $
---- include/system.h.rorig	Sun Aug  9 05:31:34 1998
-+++ include/system.h	Sun Aug  9 05:31:40 1998
-@@ -82,3 +82,3 @@
+$NetBSD: patch-ac,v 1.2 1999/12/24 22:30:00 pooka Exp $
+
+--- include/system.h.orig	Sat Dec 11 07:20:51 1999
++++ include/system.h	Thu Dec 23 22:12:04 1999
+@@ -77,10 +77,10 @@
+ # if !defined(__SC__) && !defined(LINUX)
+ E  long NDECL(random);
+ # endif
+-# if !defined(SUNOS4) || defined(RANDOM)
++# if (!defined(SUNOS4) && !defined(__NetBSD__)) || defined(RANDOM)
+ E void FDECL(srandom, (unsigned int));
  # else
 -#  ifndef bsdi
 +#  if !defined(bsdi) && !defined(__NetBSD__)
  E int FDECL(srandom, (unsigned int));
-@@ -132,3 +132,3 @@
+ #  endif
+ # endif
+@@ -130,7 +130,7 @@
+ E void FDECL(qsort, (genericptr_t,size_t,size_t,
+ 		     int(*)(const genericptr,const genericptr)));
  #else
 -# if defined(BSD) || defined(ULTRIX)
 +# if (defined(BSD) || defined(ULTRIX)) && !defined(__NetBSD__)
  E  int qsort();
-@@ -398,3 +398,3 @@
+ # else
+ #  if !defined(LATTICE) && !defined(AZTEC_50)
+@@ -413,7 +413,7 @@
+ # ifdef HPUX
+ E unsigned int	FDECL(strlen, (char *));
  #  else
 -#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
 +#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__)
  E int	FDECL(strlen, (const char *));
-@@ -509,2 +509,3 @@
+ #   endif
+ #  endif /* HPUX */
+@@ -513,11 +513,13 @@
+ #  endif
+ # endif
  
 +#ifndef __NetBSD__
- # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC)
-@@ -514,2 +515,3 @@
+ # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
+ 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-ad b/games/nethack-lib/patches/patch-ad
index 52bf7356e7f..bb524d75ca7 100644
--- a/games/nethack-lib/patches/patch-ad
+++ b/games/nethack-lib/patches/patch-ad
@@ -1,17 +1,22 @@
-$NetBSD: patch-ad,v 1.1 1998/08/27 12:58:52 garbled Exp $
---- sys/unix/nethack.sh.orig	Tue Sep 12 13:01:39 1995
-+++ sys/unix/nethack.sh	Sat Aug  8 03:43:07 1998
-@@ -3,4 +3,11 @@
+$NetBSD: patch-ad,v 1.2 1999/12/24 22:30:00 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
+@@ -1,9 +1,15 @@
+ #!/bin/sh
+ #	SCCS Id: @(#)nethack.sh	3.3	90/02/26
  
 -HACKDIR=/usr/games/lib/nethackdir
--HACK=$HACKDIR/nethack
 +if [ "$1" = "" ]; then
-+  TTY=tty
++   TTY=tty
 +else
-+  TTY=$1
++   TTY=$1
 +fi
 +
 +HACKDIR=XXXPREFIXXXX/share/nethackdir
-+export HACKDIR
+ export HACKDIR
+-HACK=$HACKDIR/nethack
 +HACK=XXXPREFIXXXX/bin/nethack-$TTY
  MAXNROFPLAYERS=4
+ 
+ # see if we can find the full path name of PAGER, so help files work properly
diff --git a/games/nethack-lib/patches/patch-ae b/games/nethack-lib/patches/patch-ae
index 41d95575af8..0dee1364566 100644
--- a/games/nethack-lib/patches/patch-ae
+++ b/games/nethack-lib/patches/patch-ae
@@ -1,8 +1,13 @@
-$NetBSD: patch-ae,v 1.1 1998/08/27 12:58:52 garbled Exp $
---- sys/unix/Makefile.doc.orig	Sat Aug  8 00:35:44 1998
-+++ sys/unix/Makefile.doc	Sat Aug  8 00:36:41 1998
-@@ -33,3 +33,3 @@
+$NetBSD: patch-ae,v 1.2 1999/12/24 22:30:01 pooka Exp $
+
+--- sys/unix/Makefile.doc.orig	Sat Dec 11 07:21:05 1999
++++ sys/unix/Makefile.doc	Fri Dec 17 14:23:28 1999
+@@ -31,7 +31,7 @@
+ 
+ 
  GAME	= nethack
 -MANDIR	= /usr/man/man6
-+MANDIR	= $(LOCALBASE)/man/man6
++MANDIR	= $(PREFIX)/man/man6
  MANEXT	= 6
+ 
+ # manual installation for most BSD-style systems
diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af
new file mode 100644
index 00000000000..6503c9850a8
--- /dev/null
+++ b/games/nethack-lib/patches/patch-af
@@ -0,0 +1,80 @@
+$NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $
+
+--- include/unixconf.h.orig	Sat Dec 11 07:20:51 1999
++++ include/unixconf.h	Thu Dec 23 22:14:04 1999
+@@ -19,20 +19,20 @@
+  */
+ 
+ /* define exactly one of the following four choices */
+-/* #define BSD 1 */	/* define for 4.n BSD  */
++#define BSD 1	/* define for 4.n BSD  */
+ 			/* also for relatives like SunOS 4.x, DG/UX, and */
+ 			/* older versions of Linux */
+ /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
+ 			/* Use BSD for < v3.0 */
+ 			/* "ULTRIX" not to be confused with "ultrix" */
+-#define SYSV		/* define for System V, Solaris 2.x, newer versions */
++/* #define SYSV	*/	/* define for System V, Solaris 2.x, newer versions */
+ 			/* of Linux */
+ /* #define HPUX */	/* Hewlett-Packard's Unix, version 6.5 or higher */
+ 			/* use SYSV for < v6.5 */
+ 
+ 
+ /* define any of the following that are appropriate */
+-#define SVR4		/* use in addition to SYSV for System V Release 4 */
++/* #define SVR4	*/	/* use in addition to SYSV for System V Release 4 */
+ 			/* including Solaris 2+ */
+ #define NETWORK		/* if running on a networked system */
+ 			/* e.g. Suns sharing a playground through NFS */
+@@ -45,7 +45,7 @@
+ /* #define AIX_31 */	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+ 			 * job control (note that AIX is SYSV otherwise)
+ 			 * Also define this for AIX 3.2 */
+-#define TERMINFO	/* uses terminfo rather than termcap */
++/* #define TERMINFO */	/* uses terminfo rather than termcap */
+ 			/* Should be defined for most SYSV, SVR4 (including
+ 			 * Solaris 2+), HPUX, and Linux systems.  In
+ 			 * particular, it should NOT be defined for the UNIXPC
+@@ -160,11 +160,15 @@
+ 
+ #ifdef	MAIL
+ # if defined(BSD) || defined(ULTRIX)
++# ifdef __NetBSD__
++#define DEF_MAILREADER "/usr/bin/mail"
++# else
+ #  ifdef AMS
+ #define AMS_MAILBOX	"/Mailbox"
+ #  else
+ #define DEF_MAILREADER	"/usr/ucb/Mail"
+-#  endif
++# endif
++# endif
+ #else
+ # if defined(SYSV) || defined(DGUX) || defined(HPUX)
+ #  ifdef M_XENIX
+@@ -185,7 +189,6 @@
+ #endif	/* MAIL */
+ 
+ 
+-
+ #ifdef COMPRESS
+ /* Some implementations of compress need a 'quiet' option.
+  * If you've got one of these versions, put -q here.
+@@ -211,7 +214,7 @@
+ # endif
+ #endif /* _AUX_SOURCE */
+ 
+-#if defined(LINUX) || defined(bsdi)
++#if defined(LINUX) || defined(bsdi) || defined(__NetBSD__)
+ # ifndef POSIX_TYPES
+ #  define POSIX_TYPES
+ # endif
+@@ -272,7 +275,7 @@
+ #endif
+ 
+ #if defined(BSD) || defined(ULTRIX)
+-# if !defined(DGUX) && !defined(SUNOS4)
++# if !defined(DGUX) && !defined(SUNOS4) && !defined(__NetBSD__)
+ #define memcpy(d, s, n)		bcopy(s, d, n)
+ #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
+ # endif
diff --git a/games/nethack-lib/patches/patch-ag b/games/nethack-lib/patches/patch-ag
new file mode 100644
index 00000000000..3f43f068738
--- /dev/null
+++ b/games/nethack-lib/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 1999/12/24 22:30:01 pooka Exp $
+
+--- src/mail.c.orig	Sat Dec 11 07:20:54 1999
++++ src/mail.c	Thu Dec 23 22:27:40 1999
+@@ -71,12 +71,16 @@
+ #  ifdef LINUX
+ #   define MAILPATH "/var/spool/mail"
+ #  else
++#   ifdef __NetBSD__
++#    define MAILPATH "/var/mail/"
++#   else
+ #   if defined(BSD) || defined(ULTRIX)
+ #    define MAILPATH "/usr/spool/mail/"
+ #   endif
+ #   if defined(SYSV) || defined(HPUX)
+ #    define MAILPATH "/usr/mail/"
+ #   endif
++#  endif
+ #  endif /* LINUX */
+ # endif /* AMS */
+