Upgrade nethack to 3.3.1. Add Makefile.common to easy future upgrades.

This release contains numerous fixes to bugs in 3.3.0 and users are advised
to upgrade.

Note that old savegames and bones files won't work anymore.

6 files changed, 32 insertions, 63 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 91dcb849592..9fb093c0444 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,24 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:18 agc Exp $
+# $NetBSD: Makefile,v 1.20 2000/08/10 17:50:10 pooka Exp $
 #
 
-DISTNAME=		nethack-3.3.0
-PKGNAME=		nethack-qt-3.3.0
-CATEGORIES=		games x11
-MASTER_SITES=		ftp://ftp.win.tue.nl/pub/games/nethack.330/source/
+.include		"../nethack-lib/Makefile.common"
 
-MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://trolls.troll.no/warwick/nethack/
+PKGNAME=		nethack-qt-${NETHACK_VERSION}
+CATEGORIES+=		x11
 
-DEPENDS+=		nethack-lib-3.3.0:../nethack-lib
+DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		qt2-2.0.2:../../x11/qt
 
-WRKSRC=			${WRKDIR}/nethack-3.3.0
-
 USE_X11=		yes
-USE_GMAKE=		yes
-HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
 
@@ -29,16 +21,6 @@ MAKE_ENV+=		GTYPE=-qt QTDIR=${QT2DIR}/qt2
 PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
 ALLFILES=		${DISTFILES}	# don't checksum shared patches
 
-MD5_FILE=		${.CURDIR}/../nethack-lib/files/md5
-
-post-extract:
-	@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
-
-post-patch:
-	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo
-	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h
-	@${RM} -f ${WRKSRC}/foo
-
 post-install:
 	@${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm
 	@${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir
diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum
index 2b957f9dac0..3f9f3d8952c 100644
--- a/games/nethack-qt/files/patch-sum
+++ b/games/nethack-qt/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.7 2000/04/28 10:12:43 drochner Exp $
+$NetBSD: patch-sum,v 1.8 2000/08/10 17:50:10 pooka Exp $
 
-MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace
-MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc
-MD5 (patch-ac) = c4b1ccf2bc98708940b3b46dfd35c453
-MD5 (patch-ad) = 2dc6f7ee1e0d58c0207d648258a30d85
+MD5 (patch-aa) = 26cd05907c0b14df0da9f319d78008a9
+MD5 (patch-ac) = 261fede1e7eb1d94f33b36447c7281c7
+MD5 (patch-ad) = 1b71accc5cf87b03e8c8b905cc832347
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index 6afabb0f073..e039d77df09 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.4 1999/12/24 22:30:03 pooka Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/10 17:50:11 pooka Exp $
 
---- include/config.h.orig	Wed Dec 22 22:13:56 1999
-+++ include/config.h	Wed Dec 22 22:26:48 1999
+--- include/config.h.orig	Sat Jul 22 04:13:51 2000
++++ include/config.h	Thu Aug 10 19:55:36 2000
 @@ -42,9 +42,9 @@
   * Define all of those you want supported in your binary.
   * Some combinations make no sense.  See the installation document.
   */
 -#define TTY_GRAPHICS	/* good old tty based graphics */
 +/* #define TTY_GRAPHICS	/* good old tty based graphics */
- /* #define X11_GRAPHICS */ /* X11 interface */
+ /* #define X11_GRAPHICS */	/* X11 interface */
 -/* #define QT_GRAPHICS */	/* Qt interface */
-+#define QT_GRAPHICS   	/* Qt interface */
++#define QT_GRAPHICS */	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
  
  /*
-  * Define the default window system.  This should be one that is compiled
diff --git a/games/nethack-qt/patches/patch-ab b/games/nethack-qt/patches/patch-ab
deleted file mode 100644
index 8ba17543542..00000000000
--- a/games/nethack-qt/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/12/24 22:30:03 pooka Exp $
-
---- sys/unix/Makefile.dat.orig	Sat Dec 11 07:21:05 1999
-+++ sys/unix/Makefile.dat	Wed Dec 22 22:09:13 1999
-@@ -15,7 +15,7 @@
- 	(cd ../util ; make lev_comp)
- 
- ../util/tile2x11:
--	(cd ../util ; make tile2x11)
-+	(cd ../util ; gmake tile2x11)
- 
- x11tiles: ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \
- 				../win/share/other.txt
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index ad9fdc80fd4..540493101eb 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2000/08/10 17:50:13 pooka Exp $
 
---- sys/unix/Makefile.src.orig	Sat Dec 11 06:21:05 1999
-+++ sys/unix/Makefile.src	Fri Apr 28 11:50:01 2000
-@@ -132,8 +132,8 @@
+--- sys/unix/Makefile.src.orig	Sat Aug  5 13:52:57 2000
++++ sys/unix/Makefile.src	Thu Aug 10 20:03:19 2000
+@@ -144,8 +144,8 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
  
 -CFLAGS = -O -I../include
--LFLAGS = 
+-LFLAGS =
 +CFLAGS = -O -I../include -I${X11BASE}/include
 +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
  
- # Only used for Qt interface (other interfaces are standard C)
- CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
-@@ -165,8 +165,8 @@
+ # 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 @@
  
  #
- # 
+ #
 -WINSRC = $(WINTTYSRC)
 -WINOBJ = $(WINTTYOBJ)
 +WINSRC = $(WINQTSRC)
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $
  
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -192,14 +192,14 @@
+@@ -230,7 +230,7 @@
  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
  #
  # libraries for Qt
@@ -33,8 +33,9 @@ $NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext
- #
- #
+@@ -244,7 +244,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
  
 -WINLIB = $(WINTTYLIB)
 +WINLIB = $(WINQTLIB)
diff --git a/games/nethack-qt/patches/patch-ad b/games/nethack-qt/patches/patch-ad
index 92cb0b251b6..8bc0ce66e58 100644
--- a/games/nethack-qt/patches/patch-ad
+++ b/games/nethack-qt/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/04/14 17:31:27 pooka Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/10 17:50:14 pooka Exp $
 
---- win/Qt/qt_win.cpp.orig	Sat Dec 11 07:21:09 1999
-+++ win/Qt/qt_win.cpp	Fri Apr 14 17:16:15 2000
-@@ -3410,7 +3410,7 @@
+--- win/Qt/qt_win.cpp.orig	Sat Jul 22 03:59:19 2000
++++ win/Qt/qt_win.cpp	Thu Aug 10 19:59:49 2000
+@@ -3448,7 +3448,7 @@
  
  NetHackQtGlyphs::NetHackQtGlyphs()
  {