Move WRKSRC definition away from the first paragraph in a Makefile.

11 files changed, 24 insertions, 22 deletions

diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 26e7deabe71..71a7e50238f 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:32:10 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=		eagle-4.09r2e
 PKGNAME=		eagle-4.09r2
-WRKSRC=			${WRKDIR}/${DISTNAME:C/.$//}
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.cadsoft.de/pub/program/4.09r2/
 EXTRACT_SUFX=		.tgz
@@ -24,6 +23,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/.$//}
 NO_BUILD=		YES
 
 do-configure:
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index a3d4891e2eb..5a0106a7d18 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:02 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	fastcap-2.0-15Jul92
 PKGNAME=	fastcap-2.0.19920715
-WRKSRC=		${WRKDIR}/fastcap
 CATEGORIES=	cad
 MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fastcap/ \
 		ftp://rle-vlsi.mit.edu/pub/fastcap/postscript/
@@ -19,6 +18,7 @@ COMMENT=	Fast 3-D capacitance solver
 DIST_SUBDIR=	fastcap
 EXTRACT_ONLY=	fastcap-2.0-15Jul92.tar.Z
 
+WRKSRC=		${WRKDIR}/fastcap
 USE_BUILDLINK2=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 65d36b31776..483e11b4478 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/09/17 19:40:03 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
 PKGNAME=	fasthenry-3.0.19961112
-WRKSRC=		${WRKDIR}/fasthenry-3.0
 CATEGORIES=	cad
 MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fasthenry/
 EXTRACT_SUFX=	.tar.Z
@@ -19,6 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/fasthenry-3.0
 USE_BUILDLINK2=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index d2bdfe1d67e..44cda734171 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:24:54 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:09:09 agc Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
-WRKSRC=			${WRKDIR}/FElt-3.05
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/felt/
 DISTFILES=		felt-3.05.src.tar.gz felt-3.05.ps.gz
@@ -13,6 +12,7 @@ COMMENT=		Free system for introductory level finite element analysis
 
 EXTRACT_ONLY=		felt-3.05.src.tar.gz
 
+WRKSRC=			${WRKDIR}/FElt-3.05
 USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
 XAW_TYPE?=		3d
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 039f7fb5412..49970e3d343 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/02 18:11:06 reinoud Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:09:09 agc Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=qcad/}
 
@@ -11,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 4c9f037fd27..374141371fa 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:21 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	simian_man_12_98
 PKGNAME=	simian-docs-2.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_mnl_ps_pdf/
 EXTRACT_SUFX=	.pdf
@@ -18,6 +17,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 6659ab3aa9f..fd71085cb98 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:25:21 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	simian_12_98
 PKGNAME=	simian-2.1
-WRKSRC=		${WRKDIR}/Simian/src
 CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/CODE_RQST/
 
@@ -18,6 +17,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/Simian/src
+
 ALL_TARGET=	simian
 
 INTERACTIVE_STAGE=	fetch
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 338fa63e844..d45d88ac393 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 21:25:22 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:09:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
 #
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
 EXTRACT_SUFX=   .tar.Z
@@ -17,6 +16,7 @@ CONFLICTS=	ng-spice-[0-9]*
 
 BUILDLINK_DEPENDS.readline=	readline>=4.0
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_GNU_READLINE=	uses rl_* interface
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile
index 03b15efe185..72679c56c5f 100644
--- a/cad/spiceprm/Makefile
+++ b/cad/spiceprm/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:25:23 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	spiceprm-0.11
-WRKSRC=		${WRKDIR}/spiceprm
 CATEGORIES=	cad
 MASTER_SITES=	http://metalab.unc.edu/pub/Linux/apps/circuits/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Spice preprocessor for parameterized subcircuits
 
+WRKSRC=			${WRKDIR}/spiceprm
 USE_BUILDLINK2=		YES
 NO_BUILD=		YES
 REPLACE_PERL=		spiceprm
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index 2f988a34b42..be1588d93f6 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:28 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:10 agc Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
-WRKSRC=			${WRKDIR}
 CATEGORIES=		cad editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from
@@ -12,6 +11,8 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.verilog.com/verilog-mode.html
 COMMENT=		Verilog mode for Emacs
 
+WRKSRC=			${WRKDIR}
+
 .include "../../mk/emacs.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 0df318c1c3c..2051ac5e958 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2003/08/31 02:02:30 jtb Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:09:10 agc Exp $
 
 DISTNAME=	xcircuit-3.1.19
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/
 COMMENT=	Drawing program for X11 (especially for circuits)
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcl