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

40 files changed, 81 insertions, 80 deletions

diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index 00dad0467ad..ae9cc0dd3dc 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.5 2003/12/03 12:05:18 markd Exp $
+# $NetBSD: Makefile.extension,v 1.6 2004/01/20 12:20:04 agc Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -10,7 +10,6 @@
 
 DISTNAME?=		${R_PKGNAME}_${R_PKGVER}
 PKGNAME?=		R-${R_PKGNAME}-${R_PKGVER:S/-/./}
-WRKSRC=         	${WRKDIR}/${R_PKGNAME}
 MASTER_SITES?=		${MASTER_SITE_R_CRAN:=contrib/}
 DIST_SUBDIR?=		R
 CATEGORIES+=		math
@@ -18,6 +17,7 @@ CATEGORIES+=		math
 R_DEPENDS?=		R>=1.7.0
 DEPENDS+=               ${R_DEPENDS}:../../math/R
 
+WRKSRC=         	${WRKDIR}/${R_PKGNAME}
 NO_BUILD=		YES
 
 do-install:
diff --git a/math/blas/Makefile b/math/blas/Makefile
index f9713555566..de6a90dc785 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/12/04 09:13:58 adam Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	blas
 PKGNAME=	blas-1.0
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/blas/ \
 		ftp://netlib.bell-labs.com/netlib/blas/ \
@@ -15,6 +14,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.netlib.org/blas/
 COMMENT=	Basic Linear Algebra Subprograms (Fortran)
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 USE_FORTRAN=		YES
 USE_LIBTOOL=		YES
diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile
index 382840c1646..d98aba3bba6 100644
--- a/math/dcdflib.c/Makefile
+++ b/math/dcdflib.c/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/11/15 14:09:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=	dcdflib.c-1.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/dcdflib.c/src
 CATEGORIES=	math
 MASTER_SITES=	ftp://odin.mdacc.tmc.edu/pub/source/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://odin.mdacc.tmc.edu/anonftp/
 COMMENT=	Library of C Routines for Cumulative Distribution Functions
 
+WRKSRC=		${WRKDIR}/dcdflib.c/src
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 post-install:
diff --git a/math/dcdflib.f/Makefile b/math/dcdflib.f/Makefile
index a3548a4dbda..185af0cfaef 100644
--- a/math/dcdflib.f/Makefile
+++ b/math/dcdflib.f/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/09/19 23:08:30 dent Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=	dcdflib.f-1.1
-WRKSRC=		${WRKDIR}/dcdflib.f/src
 CATEGORIES=	math
 MASTER_SITES=	ftp://odin.mdacc.tmc.edu/pub/source/
 
@@ -9,6 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://odin.mdacc.tmc.edu/anonftp/
 COMMENT=	Library of Fortran Routines for Cumulative Distribution Functions
 
+WRKSRC=		${WRKDIR}/dcdflib.f/src
 USE_FORTRAN=	yes
 
 post-install:
diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile
index c0cd90a205a..58a9ac7e268 100644
--- a/math/dfftpack/Makefile
+++ b/math/dfftpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:47:26 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=		dfftpack-20001209
-WRKSRC=			${WRKDIR}/dfftpack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ COMMENT=		Double precision version of FFTPACK
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		YES
+WRKSRC=			${WRKDIR}/dfftpack
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 65b1bb1f0e6..d0815116a55 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:47:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=		eispack-20001130
-WRKSRC=			${WRKDIR}/eispack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ COMMENT=		Fortran routines for the solution of eigenvalue problems
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		YES
+WRKSRC=			${WRKDIR}/eispack
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/euler/Makefile b/math/euler/Makefile
index 0a57d15ded4..d0007ac0e52 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:47:29 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=		euler-1.60.6
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/euler-1.60/source
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=euler/}
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://euler.sourceforge.net/index.html
 COMMENT=		Interactive numerical analysis and graphics program
 
+WRKSRC=			${WRKDIR}/euler-1.60/source
 MAKEFILE=		makefile
 ALL_TARGET=		euler
 USE_BUILDLINK2=		# defined
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index 1e64ad99ec7..dd8fbb58f56 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:47:30 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:20:04 agc Exp $
 
 DISTNAME=		fftpack-20001130
-WRKSRC=			${WRKDIR}/fftpack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ COMMENT=		Single precision Fortran FFT subroutines
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		YES
+WRKSRC=			${WRKDIR}/fftpack
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/gp-autpgrp/Makefile b/math/gp-autpgrp/Makefile
index b94e757cc98..9d976d54cdf 100644
--- a/math/gp-autpgrp/Makefile
+++ b/math/gp-autpgrp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:47:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	autpgrp-1.1
 PKGNAME=	gp-autpgrp-1.1
 SVR4_PKGNAME=	gpapg
-WRKSRC=		${WRKDIR}/autpgrp
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
@@ -13,6 +12,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/autpgrp.html
 COMMENT=	GAP package for finding automorphism groups of finite p-groups
 
+WRKSRC=		${WRKDIR}/autpgrp
 NO_BUILD=	YES
 USE_BUILDLINK2=	YES
 GAP_PKG_NAME=	autpgrp
diff --git a/math/gp-factint/Makefile b/math/gp-factint/Makefile
index 846e6e1bd9a..adde02e6108 100644
--- a/math/gp-factint/Makefile
+++ b/math/gp-factint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:47:36 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	factint-1.3
 PKGNAME=	gp-factint-1.3
 SVR4_PKGNAME=	gpfin
-WRKSRC=		${WRKDIR}/factint
 CATEGORIES=	math
 MASTER_SITES=	http://www.cip.mathematik.uni-stuttgart.de/~kohlsn/factint/
 EXTRACT_SUFX=	.zoo
@@ -13,6 +12,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/factint.html
 COMMENT=	Integer factorization routines for GAP
 
+WRKSRC=		${WRKDIR}/factint
 NO_BUILD=	YES
 USE_BUILDLINK2=	YES
 GAP_PKG_NAME=	factint
diff --git a/math/gp-fplsa/Makefile b/math/gp-fplsa/Makefile
index 6232373fc23..1487e9e6443 100644
--- a/math/gp-fplsa/Makefile
+++ b/math/gp-fplsa/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:47:37 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	fplsa
 PKGNAME=	gp-fplsa-1.0
 PKGREVISION=	1
 SVR4_PKGNAME=	gpfpl
-WRKSRC=		${WRKDIR}/fplsa
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
@@ -14,6 +13,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/fplsa.html
 COMMENT=	GAP interface to FPLSA
 
+WRKSRC=		${WRKDIR}/fplsa
 USE_BUILDLINK2=	YES
 GAP_PKG_NAME=	fplsa
 ALL_TARGET=	default
diff --git a/math/gp-grape/Makefile b/math/gp-grape/Makefile
index b3461e77b07..e7e08911bc8 100644
--- a/math/gp-grape/Makefile
+++ b/math/gp-grape/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:47:37 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	grape4r1
 PKGNAME=	gp-grape-4.1
 PKGREVISION=	1
 SVR4_PKGNAME=	gpgra
-WRKSRC=		${WRKDIR}/${GAP_PKG_NAME}
 CATEGORIES=	math
 MASTER_SITES=	http://www.maths.qmul.ac.uk/~leonard/grape4r1/
 EXTRACT_SUFX=	.zoo
@@ -16,6 +15,7 @@ COMMENT=	GRAPE (GRape Algorithms using PErmutation groups)
 
 ALL_TARGET=	bsd-gcc
 
+WRKSRC=		${WRKDIR}/${GAP_PKG_NAME}
 GAP_PKG_NAME=	grape
 
 do-configure:
diff --git a/math/gp-grpconst/Makefile b/math/gp-grpconst/Makefile
index d616e45334b..66f13fbb394 100644
--- a/math/gp-grpconst/Makefile
+++ b/math/gp-grpconst/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/01 18:43:27 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:04 agc Exp $
 #
 
 DISTNAME=	grpconst
 PKGNAME=	gp-grpconst-2.0
 SVR4_PKGNAME=	gpgct
-WRKSRC=		${WRKDIR}/grpconst
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
@@ -13,6 +12,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/grpconst.html
 COMMENT=	GAP package for finding isomorphism classes of finite groups
 
+WRKSRC=		${WRKDIR}/grpconst
 NO_BUILD=	YES
 USE_BUILDLINK2=	YES
 GAP_PKG_NAME=	grpconst
diff --git a/math/gp-lag/Makefile b/math/gp-lag/Makefile
index a5b7f1cf399..2f00768ad61 100644
--- a/math/gp-lag/Makefile
+++ b/math/gp-lag/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:47:39 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	lag-2.1
 PKGNAME=	gp-lag-2.1
 SVR4_PKGNAME=	gplag
-WRKSRC=		${WRKDIR}/lag
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
@@ -13,6 +12,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/lag.html
 COMMENT=	GAP Bracket Lie Algebra functions
 
+WRKSRC=		${WRKDIR}/lag
 NO_BUILD=	YES
 USE_BUILDLINK2=	YES
 GAP_PKG_NAME=	lag
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index cfb938ebe38..1b3d3656ed1 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/12/04 10:32:30 adam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	lapack
 PKGNAME=	lapack-20010201
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/LAPACK
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack/			\
 		ftp://netlib.bell-labs.com/netlib/lapack/	\
@@ -17,6 +16,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.netlib.org/lapack/index.html
 COMMENT=	Linear Algebra PACKage
 
+WRKSRC=			${WRKDIR}/LAPACK
 DIST_SUBDIR=		lapack-20010201
 USE_BUILDLINK2=		YES
 USE_FORTRAN=		YES
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index 915b2a58e26..5c9b1ad131d 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:47:44 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	linpack-20010510
-WRKSRC=		${WRKDIR}/linpack
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -12,5 +11,6 @@ DEPENDS+=	blas-[0-9]*:../../math/blas
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 USE_FORTRAN=	yes
+WRKSRC=		${WRKDIR}/linpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile
index f3babbe66c2..55431f2b737 100644
--- a/math/mcsim/Makefile
+++ b/math/mcsim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 11:11:33 seb Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	mcsim-4.2.0
-WRKSRC=		${WRKDIR}/mcsim
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=mcsim/}
 
@@ -10,6 +9,7 @@ COMMENT=	Monte Carlo Simulation software
 
 USE_MAKEINFO=	YES
 INFO_FILES=	mcsim
+WRKSRC=		${WRKDIR}/mcsim
 
 post-build:
 	cd ${WRKSRC}/doc && ${MAKEINFO} mcsim.texinfo
diff --git a/math/meschach/Makefile b/math/meschach/Makefile
index 75cad4a7b30..2114f5b977d 100644
--- a/math/meschach/Makefile
+++ b/math/meschach/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:47:46 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		mesch12b
 PKGNAME=		meschach-1.2b
-WRKSRC=			${WRKDIR}
 CATEGORIES=		math
 MASTER_SITES=		http://www.math.uiowa.edu/~dstewart/meschach/
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.math.uiowa.edu/~dstewart/meschach/
 COMMENT=		Library of C Routines for Matrix Computations
 
+WRKSRC=			${WRKDIR}
 GNU_CONFIGURE=		#defined
 CONFIGURE_ARGS+=	--with-all
 MAKEFILE=		makefile
diff --git a/math/minpack/Makefile b/math/minpack/Makefile
index 1acc5a3a7dc..60f40cccd2c 100644
--- a/math/minpack/Makefile
+++ b/math/minpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:47:48 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		minpack-20001130
-WRKSRC=			${WRKDIR}/minpack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ COMMENT=		FORTRAN 77 library for the solution of nonlinear equations
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		YES
+WRKSRC=			${WRKDIR}/minpack
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/newmat/Makefile b/math/newmat/Makefile
index 3cfc7147f9a..0bff6541276 100644
--- a/math/newmat/Makefile
+++ b/math/newmat/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:47:49 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	newmat10
 PKGNAME=	${DISTNAME:C/([0-9]+)$/-\1/}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.robertnz.net/ftp/
 
