Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

7 files changed, 14 insertions, 17 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 0f0716c7a3b..115319905b2 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/08/17 05:59:00 tron Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:14 jmmv Exp $
 #
 
 DISTNAME=	boolean
 PKGNAME=	boolean-${REL}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/boolean/${REL}/linux
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://www.xs4all.nl/~kholwerd/download/boolzip/
 EXTRACT_SUFX=	.zip
@@ -20,7 +21,6 @@ REL=		6.2
 # This package cannot be built with g++ 2.95.3.
 ONLY_FOR_PLATFORM=	NetBSD-1.[45]*-*
 
-WRKSRC=		${WRKDIR}/boolean/${REL}/linux
 MAKEFILE=	makefile.gui
 PLIST_SUBST=	REL=${REL}
 
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index d71a768d462..bba9e3b413b 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/09/21 06:31:42 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:40:14 jmmv 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
@@ -11,7 +12,6 @@ HOMEPAGE=		http://felt.sourceforge.net/
 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
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 964518fd3d2..4a2076ad2f1 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:15 jmmv 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,7 +19,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index edcbb5eb231..1bbd520e8f3 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/01/24 15:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:15 jmmv 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/
 
@@ -17,7 +18,6 @@ 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 ba0d796368e..a9267356ace 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2002/09/21 06:44:35 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:15 jmmv 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
@@ -26,8 +27,6 @@ USE_GNU_READLINE=	uses rl_* interface
 #PATCH_SITES=	ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/
 #PATCHFILES=	grid.patch newcoms.patch spsmp.patch
 
-WRKSRC=		${WRKDIR}
-
 post-extract:
 	${CP} ${FILESDIR}/NetBSD ${WRKSRC}/conf
 
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index 4bbe10da96e..9f102136e38 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/10 14:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:15 jmmv Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
+WRKSRC=			${WRKDIR}
 CATEGORIES=		cad editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from
@@ -11,8 +12,6 @@ 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 5237d424588..7650186022a 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/02/26 03:40:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:16 jmmv Exp $
 
 DISTNAME=	xcircuit-2.2.0
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
@@ -9,8 +10,6 @@ MAINTAINER=	packages@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
 USE_IMAKE=	yes