6 files changed, 39 insertions, 70 deletions

diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 09ddee2c4757..6dd72c811891 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nethack
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.4.2
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,47 +32,34 @@ HACKNAME?=	nethack
 HACKDIR?=	lib/${HACKNAME}
 HACKDOCSDIR?=	share/doc/${HACKNAME}
 
-.if defined(WITH_GNOME_GRAPHICS)
+.if !defined(PKGNAMESUFFIX)
+USE_XPM=	yes
+GRAPHICS=	X11_GRAPHICS
+.else
+.if ${PKGNAMESUFFIX} == "-gnome"
 CATEGORIES=	games gnome
-PKGNAMESUFFIX=	-gnome
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnomelibs
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
-.elif defined(WITH_QT_GRAPHICS)
-PKGNAMESUFFIX=	-qt
+.elif ${PKGNAMESUFFIX} == "-nox11"
+GRAPHICS=	# none
+.elif ${PKGNAMESUFFIX} == "-qt"
 USE_QT_VER=	3
 MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
 		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \
 		MOC="${MOC}" LIBQT="-lqt-mt"
 GRAPHICS=	QT_GRAPHICS
-.elif defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-.else
-USE_XPM=	yes
-GRAPHICS=	X11_GRAPHICS
+.endif
 .endif
 
 pre-everything::
-.if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \
-		|| defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel   "
 	@${ECHO_MSG} " But ${PKGBASE} read your prior nethack scores           "
 	@${ECHO_MSG} " Don't forget to backup your nethack libdir if it's      "
 	@${ECHO_MSG} " important for you                                       "
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-.else
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} " You may use the following build options:                "
-	@${ECHO_MSG} " WITH_GNOME_GRAPHICS=yes            build with GNOME GUI "
-	@${ECHO_MSG} " WITH_QT_GRAPHICS=yes               build with Qt GUI    "
-	@${ECHO_MSG} " WITH_TTY_GRAPHICS=yes              build with no GUI    "
-	@${ECHO_MSG} " WITHOUT_X11=yes                    same as above        "
-	@${ECHO_MSG} "                                                         "
-	@${ECHO_MSG} " By default, nethack port is built with X11 GUI.         "
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-.endif
 
 post-patch:
 .for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
diff --git a/games/nethack34/distinfo b/games/nethack34/distinfo
index 2abaadc0a597..d15665fd70a4 100644
--- a/games/nethack34/distinfo
+++ b/games/nethack34/distinfo
@@ -1 +1 @@
-MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e
+MD5 (nethack-342.tgz) = 90e971dbaee2f05f6a2ed3454851903a
diff --git a/games/nethack34/files/patch-ab b/games/nethack34/files/patch-ab
index 25b70bd93dc0..d3ee0e028d96 100644
--- a/games/nethack34/files/patch-ab
+++ b/games/nethack34/files/patch-ab
@@ -1,22 +1,13 @@
---- include/system.h.orig	Thu Mar 21 08:42:55 2002
-+++ include/system.h	Sun Jun 16 15:49:55 2002
+--- include/system.h.orig	Sat Aug 30 09:07:23 2003
++++ include/system.h	Tue Sep  2 00:39:39 2003
 @@ -79,7 +79,9 @@
  # if !defined(__SC__) && !defined(LINUX)
  E  long NDECL(random);
  # endif
--# if !defined(SUNOS4) || defined(RANDOM)
+-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
 +# if defined(__FreeBSD__)
 +E void FDECL(srandom, (unsigned long));
-+# elif !defined(SUNOS4) || defined(RANDOM)
++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
  E void FDECL(srandom, (unsigned int));
  # else
  #  if !defined(bsdi) && !defined(__FreeBSD__)
-@@ -521,7 +523,7 @@
- #  endif
- # endif
- 
--# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
-+# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__FreeBSD__)
- E time_t FDECL(time, (time_t *));
- # else
- E long FDECL(time, (time_t *));
diff --git a/games/nethack34/files/patch-ac b/games/nethack34/files/patch-ac
index b145b918a153..047b3b7700a3 100644
--- a/games/nethack34/files/patch-ac
+++ b/games/nethack34/files/patch-ac
@@ -1,11 +1,11 @@
---- include/unixconf.h.orig	Sun Feb 23 23:43:23 2003
-+++ include/unixconf.h	Sun May 25 10:32:27 2003
+--- include/unixconf.h.orig	Mon Sep  1 22:34:19 2003
++++ include/unixconf.h	Mon Sep  1 22:35:16 2003
 @@ -19,13 +19,13 @@
   */
  
  /* define exactly one of the following four choices */
