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, 400 deletions

diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index e1c1b27dee70..fa0c7e39d7d4 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -5,43 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nethack
-PKGNAMESUFFIX=	-qt
-PORTVERSION=	3.3.1
-CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz
+MASTERDIR=      ${.CURDIR}/../nethack34
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_QT_VER=	2
-USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
-		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
-MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
+WITH_QT_GRAPHICS=	yes
 
-pre-everything::
-	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO} "!! You cannot install nethack and nethack-qt in parallel  !!"
-	@${ECHO} "!! But nethack-qt might read your prior nethack scores    !!"
-	@${ECHO} "!! Don't forget to backup your nethack libdir if it's     !!"
-	@${ECHO} "!! important for you                                      !!"
-	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-
-post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
-
-pre-configure:
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-
-post-install:
-	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/games/nethack34-qt/distinfo b/games/nethack34-qt/distinfo
deleted file mode 100644
index 24595f9d9a12..000000000000
--- a/games/nethack34-qt/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack34-qt/files/patch-include:config.h b/games/nethack34-qt/files/patch-include:config.h
deleted file mode 100644
index bfb4a2c47a67..000000000000
--- a/games/nethack34-qt/files/patch-include:config.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- include/config.h.orig	Sat Jul 22 10:13:51 2000
-+++ include/config.h	Sat Aug 11 10:09:12 2001
-@@ -44,7 +44,7 @@
-  */
- #define TTY_GRAPHICS	/* good old tty based graphics */
- /* #define X11_GRAPHICS */	/* X11 interface */
--/* #define QT_GRAPHICS */	/* Qt interface */
-+#define QT_GRAPHICS	/* Qt interface */
- /* #define GNOME_GRAPHICS */	/* Gnome interface */
- 
- /*
-@@ -151,11 +151,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
-@@ -186,7 +186,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "%%PREFIX%%/lib/nethack"	/* nethack directory */
- # endif
- 
- /*
diff --git a/games/nethack34-qt/files/patch-include:unixconf.h b/games/nethack34-qt/files/patch-include:unixconf.h
deleted file mode 100644
index d43f9d82b7dd..000000000000
--- a/games/nethack34-qt/files/patch-include:unixconf.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
-+++ include/unixconf.h	Fri Oct 13 10:06:57 2000
-@@ -47,7 +47,7 @@
- 			 * 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
-@@ -143,7 +143,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
diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.doc b/games/nethack34-qt/files/patch-sys:unix:Makefile.doc
deleted file mode 100644
index 2527c7b4128e..000000000000
--- a/games/nethack34-qt/files/patch-sys:unix:Makefile.doc
+++ /dev/null
@@ -1,41 +0,0 @@
---- sys/unix/Makefile.doc.orig	Sat Jan 15 05:49:48 2000
-+++ sys/unix/Makefile.doc	Sat Aug 11 11:08:33 2001
-@@ -34,15 +34,15 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= ${PREFIX}/man/man
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
--GAMEMANCREATE = cp nethack.6
--LEVMANCREATE = cp lev_comp.6
--DGNMANCREATE = cp dgn_comp.6
--RCVRMANCREATE = cp recover.6
--DLBMANCREATE = cp dlb.6
-+GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
-+LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
-+DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
-+RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
-+DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
- # manual installation for most SYSV-style systems
- # GAMEMANCREATE = nroff -man nethack.6 >
- # LEVMANCREATE = nroff -man lev_comp.6 >
-@@ -51,11 +51,11 @@
- # 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)
-+	-$(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-qt/files/patch-sys:unix:Makefile.src b/games/nethack34-qt/files/patch-sys:unix:Makefile.src
deleted file mode 100644
index 1a58379ae1ad..000000000000
--- a/games/nethack34-qt/files/patch-sys:unix:Makefile.src
+++ /dev/null
@@ -1,62 +0,0 @@
---- sys/unix/Makefile.src.orig	Sat Aug  5 19:52:57 2000
-+++ sys/unix/Makefile.src	Sat Aug 11 09:53:08 2001
-@@ -144,14 +144,14 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O -I../include
-+CFLAGS += -I../include
- LFLAGS =
- 
- # The Qt and Be window systems are written in C++, while the rest of
- # NetHack is standard C.  If using Qt, uncomment the LD line here to get
- # the C++ libraries linked in.
--CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
--CXX=g++
-+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
-+#CXX=g++
- #LD=g++
- 
- # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
-@@ -203,8 +203,8 @@
- 
- #
- #
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINTTYSRC) $(WINQTSRC)
-+WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
- 
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -230,7 +230,7 @@
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
- #
- # libraries for Qt
--WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = ${QTCFGLIBS} ${LIBQT}
- #
- # libraries for KDE (with Qt)
- WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -244,7 +244,7 @@
- # libraries for BeOS 
- WINBELIB = -lbe
- 
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINQTLIB)
- 
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)
-@@ -445,10 +445,10 @@
- 
- # Qt windowport meta-object-compiler output
- qt_kde0.moc: ../include/qt_kde0.h
--	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
-+	${MOC} ../include/qt_kde0.h > qt_kde0.moc
- 
- qt_win.moc: ../include/qt_win.h
--	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
-+	${MOC} ../include/qt_win.h > qt_win.moc
- 
- $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
- 		../include/objclass.h ../include/monsym.h \
diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.top b/games/nethack34-qt/files/patch-sys:unix:Makefile.top
deleted file mode 100644
index fb4a9021dd90..000000000000
--- a/games/nethack34-qt/files/patch-sys:unix:Makefile.top
+++ /dev/null
@@ -1,44 +0,0 @@
---- sys/unix/Makefile.top.orig	Tue Jul  4 09:42:05 2000
-+++ sys/unix/Makefile.top	Sat Aug 11 11:21:15 2001
-@@ -14,18 +14,17 @@
- # MAKE = make
- 
- # make NetHack
--PREFIX	 = /usr
- GAME     = nethack
- # GAME     = nethack.prg
- 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".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,14 +34,14 @@
- # 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
-+GAMEDIR  = $(PREFIX)/lib/$(GAME)
- VARDIR  = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+SHELLDIR = $(PREFIX)/bin
- 
- # per discussion in Install.X11 and Install.Qt
--VARDATND = 
-+# VARDATND = 
- # VARDATND = x11tiles pet_mark.xbm
--# VARDATND = x11tiles pet_mark.xbm rip.xpm
-+VARDATND = x11tiles pet_mark.xbm rip.xpm
- # for Atari/Gem
- # VARDATND = nh16.img title.img GEM_RSC.RSC
- # for BeOS
diff --git a/games/nethack34-qt/pkg-comment b/games/nethack34-qt/pkg-comment
deleted file mode 100644
index 2a563dc5bfe5..000000000000
--- a/games/nethack34-qt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game with graphic and sound
diff --git a/games/nethack34-qt/pkg-descr b/games/nethack34-qt/pkg-descr
deleted file mode 100644
index c80764a5e38c..000000000000
--- a/games/nethack34-qt/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-NetHack is a Free graphical one-player roleplaying game with a
-highly modular window system interface supporting TTY, VGA, Mac,
-Amiga, and other displays. Qt is a graphical user interface toolkit.
-So, "NetHack with Qt interface" is a version of NetHack which has
-a user interface module written using the Qt toolkit.
-
-The Qt interface has these extra features: 
-
-o   Tiles (graphics) in the inventory and other item-menu windows. 
-o   The player cursor changes colour as your relative hit-points drop. 
-o   The message window greys-out older message. 
-o   The item menus allow a count (click to left of icon - hidden feature). 
-o   Icons for the major attributes and player states. 
-o   Menus (only needed by newbie dungeon fodder). 
-o   Variable size fonts and tiles. 
-o   More space for the map as messages and status are side-by-side. 
-o   You rarely need to put the mouse in a pop-up to interact with it. 
-o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
-o   It is much easier to code, so new feature-requests are more easily done. 
-o   Sound support.
-
-WWW: http://trolls.troll.no/warwick/nethack/
diff --git a/games/nethack34-qt/pkg-plist b/games/nethack34-qt/pkg-plist
deleted file mode 100644
index 95e4f2cc5823..000000000000
--- a/games/nethack34-qt/pkg-plist
+++ /dev/null
@@ -1,137 +0,0 @@
-bin/nethack
-%%PORTDOCS%%share/doc/nethack/Guidebook.txt
-lib/nethack/nethack
-@exec mkdir %D/lib/nethack/save
-@exec chmod -R 775 %D/lib/nethack
-@exec chmod 2755 %D/lib/nethack/nethack
-@exec chown games:games %D/lib/nethack/save
-@unexec rm -rf %D/lib/nethack/save
-lib/nethack/Arc-fila.lev
-lib/nethack/Arc-filb.lev
-lib/nethack/Arc-goal.lev
-lib/nethack/Arc-loca.lev
-lib/nethack/Arc-strt.lev
-lib/nethack/Bar-fila.lev
-lib/nethack/Bar-filb.lev
-lib/nethack/Bar-goal.lev
-lib/nethack/Bar-loca.lev
-lib/nethack/Bar-strt.lev
-lib/nethack/Cav-fila.lev
-lib/nethack/Cav-filb.lev
-lib/nethack/Cav-goal.lev
-lib/nethack/Cav-loca.lev
-lib/nethack/Cav-strt.lev
-lib/nethack/Hea-fila.lev
-lib/nethack/Hea-filb.lev
-lib/nethack/Hea-goal.lev
-lib/nethack/Hea-loca.lev
-lib/nethack/Hea-strt.lev
-lib/nethack/Kni-fila.lev
-lib/nethack/Kni-filb.lev
-lib/nethack/Kni-goal.lev
-lib/nethack/Kni-loca.lev
-lib/nethack/Kni-strt.lev
-lib/nethack/Mon-fila.lev
-lib/nethack/Mon-filb.lev
-lib/nethack/Mon-goal.lev
-lib/nethack/Mon-loca.lev
-lib/nethack/Mon-strt.lev
-lib/nethack/Pri-fila.lev
-lib/nethack/Pri-filb.lev
-lib/nethack/Pri-goal.lev
-lib/nethack/Pri-loca.lev
-lib/nethack/Pri-strt.lev
-lib/nethack/Ran-fila.lev
-lib/nethack/Ran-filb.lev
-lib/nethack/Ran-goal.lev
-lib/nethack/Ran-loca.lev
-lib/nethack/Ran-strt.lev
-lib/nethack/Rog-fila.lev
-lib/nethack/Rog-filb.lev
-lib/nethack/Rog-goal.lev
-lib/nethack/Rog-loca.lev
-lib/nethack/Rog-strt.lev
-lib/nethack/Sam-fila.lev
-lib/nethack/Sam-filb.lev
-lib/nethack/Sam-goal.lev
-lib/nethack/Sam-loca.lev
-lib/nethack/Sam-strt.lev
-lib/nethack/Tou-fila.lev
-lib/nethack/Tou-filb.lev
-lib/nethack/Tou-goal.lev
-lib/nethack/Tou-loca.lev
-lib/nethack/Tou-strt.lev
-lib/nethack/Val-fila.lev
-lib/nethack/Val-filb.lev
-lib/nethack/Val-goal.lev
-lib/nethack/Val-loca.lev
-lib/nethack/Val-strt.lev
-lib/nethack/Wiz-fila.lev
-lib/nethack/Wiz-filb.lev
-lib/nethack/Wiz-goal.lev
-lib/nethack/Wiz-loca.lev
-lib/nethack/Wiz-strt.lev
-lib/nethack/air.lev
-lib/nethack/asmodeus.lev
-lib/nethack/astral.lev
-lib/nethack/baalz.lev
-lib/nethack/bigrm-1.lev
-lib/nethack/bigrm-2.lev
-lib/nethack/bigrm-3.lev
-lib/nethack/bigrm-4.lev
-lib/nethack/bigrm-5.lev
-lib/nethack/castle.lev
-lib/nethack/cmdhelp
-lib/nethack/data
-lib/nethack/dungeon
-lib/nethack/earth.lev
-lib/nethack/fakewiz1.lev
-lib/nethack/fakewiz2.lev
-lib/nethack/fire.lev
-lib/nethack/help
-lib/nethack/hh
-lib/nethack/history
-lib/nethack/juiblex.lev
-lib/nethack/knox.lev
-lib/nethack/license
-lib/nethack/medusa-1.lev
-lib/nethack/medusa-2.lev
-lib/nethack/minefill.lev
-lib/nethack/minend-1.lev
-lib/nethack/minend-2.lev
-lib/nethack/minetn-1.lev
-lib/nethack/minetn-2.lev
-lib/nethack/opthelp
-lib/nethack/options
-lib/nethack/oracle.lev
-lib/nethack/oracles
-lib/nethack/orcus.lev
-lib/nethack/pet_mark.xbm
-lib/nethack/quest.dat
-lib/nethack/rip.xpm
-lib/nethack/rumors
-lib/nethack/sanctum.lev
-lib/nethack/soko1-1.lev
-lib/nethack/soko1-2.lev
-lib/nethack/soko2-1.lev
-lib/nethack/soko2-2.lev
-lib/nethack/soko3-1.lev
-lib/nethack/soko3-2.lev
-lib/nethack/soko4-1.lev
-lib/nethack/soko4-2.lev
-lib/nethack/tower1.lev
-lib/nethack/tower2.lev
-lib/nethack/tower3.lev
-lib/nethack/valley.lev
-lib/nethack/water.lev
-lib/nethack/wizard1.lev
-lib/nethack/wizard2.lev
-lib/nethack/wizard3.lev
-lib/nethack/wizhelp
-lib/nethack/x11tiles
-@mode 664
-lib/nethack/logfile
-lib/nethack/record
-lib/nethack/perm
-@dirrm lib/nethack
-%%PORTDOCS%%@dirrm share/doc/nethack