Update to nethack 3.4.0 after repocopying from nethack33{,-*}.

Unify the variant ports and make them slave ports of the master port,
nethack34.

Unbreak nethack34-gnome.

PR:		ports/36576, ports/36880
Submitted by:	KATO Tsuguru <tkato@prontomail.com>,
		Jan Stocker <Jan.Stocker@t-online.de> (MAINTAINER of -gnome)

10 files changed, 3 insertions, 369 deletions

diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 3d09d946452c..65974a011a4f 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -5,29 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nethack
-PKGNAMESUFFIX=	-tty
-PORTVERSION=	3.3.1
-CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh331/src/
-MASTER_SITE_SUBDIR=	nethack
-DISTFILES=	${PORTNAME}-331.${EXTRACT_SUFIX}
+MASTERDIR=	${.CURDIR}/../nethack34
 
 MAINTAINER=	yoshi@parodius.com
 
-EXTRACT_SUFIX=	tgz
-USE_GMAKE=	yes
-MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
+WITH_TTY_GRAPHICS=	yes
 
-pre-configure:
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-
-post-install:
-	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/nethack
-	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/games/nethack34-nox11/distinfo b/games/nethack34-nox11/distinfo
deleted file mode 100644
index 24595f9d9a12..000000000000
--- a/games/nethack34-nox11/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack34-nox11/files/patch-aa b/games/nethack34-nox11/files/patch-aa
deleted file mode 100644
index f57ae58fdb6a..000000000000
--- a/games/nethack34-nox11/files/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-*** 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
deleted file mode 100644
index fa0a14fb6988..000000000000
--- a/games/nethack34-nox11/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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
deleted file mode 100644
index 8268fa5fd83f..000000000000
--- a/games/nethack34-nox11/files/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-*** 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
deleted file mode 100644
index 3eb00f18986c..000000000000
--- a/games/nethack34-nox11/files/patch-ad
+++ /dev/null
@@ -1,61 +0,0 @@
-*** 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
deleted file mode 100644
index 89653b31a76f..000000000000
--- a/games/nethack34-nox11/files/patch-ae
+++ /dev/null
@@ -1,44 +0,0 @@
-*** 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-comment b/games/nethack34-nox11/pkg-comment
deleted file mode 100644
index 70ca7a893988..000000000000
--- a/games/nethack34-nox11/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game
diff --git a/games/nethack34-nox11/pkg-descr b/games/nethack34-nox11/pkg-descr
deleted file mode 100644
index 4a45d7df171a..000000000000
--- a/games/nethack34-nox11/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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/
-
-yoshi@parodius.com
diff --git a/games/nethack34-nox11/pkg-plist b/games/nethack34-nox11/pkg-plist
deleted file mode 100644
index f5efba70be15..000000000000
--- a/games/nethack34-nox11/pkg-plist
+++ /dev/null
@@ -1,134 +0,0 @@
-bin/nethack
-share/nethack/nethack
-@exec mkdir %D/share/nethack/save
-@exec chmod -R 775 %D/share/nethack
-@exec chmod 2755 %D/share/nethack/nethack
-@exec chown games:games %D/share/nethack/save
-@unexec rm -rf %D/share/nethack/save
-share/doc/nethack/Guidebook.txt
-share/nethack/Arc-fila.lev
-share/nethack/Arc-filb.lev
-share/nethack/Arc-goal.lev
-share/nethack/Arc-loca.lev
-share/nethack/Arc-strt.lev
-share/nethack/Bar-fila.lev
-share/nethack/Bar-filb.lev
-share/nethack/Bar-goal.lev
-share/nethack/Bar-loca.lev
-share/nethack/Bar-strt.lev
-share/nethack/Cav-fila.lev
-share/nethack/Cav-filb.lev
-share/nethack/Cav-goal.lev
-share/nethack/Cav-loca.lev
-share/nethack/Cav-strt.lev
-share/nethack/Hea-fila.lev
-share/nethack/Hea-filb.lev
-share/nethack/Hea-goal.lev
-share/nethack/Hea-loca.lev
-share/nethack/Hea-strt.lev
-share/nethack/Kni-fila.lev
-share/nethack/Kni-filb.lev
-share/nethack/Kni-goal.lev
-share/nethack/Kni-loca.lev
-share/nethack/Kni-strt.lev
-share/nethack/Mon-fila.lev
-share/nethack/Mon-filb.lev
-share/nethack/Mon-goal.lev
-share/nethack/Mon-loca.lev
-share/nethack/Mon-strt.lev
-share/nethack/Pri-fila.lev
-share/nethack/Pri-filb.lev
-share/nethack/Pri-goal.lev
-share/nethack/Pri-loca.lev
-share/nethack/Pri-strt.lev
-share/nethack/Ran-fila.lev
-share/nethack/Ran-filb.lev
-share/nethack/Ran-goal.lev
-share/nethack/Ran-loca.lev
-share/nethack/Ran-strt.lev
-share/nethack/Rog-fila.lev
-share/nethack/Rog-filb.lev
-share/nethack/Rog-goal.lev
-share/nethack/Rog-loca.lev
-share/nethack/Rog-strt.lev
-share/nethack/Sam-fila.lev
-share/nethack/Sam-filb.lev
-share/nethack/Sam-goal.lev
-share/nethack/Sam-loca.lev
-share/nethack/Sam-strt.lev
-share/nethack/Tou-fila.lev
-share/nethack/Tou-filb.lev
-share/nethack/Tou-goal.lev
-share/nethack/Tou-loca.lev
-share/nethack/Tou-strt.lev
-share/nethack/Val-fila.lev
-share/nethack/Val-filb.lev
-share/nethack/Val-goal.lev
-share/nethack/Val-loca.lev
-share/nethack/Val-strt.lev
-share/nethack/Wiz-fila.lev
-share/nethack/Wiz-filb.lev
-share/nethack/Wiz-goal.lev
-share/nethack/Wiz-loca.lev
-share/nethack/Wiz-strt.lev
-share/nethack/air.lev
-share/nethack/asmodeus.lev
-share/nethack/astral.lev
-share/nethack/baalz.lev
-share/nethack/bigrm-1.lev
-share/nethack/bigrm-2.lev
-share/nethack/bigrm-3.lev
-share/nethack/bigrm-4.lev
-share/nethack/bigrm-5.lev
-share/nethack/castle.lev
-share/nethack/cmdhelp
-share/nethack/data
-share/nethack/dungeon
-share/nethack/earth.lev
-share/nethack/fakewiz1.lev
-share/nethack/fakewiz2.lev
-share/nethack/fire.lev
-share/nethack/help
-share/nethack/hh
-share/nethack/history
-share/nethack/juiblex.lev
-share/nethack/knox.lev
-share/nethack/license
-share/nethack/medusa-1.lev
-share/nethack/medusa-2.lev
-share/nethack/minefill.lev
-share/nethack/minend-1.lev
-share/nethack/minend-2.lev
-share/nethack/minetn-1.lev
-share/nethack/minetn-2.lev
-share/nethack/opthelp
-share/nethack/options
-share/nethack/oracle.lev
-share/nethack/oracles
-share/nethack/orcus.lev
-share/nethack/quest.dat
-share/nethack/rumors
-share/nethack/sanctum.lev
-share/nethack/soko1-1.lev
-share/nethack/soko1-2.lev
-share/nethack/soko2-1.lev
-share/nethack/soko2-2.lev
-share/nethack/soko3-1.lev
-share/nethack/soko3-2.lev
-share/nethack/soko4-1.lev
-share/nethack/soko4-2.lev
-share/nethack/tower1.lev
-share/nethack/tower2.lev
-share/nethack/tower3.lev
-share/nethack/valley.lev
-share/nethack/water.lev
-share/nethack/wizard1.lev
-share/nethack/wizard2.lev
-share/nethack/wizard3.lev
-share/nethack/wizhelp
-@mode 664
-share/nethack/logfile
-share/nethack/record
-share/nethack/perm
-@dirrm share/nethack
-@dirrm share/doc/nethack