DO NOT REACH OVER INTO ANOTHER PKG'S ${WRKDIR}!

This breaks many things, not the least of which are `make fetch-list'
and `WRKOBJDIR'.

7 files changed, 51 insertions, 42 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 7b81e59d5da..7fbe1600763 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.3 1998/12/29 19:42:09 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/12/31 13:20:52 tv Exp $
 #
 
 DISTNAME=		qnethack-3.2.2.1.0.1.src
 PKGNAME=		nethack-qt-3.2.2
 CATEGORIES=		games x11
-MASTER_SITES=		ftp://ftp.troll.no/contrib/
+DISTFILES=		qnethack-3.2.2.1.0.1.src.tar.gz \
+			nethack-3.2.2.tar.gz
+MASTER_SITES=		ftp://ftp.troll.no/contrib/ \
+			http://pinky.wtower.com/nethack/sources/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://trolls.troll.no/warwick/nethack/
@@ -13,28 +16,28 @@ DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		qt-1.42:../../x11/qt
 
+WRKSRC=			${WRKDIR}/nethack-3.2.2
+
 USE_GMAKE=		yes
-WRKSRC=			../nethack-lib/${WRKDIR_BASENAME}/nethack-3.2.2
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	sys/unix/setup.sh
 ALL_TARGET=		nethack tiles.xpm
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-qt QTDIR=${X11BASE}
 
-do-extract:
-	-@mkdir ${WRKDIR_BASENAME}
-	(cd ../nethack-lib && make clean)
-	(cd ../nethack-lib && make patch)
-	(cd ${WRKSRC}/sys/unix && sh ./setup.sh)
-	(cd ${WRKSRC}/src && make clean)
-	(cd ${WRKSRC}/win && ${EXTRACT_CMD} -xzf ${DISTDIR}/${DISTNAME}.tar.gz)
+PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
+ALLFILES=		${DISTFILES}	# don't checksum shared patches
+
+post-extract:
+	@${LN} -sf ../../Qt ${WRKSRC}/win/Qt
 
 post-patch:
-	(cd ${WRKSRC} && ${PATCH} -p0 < win/Qt/nhqt.patch)
-	(cd ../nethack-lib && make configure)
+	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo
+	@${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@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
 
-do-clean:
-	-@rm -r ${WRKDIR_BASENAME}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/files/md5 b/games/nethack-qt/files/md5
index 04e6876da78..8f28ce18b25 100644
--- a/games/nethack-qt/files/md5
+++ b/games/nethack-qt/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.2 1998/08/28 13:04:36 garbled Exp $
+$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-tty/Makefile b/games/nethack-tty/Makefile
index 31b312bf80b..4a1747489c0 100644
--- a/games/nethack-tty/Makefile
+++ b/games/nethack-tty/Makefile
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.3 1998/12/31 06:19:38 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1998/12/31 13:20:53 tv Exp $
 
 DISTNAME=		nethack-3.2.2
 PKGNAME=		nethack-tty-3.2.2
 CATEGORIES=		games
-MASTER_SITES=		# empty
+MASTER_SITES=		http://pinky.wtower.com/nethack/sources/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.win.tue.nl/games/roguelike/nethack/
 
 DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
 
-WRKSRC=			../nethack-lib/${WRKDIR_BASENAME}/${DISTNAME}
-NO_CHECKSUM=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	sys/unix/setup.sh
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-tty
 
-do-fetch:	#empty
-do-extract:
-	-@mkdir ${WRKDIR_BASENAME}
-	(cd ../nethack-lib && make clean)
-	(cd ../nethack-lib && make configure)
+PATCHDIR=		${PKGSRCDIR}/games/nethack-lib/patches
+
+post-patch:
+	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo
+	@${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h
+	@${RM} -f ${WRKSRC}/foo
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-tty/files/md5 b/games/nethack-tty/files/md5
new file mode 100644
index 00000000000..adccd5fe5bf
--- /dev/null
+++ b/games/nethack-tty/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1 1998/12/31 13:20:53 tv Exp $
+
+MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index eb595a39532..b7e97711aad 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,31 +1,29 @@
-# $NetBSD: Makefile,v 1.2 1998/12/31 06:19:38 garbled Exp $
+# $NetBSD: Makefile,v 1.3 1998/12/31 13:20:54 tv Exp $
 #
 
 DISTNAME=		nethack-3.2.2
 PKGNAME=		nethack-x11-3.2.2
 CATEGORIES=		games x11
-MASTER_SITES=		# empty
+MASTER_SITES=		http://pinky.wtower.com/nethack/sources/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.win.tue.nl/games/roguelike/nethack/
 
-DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+#DEPENDS+=		nethack-lib-3.2.2:../nethack-lib
+#DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-WRKSRC=			../nethack-lib/${WRKDIR_BASENAME}/${DISTNAME}
-NO_CHECKSUM=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	sys/unix/setup.sh
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
 
-do-fetch:	#empty
-do-extract:
-	-@mkdir ${WRKDIR_BASENAME}
-	(cd ../nethack-lib && make clean)
-	(cd ../nethack-lib && make configure)
-	(cd ${WRKSRC}/src && make clean)
+PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
+ALLFILES=		${DISTFILES}	# don't checksum shared patches
 
-do-clean:
-	-@rm -r ${WRKDIR_BASENAME}
+post-patch:
+	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo
+	@${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@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
new file mode 100644
index 00000000000..ba217546059
--- /dev/null
+++ b/games/nethack-x11/files/md5
@@ -0,0 +1,3 @@
+$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/patches/patch-ab b/games/nethack-x11/patches/patch-ab
index fc88bdf69fc..6c5bf85ad16 100644
--- a/games/nethack-x11/patches/patch-ab
+++ b/games/nethack-x11/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 1998/08/27 13:15:02 garbled Exp $
---- src/Makefile.orig	Sat Aug  8 01:56:47 1998
-+++ src/Makefile	Sat Aug  8 02:00:19 1998
+$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 @@
  
 -CFLAGS = -O -I../include