5 files changed, 64 insertions, 32 deletions
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 5b9fbcf65c8..9d7aa100b50 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 1999/04/26 18:38:29 garbled Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/24 22:30:05 pooka Exp $
 #
 
-DISTNAME=		nethack-3.2.2
-PKGNAME=		nethack-x11-3.2.2
+DISTNAME=		nethack-3.3.0
+PKGNAME=		nethack-x11-3.3.0
 CATEGORIES=		games x11
-MASTER_SITES=		http://pinky.wtower.com/nethack/sources/
+MASTER_SITES=		ftp://ftp.win.tue.nl/pub/games/nethack.330/source/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.win.tue.nl/games/roguelike/nethack/
 
-DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
+DEPENDS+=		nethack-lib-3.3.0:../nethack-lib
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 USE_X11=		yes
@@ -22,9 +22,14 @@ MAKE_ENV+=		GTYPE=-x11
 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@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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/files/md5 b/games/nethack-x11/files/md5
deleted file mode 100644
index ba217546059..00000000000
--- a/games/nethack-x11/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.1 1998/12/31 13:20:54 tv Exp $
-
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
diff --git a/games/nethack-x11/files/patch-sum b/games/nethack-x11/files/patch-sum
index 0278a5cb51b..fe7de58b355 100644
--- a/games/nethack-x11/files/patch-sum
+++ b/games/nethack-x11/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:59 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:06 pooka Exp $
 
-MD5 (patch-aa) = 440619e937d38f5dcfc5392dc15aa375
-MD5 (patch-ab) = 0a6e691dc47e82002f6c419dbc6d3397
+MD5 (patch-aa) = 540c8a6f9754f529e48bffc5d59e3432
+MD5 (patch-ab) = f02f85296c63fd87802f371b68000666
diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa
index 746eac971c2..f8d4d93c018 100644
--- a/games/nethack-x11/patches/patch-aa
+++ b/games/nethack-x11/patches/patch-aa
@@ -1,20 +1,33 @@
-$NetBSD: patch-aa,v 1.1 1998/08/27 13:15:01 garbled Exp $
---- include/config.h.orig	Sat Aug  8 01:48:35 1998
-+++ include/config.h	Sat Aug  8 01:53:42 1998
-@@ -212,4 +212,4 @@
+$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $
+
+--- include/config.h.orig	Sat Dec 11 07:20:49 1999
++++ include/config.h	Wed Dec 22 21:41:41 1999
+@@ -42,8 +42,8 @@
+  * 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 X11_GRAPHICS	/* X11 interface */
+-/* #define X11_GRAPHICS */ /* X11 interface */
 +/* #define TTY_GRAPHICS	/* good old tty based graphics */
-+#define X11_GRAPHICS	/* X11 interface */
++#define X11_GRAPHICS /* X11 interface */
+ /* #define QT_GRAPHICS */	/* Qt interface */
+ 
+ /*
+@@ -80,7 +80,7 @@
+ #endif
  
-@@ -246,3 +246,3 @@
  #ifndef DEFAULT_WINDOW_SYS
 -# define DEFAULT_WINDOW_SYS "tty"
-+# define DEFAULT_WINDOW_SYS "X11"
++# define DEFAULT_WINDOW_SYS "x11"
  #endif
-@@ -258,3 +258,3 @@
+ 
+ #ifdef X11_GRAPHICS
+@@ -92,7 +92,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 */
++# define USE_XPM   		/* Disable if you do not have the XPM library */
  # ifdef USE_XPM
+ #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+ # endif
diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab
index 6c5bf85ad16..7d207cf799a 100644
--- a/games/nethack-x11/patches/patch-ab
+++ b/games/nethack-x11/patches/patch-ab
@@ -1,27 +1,44 @@
-$NetBSD: patch-ab,v 1.2 1998/12/31 13:20:54 tv Exp $
---- sys/unix/Makefile.src.orig	Sat Aug  8 01:56:47 1998
-+++ sys/unix/Makefile.src	Sat Aug  8 02:00:19 1998
-@@ -126,4 +126,4 @@
+$NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $
+
+--- sys/unix/Makefile.src.orig	Sat Dec 11 07:21:05 1999
++++ sys/unix/Makefile.src	Wed Dec 22 21:45:47 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)/lib
++CFLAGS = -O -I../include -I${X11BASE}/include
++LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
  
-@@ -148,4 +148,4 @@
+ # 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 = $(WINX11SRC)
 +WINOBJ = $(WINX11OBJ)
  
-@@ -169,3 +169,3 @@
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -186,7 +186,7 @@
+ #
+ # 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 -lXt -lX11
-@@ -175,3 +175,3 @@
+ # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+@@ -199,7 +199,7 @@
  #
+ #
+ 
 -WINLIB = $(WINTTYLIB)
 +WINLIB = $(WINX11LIB)
  
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)