--/* #define BSD 1 */	/* define for 4.n BSD  */
-+#define BSD 1		/* define for 4.n BSD  */
+-/* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
++#define BSD 1		/* define for 4.n/Free/Open/Net 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) */
@@ -34,7 +34,7 @@
  
  /* The Andrew Message System does mail a little differently from normal
   * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
-@@ -280,7 +280,7 @@
+@@ -284,7 +284,7 @@
  #endif
  
  #if defined(BSD) || defined(ULTRIX)
diff --git a/games/nethack34/files/patch-ad b/games/nethack34/files/patch-ad
index 5b9c53c30992..b41a098d4ada 100644
--- a/games/nethack34/files/patch-ad
+++ b/games/nethack34/files/patch-ad
@@ -1,6 +1,6 @@
---- sys/unix/Makefile.src.orig	Sun May 25 10:20:20 2003
-+++ sys/unix/Makefile.src	Sun May 25 10:30:45 2003
-@@ -139,19 +139,28 @@
+--- sys/unix/Makefile.src.orig	Sat Aug 30 09:08:04 2003
++++ sys/unix/Makefile.src	Mon Sep  1 23:12:45 2003
+@@ -146,19 +146,29 @@
  # directories.  The ones given below is the usual spot for linux systems.
  # The paths are for glibconfig.h and gnomesupport.h respectively.
  #
@@ -9,6 +9,8 @@
  
  # flags for debugging:
  # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
 +CFLAGS += -I../include
 +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
 +CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
@@ -19,21 +21,20 @@
 +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
 +CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
 +endif
- 
--CFLAGS = -O -I../include
- LFLAGS =
++
+ 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
+ # NetHack is standard C.  If using Qt, uncomment the LINK 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
-@@ -205,7 +214,26 @@
+ #LINK=g++
+ #	For cross-compiling, eg. with gcc on Linux (see also CC further up):
+ #CXX=arm-linux-g++
+@@ -215,7 +225,26 @@
  #
  #
  WINSRC = $(WINTTYSRC)
@@ -60,7 +61,7 @@
  
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -225,19 +253,19 @@
+@@ -235,19 +264,19 @@
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
@@ -83,7 +84,7 @@
  #
  # libraries for Gem port
  WINGEMLIB = -le_gem -lgem
-@@ -246,6 +274,15 @@
+@@ -256,6 +285,15 @@
  WINBELIB = -lbe
  
  WINLIB = $(WINTTYLIB)
@@ -99,16 +100,7 @@
  
  # any other strange libraries your system needs (for Sysunix only -- the more
  # specialized targets should already be right)
-@@ -275,7 +312,7 @@
- LIBS =
- 
- # make NetHack
--GAME     = nethack
-+GAME     = %%HACKNAME%%
- # GAME     = nethack.prg
- 
- # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
-@@ -451,13 +488,13 @@
+@@ -461,13 +499,13 @@
  
  # Qt windowport meta-object-compiler output
  qt_kde0.moc: ../include/qt_kde0.h
diff --git a/games/nethack34/files/patch-ae b/games/nethack34/files/patch-ae
index 7c37cb83b952..575b5df94e9f 100644
--- a/games/nethack34/files/patch-ae
+++ b/games/nethack34/files/patch-ae
@@ -1,5 +1,5 @@
---- sys/unix/Makefile.top.orig	Thu Mar 21 08:43:54 2002
-+++ sys/unix/Makefile.top	Tue Aug 13 05:45:03 2002
+--- sys/unix/Makefile.top.orig	Sat Aug 30 09:08:04 2003
++++ sys/unix/Makefile.top	Mon Sep  1 22:38:47 2003
 @@ -14,18 +14,17 @@
  # MAKE = make
  
@@ -37,8 +37,8 @@
  # per discussion in Install.X11 and Install.Qt
 -VARDATND = 
 +# VARDATND = 
- # VARDATND = x11tiles pet_mark.xbm
- # VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
  # for Atari/Gem
 @@ -48,7 +47,7 @@
  # for BeOS