@@ -11,6 +10,7 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://www.robertnz.net/ol_doc.htm
 COMMENT=	Newmat C++ Matrix Library
 
+WRKSRC=		${WRKDIR}
 MAKEFILE=	nm_cc.mak
 ALL_TARGET=	garch
 
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index 116bd111ad3..717ac41b023 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:47:50 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		ntl-5.3.1
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		math devel
 MASTER_SITES=		http://www.shoup.net/ntl/
 
@@ -9,6 +8,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.shoup.net/ntl/
 COMMENT=		C++ library for doing number theory
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 NO_CONFIGURE=		# defined
 USE_LIBTOOL=		yes
 MAKEFILE=		makefile
diff --git a/math/odepack/Makefile b/math/odepack/Makefile
index 9f5f197014c..cb3944002a7 100644
--- a/math/odepack/Makefile
+++ b/math/odepack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:47:52 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		odepack-20001130
-WRKSRC=			${WRKDIR}/odepack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -12,6 +11,7 @@ DEPENDS+=		linpack>=20010427:../../math/linpack
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		yes
+WRKSRC=			${WRKDIR}/odepack
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/otter/Makefile b/math/otter/Makefile
index 880389711a1..64f188aea6c 100644
--- a/math/otter/Makefile
+++ b/math/otter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:47:53 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	otter-3.0.6
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 CATEGORIES=	math
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/Otter/
 
@@ -10,6 +9,7 @@ HOMEPAGE=	http://www.mcs.anl.gov/AR/otter/
 COMMENT=	Automated Deduction System
 
 ALL_TARGET=	otter
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/otter ${PREFIX}/bin
diff --git a/math/pari-galdata/Makefile b/math/pari-galdata/Makefile
index 5fa6b79dee6..88315f36171 100644
--- a/math/pari-galdata/Makefile
+++ b/math/pari-galdata/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		galdata
 PKGNAME=		pari-galdata-2.1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		math
 MASTER_SITES=		ftp://www.gn-50uma.de/gn/gn-50uma.de/pari/ \
 			http://www.gn-50uma.de/ftp/pari/
@@ -13,6 +12,7 @@ COMMENT=		Galois group data for pari
 
 DEPENDS+=		pari-[0-9]*:../../math/pari
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		pari-2.1
 
 NO_BUILD=		yes
diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile
index cbe725573e1..25756f4ce59 100644
--- a/math/quadpack/Makefile
+++ b/math/quadpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:48:04 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		quadpack-20001130
-WRKSRC=			${WRKDIR}/quadpack
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ COMMENT=		Fortran subroutines for the solution of definite univariate integrals
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_FORTRAN=		YES
+WRKSRC=			${WRKDIR}/quadpack
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 76abc3af689..0b612c26955 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/11/15 14:17:01 kristerw Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	randlib.c-1.3
 PKGNAME=	randlib-1.3
-WRKSRC=		${WRKDIR}/randlib.c/src
 CATEGORIES=	math
 MASTER_SITES=	ftp://odin.mdacc.tmc.edu/pub/source/
 
@@ -11,6 +10,7 @@ HOMEPAGE=	http://odin.mdacc.tmc.edu/anonftp/
 COMMENT=	Library of C Routines for Random Number Generation
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/randlib.c/src
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/randlib
diff --git a/math/ruby-bigfloat/Makefile b/math/ruby-bigfloat/Makefile
index d2e306d502d..d56fced5f13 100644
--- a/math/ruby-bigfloat/Makefile
+++ b/math/ruby-bigfloat/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:48:07 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:20:05 agc Exp $
 # FreeBSD: ports/math/ruby-bigfloat/Makefile,v 1.8 2000/10/02 14:57:26 knu Exp
 
 DISTNAME=	bigfloat-1.1.8
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	math
 MASTER_SITES=	http://www.tinyforest.gr.jp/ruby/
 
