Fixed wrong use of WRKSRC.

15 files changed, 56 insertions, 54 deletions

diff --git a/games/gnuchess4/Makefile b/games/gnuchess4/Makefile
index 08c25f2df81..df5f77b6b0f 100644
--- a/games/gnuchess4/Makefile
+++ b/games/gnuchess4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/03 22:01:10 rillig Exp $
 
 DISTNAME=		gnuchess-4.0.pl80
 PKGNAME=		gnuchess4-4.0.80
@@ -13,12 +13,13 @@ CONFLICTS=		gnuchess-4.*
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		src
+BUILD_DIRS=		${CONFIGURE_DIRS}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuchess4
-	cd ${WRKSRC}/../doc; ${INSTALL_DATA} \
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} \
 		ARTICLE ARTICLE.2 CHESSTOOL FAQ HEURISTICS MOVE-GEN \
 		README.font README.output \
 		${PREFIX}/share/doc/gnuchess4
diff --git a/games/gnuchess4/distinfo b/games/gnuchess4/distinfo
index 4bbff87d814..fc52812631f 100644
--- a/games/gnuchess4/distinfo
+++ b/games/gnuchess4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/04/17 04:58:22 minskim Exp $
+$NetBSD: distinfo,v 1.5 2005/11/03 22:01:10 rillig Exp $
 
 SHA1 (gnuchess-4.0.pl80.tar.gz) = 0c581be2e7b6b17524e288e105a468a7ca328c8b
 RMD160 (gnuchess-4.0.pl80.tar.gz) = 889510f73c3e5143fc312c010e8324e68c11dcdc
 Size (gnuchess-4.0.pl80.tar.gz) = 1493280 bytes
-SHA1 (patch-aa) = 5536277956df81c31e7049e45fb9103dfa2aa58b
-SHA1 (patch-ab) = 0149bdbaa0cce03ce29274bbbe2346013e045382
-SHA1 (patch-ac) = e3a320bc8e6e40be3a136b0229ff228b09bbe7a1
-SHA1 (patch-ad) = 33e3f2fe7792d1bb0e17ffec3e4499341446a28b
-SHA1 (patch-ae) = 4c3a5aa4bedf06a7490676921071d974dd259d2e
-SHA1 (patch-af) = b032046200573807801c2855e3a186f23e2591a9
+SHA1 (patch-aa) = 0528b70c06a07ba17093bce467446899b2eaf2fd
+SHA1 (patch-ab) = 853b42df0871471047dddfb102841ad7d6e68499
+SHA1 (patch-ac) = 2d2ad394545b4eb4285389642c84872d4e0d9a25
+SHA1 (patch-ad) = 1fc8df5f7b34fd82fb43de71cdaf01ff5f72d51a
+SHA1 (patch-ae) = 31ed0b133d10457b89eaa09e56cdbd5b3a1b382b
+SHA1 (patch-af) = 220b368a8d2274419c9d173433a956ab5c0c96b4
diff --git a/games/gnuchess4/patches/patch-aa b/games/gnuchess4/patches/patch-aa
index 37782a99bf6..1b065cd48b4 100644
--- a/games/gnuchess4/patches/patch-aa
+++ b/games/gnuchess4/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/04/17 04:58:22 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 22:01:10 rillig Exp $
 
---- dspcom.c.orig	1998-09-28 01:41:19.000000000 -0500
-+++ dspcom.c
+--- src/dspcom.c.orig	1998-09-28 01:41:19.000000000 -0500
++++ src/dspcom.c
 @@ -1099,7 +1099,7 @@ InputCommand (void)
  #ifdef NONDSP
        s[0] = sx[0] = '\0';
diff --git a/games/gnuchess4/patches/patch-ab b/games/gnuchess4/patches/patch-ab
index 0abe7c9fe6b..7e26f8cd455 100644
--- a/games/gnuchess4/patches/patch-ab
+++ b/games/gnuchess4/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 22:01:10 rillig Exp $
 
---- gnuan.c.orig	Sat Apr  3 05:58:53 1999
-+++ gnuan.c	Wed Nov 17 23:57:25 1999
+--- src/gnuan.c.orig	Sat Apr  3 05:58:53 1999
++++ src/gnuan.c	Wed Nov 17 23:57:25 1999
 @@ -1348,12 +1348,12 @@
      fpout = stderr;
      fprintf (fpout, "Input the file with the algebraic moves of the game.\n");
diff --git a/games/gnuchess4/patches/patch-ac b/games/gnuchess4/patches/patch-ac
index ecce3c04705..81a10ce1e3e 100644
--- a/games/gnuchess4/patches/patch-ac
+++ b/games/gnuchess4/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 22:01:10 rillig Exp $
 
---- nondsp.c.orig	Mon Sep 28 08:41:22 1998
-+++ nondsp.c	Thu Dec 10 23:39:26 1998
+--- src/nondsp.c.orig	Mon Sep 28 08:41:22 1998
++++ src/nondsp.c	Thu Dec 10 23:39:26 1998
 @@ -264,10 +264,11 @@
  
    NewGame ();
diff --git a/games/gnuchess4/patches/patch-ad b/games/gnuchess4/patches/patch-ad
index f3f1ead26f2..6325fe4474b 100644
--- a/games/gnuchess4/patches/patch-ad
+++ b/games/gnuchess4/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 22:01:10 rillig Exp $
 
---- search.c.orig	Mon Sep 28 08:41:23 1998
-+++ search.c	Thu Dec 10 23:39:26 1998
+--- src/search.c.orig	Mon Sep 28 08:41:23 1998
++++ src/search.c	Thu Dec 10 23:39:26 1998
 @@ -174,7 +174,7 @@
        while (true)
  	{
diff --git a/games/gnuchess4/patches/patch-ae b/games/gnuchess4/patches/patch-ae
index 6182bfbf914..7fe5fdb6ca0 100644
--- a/games/gnuchess4/patches/patch-ae
+++ b/games/gnuchess4/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2000/03/27 10:25:01 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2005/11/03 22:01:10 rillig Exp $
 
---- Makefile.in.orig	Sun Sep 27 23:41:13 1998
-+++ Makefile.in	Sun Mar 26 16:15:23 2000
+--- src/Makefile.in.orig	Sun Sep 27 23:41:13 1998
++++ src/Makefile.in	Sun Mar 26 16:15:23 2000
 @@ -127,7 +127,7 @@
  
  prefix = @prefix@
diff --git a/games/gnuchess4/patches/patch-af b/games/gnuchess4/patches/patch-af
index 47986c278a3..e508614eaf5 100644
--- a/games/gnuchess4/patches/patch-af
+++ b/games/gnuchess4/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2000/03/27 10:25:25 jlam Exp $
+$NetBSD: patch-af,v 1.2 2005/11/03 22:01:10 rillig Exp $
 
---- ../doc/gnuchess.6.orig	Sun Sep 27 23:41:10 1998
-+++ ../doc/gnuchess.6	Sun Mar 26 16:17:18 2000
+--- doc/gnuchess.6.orig	Sun Sep 27 23:41:10 1998
++++ doc/gnuchess.6	Sun Mar 26 16:17:18 2000
 @@ -1,8 +1,8 @@
 -.TH gnuchess 6
 +.TH gnuchess4 6
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 6791b946915..734ee88dce2 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/08 13:39:21 martin Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/03 22:03:18 rillig Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
@@ -13,8 +13,9 @@ COMMENT=	Loderunner clone with sound for X11
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_IMAKE=	yes
+USE_IMAKE=		yes
+CONFIGURE_DIRS=		src
+BUILD_DIRS=		${CONFIGURE_DIRS}
 NO_INSTALL_MANPAGES=	yes
 
 CPPFLAGS+=	-DSOUNDDEV="\"${DEVOSSSOUND}\""
@@ -24,8 +25,8 @@ INSTALLATION_DIRS=	man/man6
 .include "../../mk/ossaudio.buildlink3.mk"
 
 post-install:
-	@ ${INSTALL_MAN} ${WRKSRC}/scavenger.6 ${PREFIX}/man/man6/
-	@ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger
-	@ ${INSTALL_MAN} ${WRKSRC}/../DOC ${PREFIX}/share/doc/scavenger
+	@${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/man/man6/
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger
+	@${INSTALL_MAN} ${WRKSRC}/DOC ${PREFIX}/share/doc/scavenger
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscavenger/PLIST b/games/xscavenger/PLIST
index cc6c355b7d9..8802558d387 100644
--- a/games/xscavenger/PLIST
+++ b/games/xscavenger/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/03 22:03:18 rillig Exp $
 bin/scavenger
 man/man6/scavenger.6
+share/doc/scavenger/DOC
 share/scavenger/badguy.lbm
 share/scavenger/brownblue.lbm
 share/scavenger/death.raw
@@ -14,6 +15,5 @@ share/scavenger/reddevil.lbm
 share/scavenger/regularguy.lbm
 share/scavenger/spiralthing.lbm
 share/scavenger/victory.raw
-@dirrm share/scavenger
-share/doc/scavenger/DOC
 @dirrm share/doc/scavenger
+@dirrm share/scavenger
diff --git a/games/xscavenger/distinfo b/games/xscavenger/distinfo
index 885158bac09..dee22419496 100644
--- a/games/xscavenger/distinfo
+++ b/games/xscavenger/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/09/08 13:39:21 martin Exp $
+$NetBSD: distinfo,v 1.7 2005/11/03 22:03:18 rillig Exp $
 
 SHA1 (xscavenger-1.4.4.tgz) = d9ef34d2ec1a9dfeca398004725cae4878bf9f2e
 RMD160 (xscavenger-1.4.4.tgz) = e410c86dbf406243cfac3d0f81ea83e79cdeab32
 Size (xscavenger-1.4.4.tgz) = 193346 bytes
-SHA1 (patch-aa) = 41145bdd7b44a53b0fea555e232915dc4a64f646
-SHA1 (patch-ab) = 64b844663ac8167f98751650b29b6faf1c126c53
-SHA1 (patch-ac) = b553b7925ac36cff519a049298346ddccf905101
-SHA1 (patch-ad) = f2586214c0e4fc65018d05830dc4fc75f8353b65
+SHA1 (patch-aa) = 8f4ef6a4fe58b5d4a395426b38bfc848d63ec582
+SHA1 (patch-ab) = aba4113a688f295a1a318c07be607cedecd1fb9a
+SHA1 (patch-ac) = dd92d176417b90dc2c8330cc9c6f222692133219
+SHA1 (patch-ad) = 5fb24c9bdfba0e87e4bf491695180728bc7b5e63
diff --git a/games/xscavenger/patches/patch-aa b/games/xscavenger/patches/patch-aa
index 1bc53d35942..9d960e5d9f0 100644
--- a/games/xscavenger/patches/patch-aa
+++ b/games/xscavenger/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/04/09 00:10:25 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 22:03:18 rillig Exp $
 
---- sound.c.orig	2002-12-02 00:03:54.000000000 -0600
-+++ sound.c
+--- src/sound.c.orig	2002-12-02 00:03:54.000000000 -0600
++++ src/sound.c
 @@ -5,7 +5,7 @@
  #include <unistd.h>
  #include <fcntl.h>
diff --git a/games/xscavenger/patches/patch-ab b/games/xscavenger/patches/patch-ab
index c3126718500..df2a1fa8cb2 100644
--- a/games/xscavenger/patches/patch-ab
+++ b/games/xscavenger/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2004/04/09 00:10:25 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/03 22:03:18 rillig Exp $
 
---- Imakefile.orig	Thu Jan  6 06:47:22 2000
-+++ Imakefile	Sat Jan  8 18:10:48 2000
+--- src/Imakefile.orig	Thu Jan  6 06:47:22 2000
++++ src/Imakefile	Sat Jan  8 18:10:48 2000
 @@ -1,7 +1,7 @@
  # set this to the path where data files should be stored.  LIBDIR
  # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
diff --git a/games/xscavenger/patches/patch-ac b/games/xscavenger/patches/patch-ac
index d0c84a3fbbe..249ea14a238 100644
--- a/games/xscavenger/patches/patch-ac
+++ b/games/xscavenger/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2005/09/08 13:39:21 martin Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 22:03:18 rillig Exp $
 
---- scav.c.orig	2002-02-10 01:35:36.000000000 +0100
-+++ scav.c	2005-09-08 14:53:03.000000000 +0200
+--- src/scav.c.orig	2002-02-10 01:35:36.000000000 +0100
++++ src/scav.c	2005-09-08 14:53:03.000000000 +0200
 @@ -240,17 +240,18 @@ void *configtab[]=
  
  
diff --git a/games/xscavenger/patches/patch-ad b/games/xscavenger/patches/patch-ad
index a2cfe53ea4b..b52a672368c 100644
--- a/games/xscavenger/patches/patch-ad
+++ b/games/xscavenger/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/09/08 13:39:21 martin Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 22:03:18 rillig Exp $
 
---- scav.h.orig	2001-01-10 17:10:22.000000000 +0100
-+++ scav.h	2005-09-08 14:52:08.000000000 +0200
+--- src/scav.h.orig	2001-01-10 17:10:22.000000000 +0100
++++ src/scav.h	2005-09-08 14:52:08.000000000 +0200
 @@ -383,7 +383,7 @@ extern uchar ibuff[IBUFFLEN];
  extern uchar *getgfx();