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)

6 files changed, 163 insertions, 58 deletions

diff --git a/games/nethack34/files/patch-aa b/games/nethack34/files/patch-aa
index 00fdb88cfdef..02d7fda4f77f 100644
--- a/games/nethack34/files/patch-aa
+++ b/games/nethack34/files/patch-aa
@@ -1,24 +1,15 @@
---- ./include/config.h.orig	Sat Jul 22 11:13:51 2000
-+++ ./include/config.h	Fri Oct 13 09:31:24 2000
-@@ -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 */
- /* #define GNOME_GRAPHICS */	/* Gnome interface */
- 
-@@ -110,7 +110,7 @@
+--- include/config.h.orig	Fri Mar 22 20:22:26 2002
++++ include/config.h	Fri Mar 22 20:28:13 2002
+@@ -122,7 +122,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 */
++# define USE_XPM		/* Disable if you do not have the XPM library */
  # ifdef USE_XPM
  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
  # endif
-@@ -151,11 +151,11 @@
+@@ -163,11 +163,11 @@
  
  #ifdef UNIX
  /* path and file name extension for compression program */
@@ -34,12 +25,12 @@
  #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 "/usr/local/share/nethack"	/* nethack directory */
+@@ -201,7 +201,7 @@
+ #  ifdef __APPLE__
+ #    define HACKDIR "nethackdir"	/* nethack directory */
+ #  else
+-#    define HACKDIR "/usr/games/lib/nethackdir"
++#    define HACKDIR "%%PREFIX%%/lib/nethack"
+ #  endif
  # endif
  
- /*
diff --git a/games/nethack34/files/patch-ac b/games/nethack34/files/patch-ac
index 69afffdc04f2..d2eec6982326 100644
--- a/games/nethack34/files/patch-ac
+++ b/games/nethack34/files/patch-ac
@@ -1,5 +1,5 @@
---- ./include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
-+++ ./include/unixconf.h	Fri Oct 13 10:06:57 2000
+--- 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 */
@@ -14,7 +14,7 @@
   */
  
 -#define MAIL			/* Deliver mail during the game */
-+/* #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/files/patch-ad b/games/nethack34/files/patch-ad
index 55ac0004fdf5..aed85203e4f2 100644
--- a/games/nethack34/files/patch-ad
+++ b/games/nethack34/files/patch-ad
@@ -1,51 +1,118 @@
---- ./sys/unix/Makefile.src.orig	Sat Aug  5 20:52:57 2000
-+++ ./sys/unix/Makefile.src	Fri Oct 13 10:10:21 2000
-@@ -144,8 +144,8 @@
+--- sys/unix/Makefile.src.orig	Thu Mar 21 08:43:54 2002
++++ sys/unix/Makefile.src	Sat Mar 23 04:08:06 2002
+@@ -139,19 +139,28 @@
+ # directories.  The ones given below is the usual spot for linux systems.
+ # The paths are for glibconfig.h and gnomesupport.h respectively.
+ #
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
+ 
  # flags for debugging:
  # CFLAGS = -g -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
  
 -CFLAGS = -O -I../include
--LFLAGS =
-+CFLAGS += -O -I../include -I${X11BASE}/include
-+LFLAGS = -L${X11BASE}/lib
+ 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
-@@ -203,8 +203,8 @@
+ # 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
+@@ -204,7 +213,26 @@
  #
  #
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC)
-+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+ WINSRC = $(WINTTYSRC)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINSRC += $(WINX11SRC)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINSRC += $(WINQTSRC)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINSRC += $(WINGNOMESRC)
++endif
++
+ WINOBJ = $(WINTTYOBJ)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINOBJ += $(WINX11OBJ)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINOBJ += $(WINQTOBJ)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINOBJ += $(WINGNOMEOBJ)
++endif
  
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -224,7 +224,7 @@
+@@ -224,19 +252,19 @@
  #
  # 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 -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib
  # 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
-@@ -244,7 +244,7 @@
- # libraries for BeOS 
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
+ # libraries for Gnome
+-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
++WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) -lgnugetopt
+ #
+ # libraries for Gem port
+ WINGEMLIB = -le_gem -lgem
+@@ -245,6 +273,15 @@
  WINBELIB = -lbe
  
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB)
+ WINLIB = $(WINTTYLIB)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINLIB += $(WINX11LIB)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINLIB += $(WINQTLIB)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINLIB += $(WINGNOMELIB)
++endif
  
  # any other strange libraries your system needs (for Sysunix only -- the more
  # specialized targets should already be right)
-@@ -271,7 +271,7 @@
- # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
- # LIBS = -lsun
- #
--LIBS =
-+LIBS = -lSM -lICE
+@@ -450,13 +487,13 @@
+ 
+ # 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
+ 
+ qttableview.moc: ../include/qttableview.h
+-	$(QTDIR)/bin/moc ../include/qttableview.h > qttableview.moc
++	${MOC} ../include/qttableview.h > qttableview.moc
  
- # make NetHack
- GAME     = nethack
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/games/nethack34/files/patch-ae b/games/nethack34/files/patch-ae
index e655d0e9ff0b..42d88c741d3f 100644
--- a/games/nethack34/files/patch-ae
+++ b/games/nethack34/files/patch-ae
@@ -1,5 +1,5 @@
---- ./sys/unix/Makefile.top.orig	Tue Jul  4 10:42:05 2000
-+++ ./sys/unix/Makefile.top	Fri Oct 13 10:13:50 2000
+--- sys/unix/Makefile.top.orig	Tue Jul  4 09:42:05 2000
++++ sys/unix/Makefile.top	Tue Oct  9 22:21:45 2001
 @@ -14,18 +14,17 @@
  # MAKE = make
  
@@ -23,15 +23,28 @@
  
  # GAMEDIR also appears in config.h as "HACKDIR".
  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,9 +34,9 @@
+@@ -35,12 +34,12 @@
  # 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)/share/$(GAME)
++GAMEDIR  = $(PREFIX)/lib/$(GAME)
  VARDIR  = $(GAMEDIR)
 -SHELLDIR = $(PREFIX)/games
 +SHELLDIR = $(PREFIX)/bin
  
  # per discussion in Install.X11 and Install.Qt
- VARDATND = 
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+ # VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+@@ -48,7 +47,7 @@
+ # for BeOS
+ # VARDATND = beostiles
+ # for Gnome
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+ 
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff --git a/games/nethack34/files/patch-af b/games/nethack34/files/patch-af
index 3a01201d6ae6..2527c7b4128e 100644
--- a/games/nethack34/files/patch-af
+++ b/games/nethack34/files/patch-af
@@ -1,6 +1,6 @@
---- ./sys/unix/Makefile.doc.orig	Mon Dec 13 14:49:15 1999
-+++ ./sys/unix/Makefile.doc	Mon Dec 13 14:44:53 1999
-@@ -31,7 +31,7 @@
+--- 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
@@ -9,7 +9,20 @@
  MANEXT	= 6
  
  # manual installation for most BSD-style systems
-@@ -48,11 +48,11 @@
+-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:
diff --git a/games/nethack34/files/patch-ag b/games/nethack34/files/patch-ag
new file mode 100644
index 000000000000..340e20d6467c
--- /dev/null
+++ b/games/nethack34/files/patch-ag
@@ -0,0 +1,21 @@
+--- sys/unix/Makefile.utl.orig	Mon Apr 17 22:36:44 2000
++++ sys/unix/Makefile.utl	Wed Oct 10 19:48:36 2001
+@@ -89,7 +89,17 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
++
+ LFLAGS =
+ 
+ LIBS =