8 files changed, 216 insertions, 195 deletions

diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index fa40cd4ff0ea..c2a14b5bfa1d 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	nethack
-# Date created:		27 March 1995
-# Whom:			asami
+# Date created:		23 September 2000
+# Whom:			Jeremy Chadwick <yoshi@parodius.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nethack
-PORTVERSION=	3.3.0
+PORTVERSION=	3.3.1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh331/src/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTFILES=	${PORTNAME}-331.${EXTRACT_SUFIX}
 
-MAINTAINER=	dscheidt@enteract.com
+MAINTAINER=	yoshi@parodius.com
 
-USE_XPM=	yes
+EXTRACT_SUFIX=	tgz
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack34-nox11/distinfo b/games/nethack34-nox11/distinfo
index 2c29c21e8ed8..24595f9d9a12 100644
--- a/games/nethack34-nox11/distinfo
+++ b/games/nethack34-nox11/distinfo
@@ -1 +1 @@
-MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a
+MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack34-nox11/files/patch-aa b/games/nethack34-nox11/files/patch-aa
index 2e301760581e..f57ae58fdb6a 100644
--- a/games/nethack34-nox11/files/patch-aa
+++ b/games/nethack34-nox11/files/patch-aa
@@ -1,45 +1,44 @@
---- ./include/config.h.orig	Sat Dec 11 00:20:49 1999
-+++ ./include/config.h	Sun Dec 12 20:28:09 1999
-@@ -43,7 +43,7 @@
-  * Some combinations make no sense.  See the installation document.
-  */
- #define TTY_GRAPHICS	/* good old tty based graphics */
--/* #define X11_GRAPHICS */ /* X11 interface */
-+#define X11_GRAPHICS  /* X11 interface */
- /* #define QT_GRAPHICS */	/* Qt interface */
- 
- /*
-@@ -92,7 +92,7 @@
-  * would allow:
-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
-  */
--/* # define USE_XPM */		/* Disable if you do not have the XPM library */
-+# define USE_XPM 		/* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -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 */
- #endif
- 
- #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 "/usr/local/share/nethack"	/* nethack directory */
- # endif
- 
- /*
+*** include/config.h.orig	Fri Jul 21 18:13:51 2000
+--- include/config.h	Sat Sep 23 01:03:48 2000
+***************
+*** 151,161 ****
+  
+  #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 */
+  /* 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 */
+  #endif
+  
+  #ifndef COMPRESS
+--- 151,161 ----
+  
+  #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 */
+  /* An example of one alternative you might want to use: */
+! #define COMPRESS "/usr/bin/gzip"	/* FSF gzip compression */
+! #define COMPRESS_EXTENSION ".gz"	/* normal gzip extension */
+  #endif
+  
+  #ifndef COMPRESS
+***************
+*** 186,192 ****
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
+  # endif
+  
+  /*
+--- 186,192 ----
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/local/share/nethack"	/* nethack directory */
+  # endif
+  
+  /*
diff --git a/games/nethack34-nox11/files/patch-ab b/games/nethack34-nox11/files/patch-ab
index 3fdb7858ad1a..fa0a14fb6988 100644
--- a/games/nethack34-nox11/files/patch-ab
+++ b/games/nethack34-nox11/files/patch-ab
@@ -1,20 +1,19 @@
---- ./include/system.h.orig	Sat Dec 11 00:20:51 1999
-+++ ./include/system.h	Sun Dec 12 20:44:40 1999
-@@ -80,7 +80,7 @@
- # if !defined(SUNOS4) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
--#  ifndef bsdi
-+#  if !defined(bsdi) && !defined(__FreeBSD__)
- E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
-@@ -516,7 +516,7 @@
- # 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 *));
-+E time_t FDECL(time, (time_t *));
- # endif /* ULTRIX */
- 
- #ifdef VMS
+*** include/system.h.orig	Thu Jan  6 11:20:08 2000
+--- include/system.h	Sat Sep 23 01:08:09 2000
+***************
+*** 516,522 ****
+  # 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 */
+  
+  #ifdef VMS
+--- 516,522 ----
+  # 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 time_t FDECL(time, (time_t *));
+  # endif /* ULTRIX */
+  
+  #ifdef VMS
diff --git a/games/nethack34-nox11/files/patch-ac b/games/nethack34-nox11/files/patch-ac
index d197c0d3a707..8268fa5fd83f 100644
--- a/games/nethack34-nox11/files/patch-ac
+++ b/games/nethack34-nox11/files/patch-ac
@@ -1,20 +1,36 @@
---- include/unixconf.h.orig	Sat Dec 11 14:20:51 1999
-+++ include/unixconf.h	Sat Jul 29 06:58:37 2000
-@@ -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
-@@ -135,7 +135,7 @@
-  * A stat system call is done on the mailbox every MAILCKFREQ moves.
-  */
- 
--#define MAIL			/* Deliver mail during the game */
-+/* #define MAIL			/* Deliver mail during the game */
- 
- /* The Andrew Message System does mail a little differently from normal
-  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
+*** include/unixconf.h.orig	Sun Jul 16 18:03:51 2000
+--- include/unixconf.h	Sat Sep 23 01:09:25 2000
+***************
+*** 47,53 ****
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+  
+! #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
+--- 47,53 ----
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+  
+! /* #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
+***************
+*** 143,149 ****
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! #define MAIL			/* Deliver mail during the game */
+  
+  /* The Andrew Message System does mail a little differently from normal
+   * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
+--- 143,149 ----
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! /* #define MAIL	*/		/* Deliver mail during the game */
+  
+  /* The Andrew Message System does mail a little differently from normal
+   * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
diff --git a/games/nethack34-nox11/files/patch-ad b/games/nethack34-nox11/files/patch-ad
index c8200968f4d7..3eb00f18986c 100644
--- a/games/nethack34-nox11/files/patch-ad
+++ b/games/nethack34-nox11/files/patch-ad
@@ -1,51 +1,61 @@
---- ./sys/unix/Makefile.src.orig	Sat Dec 11 00:21:05 1999
-+++ ./sys/unix/Makefile.src	Sun Dec 12 20:27:50 1999
-@@ -132,8 +132,8 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O -I../include
--LFLAGS = 
-+CFLAGS += -O -I../include -I${X11BASE}/include
-+LFLAGS =  -L${X11BASE}/lib
- 
- # Only used for Qt interface (other interfaces are standard C)
- CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
-@@ -165,8 +165,8 @@
- 
- #
- # 
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC)
-+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
- 
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -186,7 +186,7 @@
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
- # WINX11LIB = -lXaw -lXmu -lXt -lX11
- # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
-@@ -199,7 +199,7 @@
- #
- #
- 
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB)
- 
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)
-@@ -223,7 +223,7 @@
- # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
- # LIBS = -lsun
- #
--LIBS =
-+LIBS = -lSM -lICE
- 
- # make NetHack
- GAME     = nethack
+*** sys/unix/Makefile.top.orig	Mon Jul  3 17:42:05 2000
+--- sys/unix/Makefile.top	Sat Sep 23 01:14:48 2000
+***************
+*** 14,31 ****
+  # MAKE = make
+  
+  # make NetHack
+- PREFIX	 = /usr
+  GAME     = nethack
+  # GAME     = nethack.prg
+  GAMEUID  = games
+! GAMEGRP  = bin
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 04755
+! FILEPERM = 0644
+  EXEPERM  = 0755
+! DIRPERM  = 0755
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+--- 14,30 ----
+  # MAKE = make
+  
+  # make NetHack
+  GAME     = nethack
+  # GAME     = nethack.prg
+  GAMEUID  = games
+! GAMEGRP  = games
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 02755
+! FILEPERM = 0664
+  EXEPERM  = 0755
+! DIRPERM  = 0775
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+***************
+*** 35,43 ****
+  # 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  = $(PREFIX)/games/lib/$(GAME)dir
+  VARDIR  = $(GAMEDIR)
+! SHELLDIR = $(PREFIX)/games
+  
+  # per discussion in Install.X11 and Install.Qt
+  VARDATND = 
+--- 34,42 ----
+  # 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  = $(PREFIX)/share/$(GAME)
+  VARDIR  = $(GAMEDIR)
+! SHELLDIR = $(PREFIX)/bin
+  
+  # per discussion in Install.X11 and Install.Qt
+  VARDATND = 
diff --git a/games/nethack34-nox11/files/patch-ae b/games/nethack34-nox11/files/patch-ae
index 375a28af2ec0..89653b31a76f 100644
--- a/games/nethack34-nox11/files/patch-ae
+++ b/games/nethack34-nox11/files/patch-ae
@@ -1,47 +1,44 @@
---- ./sys/unix/Makefile.top.orig	Sat Dec 11 05:21:05 1999
-+++ ./sys/unix/Makefile.top	Mon Dec 13 11:51:27 1999
-@@ -14,17 +14,16 @@
- # MAKE = make
- 
- # make NetHack
--PREFIX	 = /usr
- GAME     = nethack
- GAMEUID  = games
--GAMEGRP  = bin
-+GAMEGRP  = games
- 
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- #
-@@ -33,8 +32,8 @@
- # 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  = $(PREFIX)/games/lib/$(GAME)dir
--SHELLDIR = $(PREFIX)/games
-+GAMEDIR  = $(PREFIX)/share/$(GAME)
-+SHELLDIR = $(PREFIX)/bin
- 
- # per discussion in Install.X11 and Install.Qt
- VARDATND = 
-@@ -184,9 +183,9 @@
- 
- install: $(GAME) $(VARDAT) dungeon spec_levs
- # set up the directories
--	-mkdir $(SHELLDIR)
-+	-mkdir -p $(SHELLDIR)
- 	-rm -rf $(GAMEDIR)
--	-mkdir $(GAMEDIR) $(GAMEDIR)/save
-+	-mkdir -p $(GAMEDIR) $(GAMEDIR)/save
- 	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(GAMEDIR)/save
- 	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(GAMEDIR)/save
- 	chmod $(DIRPERM) $(GAMEDIR) $(GAMEDIR)/save
+*** sys/unix/Makefile.doc.orig	Fri Jan 14 12:49:48 2000
+--- sys/unix/Makefile.doc	Sat Sep 23 01:16:22 2000
+***************
+*** 34,40 ****
+  
+  
+  GAME	= nethack
+! MANDIR	= /usr/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
+--- 34,40 ----
+  
+  
+  GAME	= nethack
+! MANDIR	= ${PREFIX}/man/man
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
+***************
+*** 51,61 ****
+  # DLBMANCREATE = nroff -man dlb.6 >
+  
+  manpages:
+! 	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+! 	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+! 	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+! 	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
+! 	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
+  
+  # manual creation for distribution
+  DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
+--- 51,61 ----
+  # DLBMANCREATE = nroff -man dlb.6 >
+  
+  manpages:
+! 	-$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
+! 	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
+! 	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
+! 	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
+! 	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+  
+  # manual creation for distribution
+  DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/games/nethack34-nox11/pkg-descr b/games/nethack34-nox11/pkg-descr
index fca84fb2593d..4a45d7df171a 100644
--- a/games/nethack34-nox11/pkg-descr
+++ b/games/nethack34-nox11/pkg-descr
@@ -1,8 +1,7 @@
-This is version 3.3.0 of nethack, a clasic hack'n'slash adventure game.
-You and your faithful feline (or commited canine) are on a quest to retrieve 
-the lost Amulet of Yendor.  Good luck!
+This is version 3.3.1 of nethack, a clasic ASCII-based adventure game.
+You and your faithful pet are on a quest to retrieve the lost Amulet
+of Yendor.
 
 WWW: http://www.nethack.org/
 
-- David
-dscheidt@enteract.com
+yoshi@parodius.com