Fixed wrong use of WRKSRC.

6 files changed, 24 insertions, 22 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index e02b9e7cb87..8d679912f96 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/13 12:07:34 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/03 21:34:23 rillig Exp $
 
 DISTNAME=	BasiliskII_src_22032005
 PKGNAME=	BasiliskII-1.0.20050322
@@ -10,23 +10,25 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gwenole.beauchesne.online.fr/basilisk2/
 COMMENT=	Open Source 68k Macintosh emulator
 
-WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
+WRKSRC=			${WRKDIR}/BasiliskII-1.0
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		src/Unix
 CONFIGURE_ARGS+=	--disable-fbdev-dga
 CONFIGURE_ARGS+=	--enable-addressing=banks
 CONFIGURE_ARGS+=	--without-mon
 # disable gnome support, or configure will break if gnome-libs is installed
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG=no
+BUILD_DIRS=		${CONFIGURE_DIRS}
 
 .include "options.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII
-	${INSTALL_DATA} ${WRKSRC}/../../README ${PREFIX}/share/doc/BasiliskII/
-	${INSTALL_DATA} ${WRKSRC}/../../TECH ${PREFIX}/share/doc/BasiliskII/
-	${INSTALL_DATA} ${WRKSRC}/../../TODO ${PREFIX}/share/doc/BasiliskII/
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/BasiliskII/
+	${INSTALL_DATA} ${WRKSRC}/TECH ${PREFIX}/share/doc/BasiliskII/
+	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/BasiliskII/
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo
index fa2b485bd7b..64ae8751e09 100644
--- a/emulators/BasiliskII/distinfo
+++ b/emulators/BasiliskII/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/07/01 12:34:32 adam Exp $
+$NetBSD: distinfo,v 1.10 2005/11/03 21:34:23 rillig Exp $
 
 SHA1 (BasiliskII_src_22032005.tar.bz2) = e6c6efe9dded3e50b204fc641f42d15447819109
 RMD160 (BasiliskII_src_22032005.tar.bz2) = 6fac78005ed8a8794c192a07d36285a68ad1ccfa
 Size (BasiliskII_src_22032005.tar.bz2) = 914468 bytes
-SHA1 (patch-aa) = f1ddf3941a45e09dc2ec75a24939261387e35142
-SHA1 (patch-ab) = 3bbc87e42cdae430097483401a0d3b032a746185
-SHA1 (patch-ac) = 61804c0ff4778964241a5ae4d73ea1d4f09e13e2
-SHA1 (patch-ad) = 374d361b8aadcb31aa85e673b1b9ff0947f491dd
+SHA1 (patch-aa) = d1886fa85a58c2974ad355e6d8eb73cc611316bf
+SHA1 (patch-ab) = 462964cfa794f6ad97774fef525a9f210bd99d1b
+SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15
+SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6
diff --git a/emulators/BasiliskII/patches/patch-aa b/emulators/BasiliskII/patches/patch-aa
index 53189bdd9e2..479beb3aaae 100644
--- a/emulators/BasiliskII/patches/patch-aa
+++ b/emulators/BasiliskII/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 21:34:23 rillig Exp $
 
---- ../dummy/ether_dummy.cpp.orig	2005-07-01 12:04:04.000000000 +0000
-+++ ../dummy/ether_dummy.cpp
+--- src/dummy/ether_dummy.cpp.orig	2005-07-01 12:04:04.000000000 +0000
++++ src/dummy/ether_dummy.cpp
 @@ -173,7 +173,7 @@ void EtherInterrupt(void)
  			length = recvfrom(fd, packet, 1514, 0, (struct sockaddr *)&from, &from_len);
  			if (length < 14)
diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab
index b8d27441ed0..d980016344b 100644
--- a/emulators/BasiliskII/patches/patch-ab
+++ b/emulators/BasiliskII/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/03 21:34:23 rillig Exp $
 
---- video_x.cpp.orig	2005-03-21 23:57:34.000000000 +0000
-+++ video_x.cpp
+--- src/Unix/video_x.cpp.orig	2005-03-21 23:57:34.000000000 +0000
++++ src/Unix/video_x.cpp
 @@ -2288,7 +2288,7 @@ static void update_display_dynamic(int t
  static void update_display_static(driver_window *drv)
  {
diff --git a/emulators/BasiliskII/patches/patch-ac b/emulators/BasiliskII/patches/patch-ac
index 5e36fd70df5..925c149343b 100644
--- a/emulators/BasiliskII/patches/patch-ac
+++ b/emulators/BasiliskII/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/03 21:34:23 rillig Exp $
 
---- vm_alloc.cpp.orig	2005-01-30 21:42:14.000000000 +0000
-+++ vm_alloc.cpp
+--- src/Unix/vm_alloc.cpp.orig	2005-01-30 21:42:14.000000000 +0000
++++ src/Unix/vm_alloc.cpp
 @@ -39,6 +39,7 @@
  #include "vm_alloc.h"
  
diff --git a/emulators/BasiliskII/patches/patch-ad b/emulators/BasiliskII/patches/patch-ad
index de788635c85..99e517f7fd8 100644
--- a/emulators/BasiliskII/patches/patch-ad
+++ b/emulators/BasiliskII/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/03 21:34:23 rillig Exp $
 
---- sshpty.c.orig	2003-08-17 10:20:22.000000000 +0000
-+++ sshpty.c
+--- src/Unix/sshpty.c.orig	2003-08-17 10:20:22.000000000 +0000
++++ src/Unix/sshpty.c
 @@ -18,6 +18,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/
  /* Selections from openssh's "includes.h" */
  #include "config.h"