Fixed wrong use of WRKSRC.

12 files changed, 46 insertions, 45 deletions

diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile
index 5ca94ae08cc..cb9c1d3f654 100644
--- a/emulators/swarm/Makefile
+++ b/emulators/swarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/03 21:51:57 rillig Exp $
 #
 
 DISTNAME=	swarm-0.61
@@ -9,13 +9,14 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.cl.cam.ac.uk/~mwd24/phd/swarm.html
 COMMENT=	Software arm7M core emulator
 
-WRKSRC=		${WRKDIR}/swarm/src
+WRKSRC=		${WRKDIR}/swarm
+BUILD_DIRS=	src
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/swarm ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm
-	${INSTALL_DATA} ${WRKSRC}/../doc/swarm.pdf ${PREFIX}/share/doc/swarm
+	${INSTALL_DATA} ${WRKSRC}/doc/swarm.pdf ${PREFIX}/share/doc/swarm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/swarm/distinfo b/emulators/swarm/distinfo
index 7eb3f7a0de3..e72a0ffad4f 100644
--- a/emulators/swarm/distinfo
+++ b/emulators/swarm/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 18:49:21 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/11/03 21:51:57 rillig Exp $
 
 SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c
 RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511
 Size (swarm-0.61.tar.gz) = 395061 bytes
-SHA1 (patch-aa) = 47bf38f1f6ffde193d4bbe03c8968c92ab66d406
-SHA1 (patch-ab) = 9859132762130859692614242f32022750db5a3f
-SHA1 (patch-ac) = 57f5103fde8c1380ddd78c58dfd57c5368d92bfd
-SHA1 (patch-ad) = a5a46138f385875511434f342654ad5e234f6647
-SHA1 (patch-ae) = 5b42d3332b6e1a7f5c8e94fa54007444a9de92b5
-SHA1 (patch-af) = 28479b4dd547cf55f4fb3968846140abf8f2dd5d
-SHA1 (patch-ag) = c20ab04004bfe2982376c03b8411b698e6ba275f
-SHA1 (patch-ah) = 806ce24ca3048953aa11f9c228c7cd759acc28c6
-SHA1 (patch-ai) = 03c5cf845928361926fec3983a8c2c3bdd1c449f
-SHA1 (patch-aj) = ab261d34eda8b8f7307fb40e798205515169ddea
+SHA1 (patch-aa) = 65da2134c0d99930412e60fbb3e0f299d3982113
+SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb
+SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3
+SHA1 (patch-ad) = bee100f2ed6311153f4286fc88c4a7dd98f3efb8
+SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754
+SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22
+SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1
+SHA1 (patch-ah) = 94d58bdd8d48e73f49ef06ac90eb0a9b0e1af6db
+SHA1 (patch-ai) = 51b43a6b560566447d588623b19d3da6ab7b4ade
+SHA1 (patch-aj) = 227b459e8201320679d3484daa163a5a5c579b17
diff --git a/emulators/swarm/patches/patch-aa b/emulators/swarm/patches/patch-aa
index b827e2b5475..3eea0de9b7e 100644
--- a/emulators/swarm/patches/patch-aa
+++ b/emulators/swarm/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2003/08/14 09:31:40 agc Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/03 21:51:57 rillig Exp $
 
 fix tests for endianness and use our own header files to get
 int64_t and uint64_t
 
---- swarm_types.h.orig	Tue Apr 10 09:46:10 2001
-+++ swarm_types.h
+--- src/swarm_types.h.orig	Tue Apr 10 09:46:10 2001
++++ src/swarm_types.h
 @@ -26,9 +26,10 @@
  #ifndef __SWARM_TYPES_H__
  #define __SWARM_TYPES_H__
diff --git a/emulators/swarm/patches/patch-ab b/emulators/swarm/patches/patch-ab
index 4b823b4bbe3..a206c2798b0 100644
--- a/emulators/swarm/patches/patch-ab
+++ b/emulators/swarm/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2003/08/14 09:31:40 agc Exp $
+$NetBSD: patch-ab,v 1.4 2005/11/03 21:51:57 rillig Exp $
 
---- Makefile.orig	Wed Apr 11 17:43:07 2001
-+++ Makefile
+--- src/Makefile.orig	Wed Apr 11 17:43:07 2001
++++ src/Makefile
 @@ -22,10 +22,10 @@
  #
  ###############################################################################
diff --git a/emulators/swarm/patches/patch-ac b/emulators/swarm/patches/patch-ac
index f1455bbe3cd..e15561b05a1 100644
--- a/emulators/swarm/patches/patch-ac
+++ b/emulators/swarm/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2002/04/01 05:50:46 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- isa_be.h.orig	Mon Nov  6 12:38:08 2000
-+++ isa_be.h	Mon Apr  1 00:43:50 2002
+--- src/isa_be.h.orig	Mon Nov  6 12:38:08 2000
++++ src/isa_be.h	Mon Apr  1 00:43:50 2002
 @@ -190,5 +190,5 @@
    uint32_t p     : 1;
    uint32_t u     : 1;
