Fixed wrong usage of WRKSRC.

10 files changed, 38 insertions, 37 deletions

diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 4f5884131c7..9de641503dc 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/29 15:04:21 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/03 19:56:36 rillig Exp $
 #
 
 DISTNAME=	simian_12_98
@@ -20,15 +20,16 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 USE_LANGUAGES=		c++
 GCC_REQD=		3.0
 
-WRKSRC=		${WRKDIR}/Simian/src
+WRKSRC=		${WRKDIR}/Simian
+BUILD_DIRS=	src
 
 BUILD_TARGET=	simian
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/simian ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/simian ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/simian
-	${INSTALL_DATA} ${WRKSRC}/../examples/* ${PREFIX}/share/examples/simian
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/simian
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/simian/distinfo b/cad/simian/distinfo
index 4b31d6d62f4..f12a9dddee4 100644
--- a/cad/simian/distinfo
+++ b/cad/simian/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.3 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 19:56:36 rillig Exp $
 
 SHA1 (simian_12_98.tar.gz) = c7d57087a397970b05195f497c98a058cea1a93a
 RMD160 (simian_12_98.tar.gz) = 3eecb229dd1fb3c761ee30c9d053673a45782170
 Size (simian_12_98.tar.gz) = 18474 bytes
-SHA1 (patch-aa) = fa43e88db6902537114d49ff0f14d420927c50e1
-SHA1 (patch-ab) = 7efafa8a96615697361b23a449112b15bcf6a178
-SHA1 (patch-ac) = bc391a8264946bb66a86801f99db597b89f07800
-SHA1 (patch-ad) = cfecf1e29df43a5034e7ec8f5f6f260396327b3f
-SHA1 (patch-ae) = 701700e5b254504d83989479a7948ba49b71a6c4
-SHA1 (patch-af) = 69489c7a8f78f8f9649ae681dea6fd8d7722cbb1
-SHA1 (patch-ag) = 6d7560439e13613f54e3a04ef7c6bd6813d5e890
-SHA1 (patch-ah) = 57cd20aa8da97f305f12d717394f1cdbaccf95c0
+SHA1 (patch-aa) = 25b5b63e26478b31956f902eaffd4976d09e1448
+SHA1 (patch-ab) = 46c10535420ac625b7548e3b663ef9174d9c34b2
+SHA1 (patch-ac) = 06440a4718542b0c97079d2d47a00a917016510a
+SHA1 (patch-ad) = e94d69600ef57e16a4d552e2c7e5d152f710c122
+SHA1 (patch-ae) = fe34cacf05054a3e8465815aab67eda2e07d9432
+SHA1 (patch-af) = 75830be229798faa340f4db9f3fdc2effe30420b
+SHA1 (patch-ag) = eb94c6b84b55a4a5441953a6031354732f0a5b6c
+SHA1 (patch-ah) = 853f89961f53b3bd1605d6e9ec15790ef09ca3a6
diff --git a/cad/simian/patches/patch-aa b/cad/simian/patches/patch-aa
index 8eff5c7ce5f..01aafa8d2d0 100644
--- a/cad/simian/patches/patch-aa
+++ b/cad/simian/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/28 02:36:35 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 19:56:36 rillig Exp $
 
---- Makefile.orig	Mon Dec  7 03:28:52 1998
-+++ Makefile		Fri Apr 27 17:09:20 2001
+--- src/Makefile.orig	Mon Dec  7 03:28:52 1998
++++ src/Makefile		Fri Apr 27 17:09:20 2001
 @@ -1,6 +1,4 @@
  
 -SHELL = /bin/csh
diff --git a/cad/simian/patches/patch-ab b/cad/simian/patches/patch-ab
index dbfc4726f67..6d58aa782a3 100644
--- a/cad/simian/patches/patch-ab
+++ b/cad/simian/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/03 19:56:36 rillig Exp $
 
---- main.cc.orig	1998-12-10 10:56:19.000000000 +0000
-+++ main.cc
+--- src/main.cc.orig	1998-12-10 10:56:19.000000000 +0000
++++ src/main.cc
 @@ -1,6 +1,7 @@
  /* Main program, prints out all the results */
  /* written and modified by Emre Tuncer and Sangwoo Kim */
diff --git a/cad/simian/patches/patch-ac b/cad/simian/patches/patch-ac
index ca92a1a36bc..a7efec1bcf7 100644
--- a/cad/simian/patches/patch-ac
+++ b/cad/simian/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.3 2005/11/03 19:56:36 rillig Exp $
 
---- plane.cc.orig	1998-12-07 08:28:51.000000000 +0000
-+++ plane.cc
+--- src/plane.cc.orig	1998-12-07 08:28:51.000000000 +0000
++++ src/plane.cc
 @@ -1,6 +1,7 @@
  /* Ribbon segmentation on ground plane */
  #include <math.h>
diff --git a/cad/simian/patches/patch-ad b/cad/simian/patches/patch-ad
index 2fa1c2cc96d..ed663bab651 100644
--- a/cad/simian/patches/patch-ad
+++ b/cad/simian/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.3 2005/11/03 19:56:36 rillig Exp $
 
---- reader.cc.orig	1998-12-10 09:02:44.000000000 +0000
-+++ reader.cc
+--- src/reader.cc.orig	1998-12-10 09:02:44.000000000 +0000
++++ src/reader.cc
 @@ -1,6 +1,9 @@
  /* Reading Input Geometry */
 -#include <iostream.h>
diff --git a/cad/simian/patches/patch-ae b/cad/simian/patches/patch-ae
index c0ea9604f5a..b36f4a79190 100644
--- a/cad/simian/patches/patch-ae
+++ b/cad/simian/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 19:56:36 rillig Exp $
 
---- Zs.cc.orig	1998-12-07 08:28:51.000000000 +0000
-+++ Zs.cc
+--- src/Zs.cc.orig	1998-12-07 08:28:51.000000000 +0000
++++ src/Zs.cc
 @@ -1,6 +1,6 @@
  /* EII for Plane wave model */
  
diff --git a/cad/simian/patches/patch-af b/cad/simian/patches/patch-af
index 56644e6f965..8c61266d7d7 100644
--- a/cad/simian/patches/patch-af
+++ b/cad/simian/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2005/11/03 19:56:36 rillig Exp $
 
---- surfer1.cc.orig	1998-12-10 10:10:46.000000000 +0000
-+++ surfer1.cc
+--- src/surfer1.cc.orig	1998-12-10 10:10:46.000000000 +0000
++++ src/surfer1.cc
 @@ -2,8 +2,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/cad/simian/patches/patch-ag b/cad/simian/patches/patch-ag
index a9de57dce94..28e639cd7e8 100644
--- a/cad/simian/patches/patch-ag
+++ b/cad/simian/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2005/11/03 19:56:36 rillig Exp $
 
---- linklist.cc.orig	1998-12-07 08:28:51.000000000 +0000
-+++ linklist.cc
+--- src/linklist.cc.orig	1998-12-07 08:28:51.000000000 +0000
++++ src/linklist.cc
 @@ -1,12 +1,13 @@
 +#include <iostream>
 +#include <sstream>
diff --git a/cad/simian/patches/patch-ah b/cad/simian/patches/patch-ah
index 052740dfe4a..2b2cee38855 100644
--- a/cad/simian/patches/patch-ah
+++ b/cad/simian/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2005/03/21 17:35:53 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2005/11/03 19:56:36 rillig Exp $
 
---- ../include/linear.cc.orig	1998-12-07 08:28:52.000000000 +0000
-+++ ../include/linear.cc
+--- include/linear.cc.orig	1998-12-07 08:28:52.000000000 +0000
++++ include/linear.cc
 @@ -10,7 +10,8 @@
   ** Modification includes new memory allocation scheme and    **
   ** LU decomposition                                          **