Fixed wrong use of WRKSRC.

4 files changed, 20 insertions, 19 deletions

diff --git a/biology/xylem/Makefile b/biology/xylem/Makefile
index 8e7bab5d9d6..4b78427b44d 100644
--- a/biology/xylem/Makefile
+++ b/biology/xylem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/03 19:52:44 rillig Exp $
 #
 
 DISTNAME=		xylem.1.8.7
@@ -11,27 +11,28 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://home.cc.umanitoba.ca/~psgendb/XYLEM.html
 COMMENT=		Tools for manipulation of genetic databases
 
-WRKSRC=                 ${WRKDIR}/xylem/src.c
+WRKSRC=                 ${WRKDIR}/xylem
+BUILD_DIRS=		src.c # yes, it's a directory
 INSTALLATION_DIRS=	bin
 
 do-configure:
-	${CP} ${WRKSRC}/p2c.h.standard ${WRKSRC}/p2c.h
+	${CP} ${WRKSRC}/src.c/p2c.h.standard ${WRKSRC}/src.c/p2c.h
 
 # Rename some binaries to avoid confusion with base system or conflicts
 post-build:
-	${RM} -f ${WRKSRC}/../test/testxylem.csh.orig
-	${MV} ${WRKSRC}/identify ${WRKSRC}/xyl-identify
-	${MV} ${WRKSRC}/shuffle ${WRKSRC}/xyl-shuffle
+	${RM} -f ${WRKSRC}/test/testxylem.csh.orig
+	${MV} ${WRKSRC}/src.c/identify ${WRKSRC}/src.c/xyl-identify
+	${MV} ${WRKSRC}/src.c/shuffle ${WRKSRC}/src.c/xyl-shuffle
 
 do-install:
 .for PROGRAM in dbstat getloc getob xyl-identify prot2nuc reform ribosome \
 	splitdb xyl-shuffle flat2phyl phyl2flat
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROGRAM} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src.c/${PROGRAM} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xylem
-	${INSTALL_DATA} ${WRKSRC}/../doc/* ${PREFIX}/share/doc/xylem/
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/xylem/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xylem
-	${INSTALL_DATA} ${WRKSRC}/../test/sample.* ${PREFIX}/share/examples/xylem
-	${INSTALL_SCRIPT} ${WRKSRC}/../test/testxylem.csh ${PREFIX}/share/examples/xylem
+	${INSTALL_DATA} ${WRKSRC}/test/sample.* ${PREFIX}/share/examples/xylem
+	${INSTALL_SCRIPT} ${WRKSRC}/test/testxylem.csh ${PREFIX}/share/examples/xylem
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/biology/xylem/distinfo b/biology/xylem/distinfo
index 56a3e6d5fd2..388648a7a15 100644
--- a/biology/xylem/distinfo
+++ b/biology/xylem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/22 21:28:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/03 19:52:44 rillig Exp $
 
 SHA1 (xylem.1.8.7.tar.Z) = 7816507d576448ff15659fef744dd27cc64562f5
 RMD160 (xylem.1.8.7.tar.Z) = ae20e3b3492d1c68371abd533f675c79930768eb
 Size (xylem.1.8.7.tar.Z) = 417985 bytes
-SHA1 (patch-aa) = 10d990c940e4283e8dad1e3280b9abd70f0300d0
-SHA1 (patch-ab) = 8c45aa95e082a64b2ca6a4049fe6a57ce1cb42d5
+SHA1 (patch-aa) = f1016cd5d7d2d25ae564fca4fb7d859d8e01fdb7
+SHA1 (patch-ab) = e3c6e99c4db0566bb4d7ba1a1fee824bde693b05
diff --git a/biology/xylem/patches/patch-aa b/biology/xylem/patches/patch-aa
index 7dc52e93605..862dc347779 100644
--- a/biology/xylem/patches/patch-aa
+++ b/biology/xylem/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/04 19:13:31 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 19:52:44 rillig Exp $
 
---- ../test/testxylem.csh.orig	2001-08-18 16:31:51.000000000 -0400
-+++ ../test/testxylem.csh	2003-09-28 17:29:21.000000000 -0400
+--- test/testxylem.csh.orig	2001-08-18 16:31:51.000000000 -0400
++++ test/testxylem.csh	2003-09-28 17:29:21.000000000 -0400
 @@ -10,13 +10,12 @@
  # set default parameters
  #####################################################################
diff --git a/biology/xylem/patches/patch-ab b/biology/xylem/patches/patch-ab
index 274bffe0159..e2b48503955 100644
--- a/biology/xylem/patches/patch-ab
+++ b/biology/xylem/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/10/04 19:13:33 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 19:52:44 rillig Exp $
 
---- Makefile.orig	2000-08-17 12:17:18.000000000 -0400
-+++ Makefile	2003-09-28 17:05:26.000000000 -0400
+--- src.c/Makefile.orig	2000-08-17 12:17:18.000000000 -0400
++++ src.c/Makefile	2003-09-28 17:05:26.000000000 -0400
 @@ -6,9 +6,9 @@
  LDLIB = .
  LIBOBJS = p2clib.o