@@ -12,6 +11,7 @@ HOMEPAGE=	http://www.tinyforest.gr.jp/ruby/bigfloat_en.html
 COMMENT=	Variable precision floating library for Ruby
 
 DIST_SUBDIR=	ruby
+WRKSRC=		${WRKDIR}
 USE_RUBY_EXTCONF= yes
 
 INSTALL_TARGET=	site-install
diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile
index de5942ef461..004575a754a 100644
--- a/math/ruby-gsl/Makefile
+++ b/math/ruby-gsl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/15 00:18:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	ruby-gsl-0.1.9
-WRKSRC=		${WRKDIR}/${DISTNAME}/ext
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-gsl/}
 
@@ -10,6 +9,7 @@ HOMEPAGE=	http://ruby-gsl.sourceforge.net/
 COMMENT=	Wrapper of the GNU Scientific Library (GSL) for Ruby
 
 DIST_SUBDIR=		ruby
+WRKSRC=			${WRKDIR}/${DISTNAME}/ext
 USE_RUBY_EXTCONF=	yes
 USE_BUILDLINK2=		yes
 INSTALL_TARGET=		site-install
diff --git a/math/sc/Makefile b/math/sc/Makefile
index 5e6ae781e86..ecda5620706 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/05/06 17:41:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:20:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/10 00:20:29 steve Exp
 
 DISTNAME=               sc-6.21
-WRKSRC=			${WRKDIR}
 CATEGORIES=             math
 MASTER_SITES=           ftp://gatekeeper.dec.com/pub/misc/
 EXTRACT_SUFX=		.tar.Z
@@ -10,4 +9,6 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=             eric@fox.phoenix.az.us
 COMMENT=		Curses-based spreadsheet program
 
+WRKSRC=			${WRKDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index b49a7c79394..2870bf384ca 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2003/12/19 04:37:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
 PKGNAME=	${SCIBASE}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${SCIBASE}
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}  scicos.tar.gz scicos_blocks.tar.gz
@@ -15,6 +14,7 @@ COMMENT=	High-level scientific math programming environment with graphics
 
 DIST_SUBDIR=	${SCIBASE}
 SCIBASE=	scilab-2.7
+WRKSRC=		${WRKDIR}/${SCIBASE}
 
 SITES_scicos.tar.gz=		ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/misc/
 SITES_scicos_blocks.tar.gz=	ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/misc/
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 9788c8eb9c3..1735717898e 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/12/04 15:10:48 adam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	slatec_src
 PKGNAME=	slatec-4.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/src
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/slatec/ \
 		ftp://netlib.bell-labs.com/netlib/slatec/ \
@@ -17,6 +16,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.netlib.org/slatec/
 COMMENT=	Library of mathematical and statistical Fortran 77 subroutines
 
+WRKSRC=			${WRKDIR}/src
 USE_BUILDLINK2=		YES
 USE_FORTRAN=		YES
 USE_LIBTOOL=		YES
diff --git a/math/statist/Makefile b/math/statist/Makefile
index 0884043f3ff..980200dc1e5 100644
--- a/math/statist/Makefile
+++ b/math/statist/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:57:14 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	statist-1.0.1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	math
 MASTER_SITES=	http://www.usf.uni-osnabrueck.de/~breiter/tools/statist/v${PKGVERSION}/
 
@@ -12,6 +11,7 @@ COMMENT=	Small and portable statistics program
 
 DEPENDS+=	gnuplot-[0-9]*:../../graphics/gnuplot
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 6e34a026be2..6601e3ffd4d 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/11/11 11:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		superlu_3.0
 PKGNAME=		superlu-3.0
-WRKSRC=			${WRKDIR}/SuperLU_3.0
 CATEGORIES=		math
 MASTER_SITES=		http://www.nersc.gov/~xiaoye/SuperLU/
 
@@ -15,6 +14,7 @@ DEPENDS+=		blas-[0-9]*:../../math/blas
 BLAS_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		BLAS_PREFIX=blas
 
