Update the Nethack package to 3.3.0. nethack-qt will be non-functional

until we get qt2.0 or greater into pkgsrc.

7 files changed, 89 insertions, 205 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 1df18efa8d6..a934bd755aa 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,22 +1,19 @@
-# $NetBSD: Makefile,v 1.7 1999/06/04 15:39:09 drochner Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/24 22:30:02 pooka Exp $
 #
 
-DISTNAME=		qnethack-3.2.2.1.0.1.src
-PKGNAME=		nethack-qt-3.2.2
+DISTNAME=		nethack-3.3.0
+PKGNAME=		nethack-qt-3.3.0
 CATEGORIES=		games x11
-MASTER_SITES=		ftp://ftp.troll.no/contrib/ \
-			http://pinky.wtower.com/nethack/sources/
-DISTFILES=		qnethack-3.2.2.1.0.1.src.tar.gz \
-			nethack-3.2.2.tar.gz
+MASTER_SITES=		ftp://ftp.win.tue.nl/pub/games/nethack.330/source/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://trolls.troll.no/warwick/nethack/
 
-DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
+DEPENDS+=		nethack-lib-3.3.0:../nethack-lib
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		qt-1.44:../../x11/qt
 
-WRKSRC=			${WRKDIR}/nethack-3.2.2
+WRKSRC=			${WRKDIR}/nethack-3.3.0
 
 USE_X11=		yes
 USE_GMAKE=		yes
@@ -29,16 +26,22 @@ MAKE_ENV+=		GTYPE=-qt QTDIR=${X11BASE}
 PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
 ALLFILES=		${DISTFILES}	# don't checksum shared patches
 
+MD5_FILE=		${.CURDIR}/../nethack-lib/files/md5
+
+IGNORE=			"requires qt2 which is unavailable in pkgsrc"
+
+#post-extract:
+#	#@${LN} -sf ../../Qt ${WRKSRC}/win/Qt
+
 post-extract:
-	@${LN} -sf ../../Qt ${WRKSRC}/win/Qt
+	@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
 
 post-patch:
 	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo
-	@${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h
+	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h
 	@${RM} -f ${WRKSRC}/foo
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < win/Qt/nhqt.patch
 
 post-install:
-	${INSTALL} -c -o bin -g games -m 0644 ${WRKSRC}/dat/tiles.xpm ${LOCALBASE}/share/nethackdir
+	${INSTALL} -c -o bin -g games -m 0644 ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/files/md5 b/games/nethack-qt/files/md5
deleted file mode 100644
index 8f28ce18b25..00000000000
--- a/games/nethack-qt/files/md5
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: md5,v 1.3 1998/12/31 13:20:53 tv Exp $
-
-MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum
index a05203b291a..0555bea3291 100644
--- a/games/nethack-qt/files/patch-sum
+++ b/games/nethack-qt/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:58 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:03 pooka Exp $
 
-MD5 (patch-aa) = ffb7eabfab778f54b2143f32288466ea
-MD5 (patch-ab) = cb744632ae08477088bf0e69a9e3edd3
+MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace
+MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc
+MD5 (patch-ac) = 1096876031d6467d32fcd00412eabdf1
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index f9b66afe734..6afabb0f073 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,180 +1,16 @@
-$NetBSD: patch-aa,v 1.3 1998/12/31 07:28:46 garbled Exp $
---- win/Qt/nhqt.patch.orig	Tue Apr 14 08:40:16 1998
-+++ win/Qt/nhqt.patch	Sat Aug  8 06:42:11 1998
-@@ -88,3 +73,3 @@
- + # endif
--+ # ifndef WIN32
-++ # if !defined(WIN32) && !defined(__NetBSD__)
- + #  define USER_SOUNDS
-@@ -123,3 +108,2 @@
-   # define DOAGAIN '\001'	/* ^A, the "redo" key used in cmd.c and getline.c */
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/extern.h ../qnethack/include/extern.h
- *** ./include/extern.h	Mon Dec  9 16:37:13 1996
-@@ -143,3 +127,2 @@
-   E char *FDECL(xname, (struct obj *));
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/global.h ../qnethack/include/global.h
- *** ./include/global.h	Tue Nov 26 00:52:52 1996
-@@ -163,3 +146,2 @@
-   # endif
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/system.h ../qnethack/include/system.h
- *** ./include/system.h	Mon Nov  4 15:01:25 1996
-@@ -200,3 +182,2 @@
-   E int FDECL(chdir, (char *));
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/files.c ../qnethack/src/files.c
- *** ./src/files.c	Mon Oct 28 01:33:03 1996
-@@ -237,3 +218,2 @@
-   	return 1;
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/o_init.c ../qnethack/src/o_init.c
- *** ./src/o_init.c	Tue Aug 13 19:31:28 1996
-@@ -257,3 +237,2 @@
-       }
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/objnam.c ../qnethack/src/objnam.c
- *** ./src/objnam.c	Mon Dec  9 16:43:29 1996
-@@ -277,3 +256,2 @@
-   #ifdef LINT	/* static char buf[BUFSZ]; */
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/sounds.c ../qnethack/src/sounds.c
- *** ./src/sounds.c	Fri May 24 14:52:26 1996
-@@ -382,3 +360,2 @@
-   /*sounds.c*/
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/spell.c ../qnethack/src/spell.c
- *** ./src/spell.c	Tue Aug 13 19:27:25 1996
-@@ -414,3 +391,2 @@
-   	else
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/windows.c ../qnethack/src/windows.c
- *** ./src/windows.c	Fri May 24 20:27:05 1996
-@@ -441,20 +417,7 @@
-       { &mac_procs, 0 },
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.dat ../qnethack/sys/unix/Makefile.dat
--*** ./sys/unix/Makefile.dat	Tue Sep 12 22:01:37 1995
----- ../qnethack/sys/unix/Makefile.dat	Tue Apr 14 17:40:03 1998
-+*** ./sys/unix/Makefile.dat	Tue Sep 12 13:01:37 1995
-+--- ../qnethack/sys/unix/Makefile.dat	Sat Aug  8 06:39:59 1998
- ***************
--*** 22,33 ****
--  	../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \
--  				../win/share/other.txt
--  
--  pet_mark.xbm: ../win/X11/pet_mark.xbm
--  	cp ../win/X11/pet_mark.xbm pet_mark.xbm
--  
--  rip.xpm: ../win/X11/rip.xpm
--  	cp ../win/X11/rip.xpm rip.xpm
--- 
--  
--  data:	data.base ../util/makedefs
--  	../util/makedefs -d
----- 22,37 ----
-+*** 22,27 ****
-+--- 22,32 ----
-   	../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \
-@@ -470,8 +433,2 @@
-   
--  rip.xpm: ../win/X11/rip.xpm
--  	cp ../win/X11/rip.xpm rip.xpm
--  
--  data:	data.base ../util/makedefs
--  	../util/makedefs -d
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.src ../qnethack/sys/unix/Makefile.src
- *** ./sys/unix/Makefile.src	Tue Dec 10 21:20:09 1996
-@@ -494,6 +451,6 @@
- ! CFLAGS = -O2 -I../include
--! LFLAGS = -L/usr/X11/lib -L$(QTDIR)/lib
-+! LFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -L$(QTDIR)/lib
-   
- + # For USER_SOUNDS support, include -I/usr/X11/include
--+ CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -I/usr/X11/include
-++ CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include/qt -I$(X11BASE)/include
-   
-@@ -519,8 +476,8 @@
- + # for USER_SOUNDS support, include ../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp
--+ WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_cluster.cpp \
--+ 	../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp
-++ WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_cluster.cpp
-++ # 	../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp
- + 
- + # For USER_SOUNDS support, include qaudio.o qaudio-p.o
--+ WINQTOBJ = qt_win.o qt_cluster.o tile.o \
--+ 	qaudio.o qaudio-p.o
-++ WINQTOBJ = qt_win.o qt_cluster.o tile.o
-++ # 	qaudio.o qaudio-p.o
- + #
-@@ -548,3 +505,3 @@
- + # For USER_SOUNDS support, include -laudio -lm
--+ WINQTLIB = -lqt -lX11 -laudio -lm
-++ WINQTLIB = -lqt -lX11 -lXext
- + #
-@@ -994,3 +951,2 @@
-   # IF YOU PUT STUFF HERE IT WILL GO AWAY
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.top ../qnethack/sys/unix/Makefile.top
- *** ./sys/unix/Makefile.top	Tue Dec 10 21:20:10 1996
-@@ -998,21 +954,11 @@
- ***************
--*** 35,42 ****
--  GAMEDIR  = /usr/games/lib/$(GAME)dir
--  SHELLDIR = /usr/games
--  
--! # per discussion in Install.X11
--! VARDATND = 
--  # VARDATND = x11tiles pet_mark.xbm
--  # VARDATND = x11tiles pet_mark.xbm rip.xpm
--  
----- 35,43 ----
--  GAMEDIR  = /usr/games/lib/$(GAME)dir
--  SHELLDIR = /usr/games
--  
--! # per discussion in Install.X11 and Install.Qt
--! VARDATND = tiles.xpm rip.xpm
--! 
-+*** 39,44 ****
-+--- 39,45 ----
-+  VARDATND =
-   # VARDATND = x11tiles pet_mark.xbm
--  # VARDATND = x11tiles pet_mark.xbm rip.xpm
--  
-+  VARDATND = x11tiles pet_mark.xbm rip.xpm
-++ VARDATND += tiles.xpm
-+ 
-+  VARDATD = data oracles options quest.dat rumors
-+  VARDAT = $(VARDATD) $(VARDATND)
- ***************
-@@ -1031,5 +977,5 @@
- + 
--  all:	$(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
-+  all:	$(GAME) datastuff
-   	@echo "Done."
--  
-+
- ***************
-@@ -1055,3 +1001,2 @@
-   	( cd dat ; $(MAKE) pet_mark.xbm )
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.utl ../qnethack/sys/unix/Makefile.utl
- *** ./sys/unix/Makefile.utl	Tue Dec 10 21:20:11 1996
-@@ -1068,16 +1013,2 @@
- --- 290,295 ----
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/nethack.sh ../qnethack/sys/unix/nethack.sh
--*** ./sys/unix/nethack.sh	Tue Sep 12 22:01:39 1995
----- ../qnethack/sys/unix/nethack.sh	Mon Mar 30 23:19:48 1998
--***************
--*** 2,7 ****
----- 2,8 ----
--  #	SCCS Id: @(#)nethack.sh	3.2	90/02/26
--  
--  HACKDIR=/usr/games/lib/nethackdir
--+ export HACKDIR
--  HACK=$HACKDIR/nethack
--  MAXNROFPLAYERS=4
--  
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/unixmain.c ../qnethack/sys/unix/unixmain.c
- *** ./sys/unix/unixmain.c	Wed Sep 25 02:37:10 1996
-@@ -1105,3 +1036,2 @@
-   #endif
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/winnt/Makefile.nt ../qnethack/sys/winnt/Makefile.nt
- *** ./sys/winnt/Makefile.nt	Mon Nov  4 14:54:36 1996
-@@ -1349,3 +1279,2 @@
-   # from sys\share
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./util/makedefs.c ../qnethack/util/makedefs.c
- *** ./util/makedefs.c	Mon Nov  4 15:01:17 1996
-@@ -1364,3 +1293,2 @@
-   
--diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./win/X11/tile2x11.c ../qnethack/win/X11/tile2x11.c
- *** ./win/X11/tile2x11.c	Fri May  3 23:44:17 1996
+$NetBSD: patch-aa,v 1.4 1999/12/24 22:30:03 pooka Exp $
+
+--- include/config.h.orig	Wed Dec 22 22:13:56 1999
++++ include/config.h	Wed Dec 22 22:26:48 1999
+@@ -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 QT_GRAPHICS */	/* Qt interface */
++#define QT_GRAPHICS   	/* Qt 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
index a2a51f9314a..8ba17543542 100644
--- a/games/nethack-qt/patches/patch-ab
+++ b/games/nethack-qt/patches/patch-ab
@@ -1,8 +1,13 @@
-$NetBSD: patch-ab,v 1.1 1998/08/27 13:06:51 garbled Exp $
---- sys/unix/Makefile.dat.orig	Sat Aug  8 06:57:06 1998
-+++ sys/unix/Makefile.dat	Sat Aug  8 06:57:14 1998
-@@ -17,3 +17,3 @@
+$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
new file mode 100644
index 00000000000..236e37a3766
--- /dev/null
+++ b/games/nethack-qt/patches/patch-ac
@@ -0,0 +1,43 @@
+$NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $
+
+--- sys/unix/Makefile.src.orig	Sat Dec 11 07:21:05 1999
++++ sys/unix/Makefile.src	Wed Dec 22 22:29:15 1999
+@@ -132,8 +132,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
+-LFLAGS = 
++CFLAGS = -O -I../include -I${X11BASE}/include
++LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}
+ 
+ # Only used for Qt interface (other interfaces are standard C)
+ CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
+@@ -165,8 +165,8 @@
+ 
+ #
+ # 
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINQTSRC)
++WINOBJ = $(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
+@@ -192,14 +192,14 @@
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
+ #
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINQTLIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
diff --git a/games/nethack-qt/pkg/COMMENT b/games/nethack-qt/pkg/COMMENT
index 237957f5b36..f24935e0208 100644
--- a/games/nethack-qt/pkg/COMMENT
+++ b/games/nethack-qt/pkg/COMMENT
@@ -1 +1 @@
-the QT-Enhanced X11 version of NetHack
+the (currently non-functional) QT-Enhanced X11 version of NetHack