diff --git a/emulators/swarm/patches/patch-ad b/emulators/swarm/patches/patch-ad
index ed7accdf64a..adc4e02cb46 100644
--- a/emulators/swarm/patches/patch-ad
+++ b/emulators/swarm/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2003/08/14 09:31:40 agc Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- uartctrl.cpp	2003/08/14 08:54:51	1.1
-+++ uartctrl.cpp	2003/08/14 09:15:14
+--- src/uartctrl.cpp	2003/08/14 08:54:51	1.1
++++ src/uartctrl.cpp	2003/08/14 09:15:14
 @@ -40,6 +40,29 @@
  //
  int CUARTCtrl::GetPty()
diff --git a/emulators/swarm/patches/patch-ae b/emulators/swarm/patches/patch-ae
index 27a302d94f5..a96cf175c1c 100644
--- a/emulators/swarm/patches/patch-ae
+++ b/emulators/swarm/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- core.cpp	2004/08/12 17:16:45	1.1
-+++ core.cpp	2004/08/12 17:17:18
+--- src/core.cpp	2004/08/12 17:16:45	1.1
++++ src/core.cpp	2004/08/12 17:17:18
 @@ -26,7 +26,7 @@
  #include "core.h"
  #include "isa.h"
diff --git a/emulators/swarm/patches/patch-af b/emulators/swarm/patches/patch-af
index b4ab3a0b87a..51513e7266e 100644
--- a/emulators/swarm/patches/patch-af
+++ b/emulators/swarm/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-af,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- main.cpp	2004/08/12 18:28:49	1.1
-+++ main.cpp	2004/08/12 18:29:57
+--- src/main.cpp	2004/08/12 18:28:49	1.1
++++ src/main.cpp	2004/08/12 18:29:57
 @@ -34,11 +34,13 @@
  #endif
  #include "cache.h"
diff --git a/emulators/swarm/patches/patch-ag b/emulators/swarm/patches/patch-ag
index 0dfa76e7e9b..f0a46bbef7b 100644
--- a/emulators/swarm/patches/patch-ag
+++ b/emulators/swarm/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-ag,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- syscopro.cpp	2004/08/12 18:34:07	1.1
-+++ syscopro.cpp	2004/08/12 18:37:39
+--- src/syscopro.cpp	2004/08/12 18:34:07	1.1
++++ src/syscopro.cpp	2004/08/12 18:37:39
 @@ -26,10 +26,12 @@
  #include "syscopro.h"
  #include <string.h>
diff --git a/emulators/swarm/patches/patch-ah b/emulators/swarm/patches/patch-ah
index 42ac234a9dc..36a8add64a5 100644
--- a/emulators/swarm/patches/patch-ah
+++ b/emulators/swarm/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-ah,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- armproc.h	2004/08/12 18:45:56	1.1
-+++ armproc.h	2004/08/12 18:46:08
+--- src/armproc.h	2004/08/12 18:45:56	1.1
++++ src/armproc.h	2004/08/12 18:46:08
 @@ -29,7 +29,7 @@
  #include "core.h"
  #include "cache.h"
diff --git a/emulators/swarm/patches/patch-ai b/emulators/swarm/patches/patch-ai
index dc101d30b8c..3c52ea6f61f 100644
--- a/emulators/swarm/patches/patch-ai
+++ b/emulators/swarm/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-ai,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- alu.cpp	2004/08/12 18:49:18	1.1
-+++ alu.cpp	2004/08/12 18:49:37
+--- src/alu.cpp	2004/08/12 18:49:18	1.1
++++ src/alu.cpp	2004/08/12 18:49:37
 @@ -24,7 +24,9 @@
  
  #include "swarm.h"
diff --git a/emulators/swarm/patches/patch-aj b/emulators/swarm/patches/patch-aj
index 884e7b96151..b719fe18469 100644
--- a/emulators/swarm/patches/patch-aj
+++ b/emulators/swarm/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2004/08/12 19:59:51 agc Exp $
+$NetBSD: patch-aj,v 1.2 2005/11/03 21:51:57 rillig Exp $
 
---- libc.cpp	2004/08/12 18:49:18	1.1
-+++ libc.cpp	2004/08/12 18:50:21
+--- src/libc.cpp	2004/08/12 18:49:18	1.1
++++ src/libc.cpp	2004/08/12 18:50:21
 @@ -31,12 +31,14 @@
  #endif
  #include <fcntl.h>