+WRKSRC=			${WRKDIR}/SuperLU_3.0
 ALL_TARGET=		superlulib
 TEST_DIRS=		${WRKSRC}/TESTING/MATGEN ${WRKSRC}/TESTING
 TEST_TARGET=		all
diff --git a/math/tochnog/Makefile b/math/tochnog/Makefile
index 9b320ffff26..e3a29206b88 100644
--- a/math/tochnog/Makefile
+++ b/math/tochnog/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	tochnog-20010429
-WRKSRC=		${WRKDIR}/tochnog/src
 CATEGORIES=	math
 MASTER_SITES=	ftp://tochnog.sourceforge.net/pub/tochnog/
 DISTFILES=	tn.tar.gz tnu.ps.gz tnp.ps.gz
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://tochnog.sourceforge.net/
 COMMENT=	Finite Element Analysis Program
 
+WRKSRC=		${WRKDIR}/tochnog/src
 DIST_SUBDIR=	${DISTNAME}
 EXTRACT_ONLY=	tn.tar.gz
 MAKEFILE=	makefile
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index c9dba322937..15640274efa 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:48:17 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.11.7
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=		math devel
 MASTER_SITES=		http://www.unidata.ucar.edu/packages/udunits/
 EXTRACT_SUFX=		.tar.Z
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.unidata.ucar.edu/packages/udunits/
 COMMENT=		Library and program for manipulating units of physical quantities
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
 USE_BUILDLINK2=		yes
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 05de9cfe2af..2732a09e139 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:48:18 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	vista
 PKGNAME=	vista-5.05
-WRKSRC=		${WRKDIR}/vista-5.0.5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -13,6 +12,7 @@ COMMENT=	Visual statistics system
 
 DEPENDS+=	xlispstat>=3.52.9:../../math/xlispstat
 
+WRKSRC=		${WRKDIR}/vista-5.0.5
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 3bb6244d7cd..e7e04d13fc8 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:48:19 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	xgap4r16
 PKGNAME=	xgap-4.16
 PKGREVISION=	1
-WRKSRC=         ${WRKDIR}/${GAP_PKG_NAME}
 CATEGORIES=	math x11
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
@@ -13,6 +12,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://www.gap-system.org/Share/xgap.html
 COMMENT=	GUI for GAP
 
+WRKSRC=         ${WRKDIR}/${GAP_PKG_NAME}
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 6bad6a1cdeb..6b6c75cb3a6 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:20:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
 #
 
 DISTNAME=		xldlas-0.85
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/xldlas
 CATEGORIES=		math
 MASTER_SITES=		http://sunsite.math.klte.hu/mirrors/xldlas/	\
 			${MASTER_SITE_SUNSITE:=X11/xapps/math/}
@@ -18,6 +17,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
 			NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel	\
 			NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
 
+WRKSRC=			${WRKDIR}/xldlas
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 
diff --git a/math/xlife/Makefile b/math/xlife/Makefile
index 967c3c3383a..b7fe140a839 100644
--- a/math/xlife/Makefile
+++ b/math/xlife/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:48:20 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:20:05 agc Exp $
 #
 
 DISTNAME=	xlife-5.0
 PKGNAME=	${DISTNAME}nb1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	math games
 MASTER_SITES=	http://www.tuxedo.org/~esr/
 
@@ -11,6 +10,7 @@ MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/software.html
 COMMENT=	John Horton Conway's "Game of Life"
 
+WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
 INSTALL_TARGET=	install
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 3f522e18555..a57d7e58abe 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/08/09 11:11:38 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:05 agc Exp $
 
 DISTNAME=	yorick-1.5.12
-WRKSRC=		${WRKDIR}/yorick-1.5
 CATEGORIES=	math
 MASTER_SITES=   ftp://ftp-icf.llnl.gov/pub/Yorick/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +9,7 @@ MAINTAINER=	refling@comet.lbl.gov
 HOMEPAGE=	ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html
 COMMENT=	Numerical algebra system (similar to Matlab)
 
+WRKSRC=		${WRKDIR}/yorick-1.5
 USE_BUILDLINK2=	yes
 USE_X11=        yes
 BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc