Fixed wrong use of WRKSRC.

7 files changed, 27 insertions, 26 deletions

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();