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

19 files changed, 48 insertions, 38 deletions

diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 84fe8eb7e0a..684806559c5 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:08:12 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
 #
 
 DISTNAME=       bonnie
 PKGNAME=	bonnie-2.06
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=   http://www.textuality.com/bonnie/
 
@@ -13,6 +12,7 @@ HOMEPAGE=	http://www.textuality.com/bonnie/index.html
 COMMENT=	Performance Test of Filesystem I/O
 
 NO_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}
 
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 94305fcc5c5..203e8e40ccb 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/09/19 18:08:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:08:12 agc Exp $
 #
 
 DISTNAME=	dbench-1.3
-WRKSRC=		${WRKDIR}/dbench
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://dnuc.polyn.kiae.su/pub/dbench/
 
@@ -10,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://samba.org/ftp/tridge/dbench/README
 COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 
+WRKSRC=		${WRKDIR}/dbench
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index 06088d17bbe..34e1910be21 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		dhry2.1
 PKGNAME=		dhrystone-2.1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://gatekeeper.dec.com/pub/misc/
 EXTRACT_SUFX=		.tar.Z
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		root@garbled.net
 COMMENT=		Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
 	${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${PREFIX}/bin/dry2reg
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index d6aff006ca4..85e561e9965 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/fib/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Mathematical benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/fib.c ${WRKSRC}/fib.c
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 9a3ec83505b..a706ff22b02 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/flops/
 DISTFILES=		${DISTNAME}.c ${DISTNAME}.doc
@@ -11,6 +10,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://performance.netlib.org/performance/html/flops.html
 COMMENT=		Floating point benchmark to give your MFLOPS rating
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/flops.c ${WRKSRC}/flops.c
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 40c17dbd82e..0293e64c148 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/hbench-OS
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.eecs.harvard.edu/pub/hbench-OS/
 
@@ -13,6 +12,7 @@ COMMENT=		Suite of portable benchmarks to measure the OS and the hardware
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 
+WRKSRC=			${WRKDIR}/hbench-OS
 USE_BUILDLINK2=		YES
 OSVERSION_SPECIFIC=	YES
 ALL_TARGET=		build
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 80e8afe7d83..03141ce4951 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:31:03 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/heapsort/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Benchmark program for variable sized arrays
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/heapsort.c ${WRKSRC}/heapsort.c
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index f39ba1c3289..0055c7acd4e 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:24:27 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:08:12 agc Exp $
 # FreeBSD: Makefile,v 1.1.1.1 1998/06/15 18:09:43 ghelmer Exp
 #
 
 DISTNAME=	hint_unix_serial
 PKGNAME=	hint.serial-98.06.12
-WRKSRC=		${WRKDIR}/unix
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/HINT/source/tar/
 EXTRACT_SUFX=	.tar
@@ -15,6 +14,8 @@ COMMENT=	Scalable benchmark for testing CPU and memory performance
 
 ALL_TARGET=	DOUBLE INT
 
+WRKSRC=		${WRKDIR}/unix
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double
 	${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 9d2c472002d..e69fa98d7ab 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/12/13 10:48:33 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		iozone3_211
 PKGNAME=		iozone-3.211
-WRKSRC=			${WRKDIR}/src/current
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.iozone.org/src/current/
 EXTRACT_SUFX=		.tar
@@ -13,6 +12,7 @@ COMMENT=		Benchmark for file read and write speed
 
 RESTRICTED=		"Publication of derivative works not allowed"
 
+WRKSRC=			${WRKDIR}/src/current
 MAKEFILE=		makefile
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile
index 1c27678e37e..1719de35f90 100644
--- a/benchmarks/kttcp/Makefile
+++ b/benchmarks/kttcp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	kttcp-${VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,6 +15,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.6[B-Z]-* NetBSD-1.[7-9]* NetBSD-[2-9]*
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	# defined
 
+WRKSRC=		${WRKDIR}
 MAKE_ENV+=	BINDIR=${LOCALBASE}/bin MANDIR=${LOCALBASE}/man
 
 post-extract:
diff --git a/benchmarks/linpack-bench/Makefile b/benchmarks/linpack-bench/Makefile
index 3d2fd846e98..1e69d2d7967 100644
--- a/benchmarks/linpack-bench/Makefile
+++ b/benchmarks/linpack-bench/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-bench-940225
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/benchmark/
 EXTRACT_SUFX=		# empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		# empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Collection of benchmarks for floating point
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/linpackc ${WRKSRC}/linpack.c
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index c43abfa2cbf..fcb08be9583 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/28 14:40:06 tron Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	netio114
 PKGNAME=	netio-1.14
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/os2/leo/systools/
 EXTRACT_SUFX=	.zip
@@ -13,6 +12,7 @@ COMMENT=	Network benchmark for DOS, OS/2 2.x, Windows NT/2000 and Unix
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 MAKE_FLAGS+=	CC="${CC}" CFLAGS="-DUNIX ${CFLAGS}" LFLAGS="${LDFLAGS}" \
 		LIBS="${LIBS}" O=.o OUT=-o X=
 
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index cd4b018600e..29afe2823a0 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/nsieve/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Sieve of Eratosthenes benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/nsieve.c ${WRKSRC}/nsieve.c
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index d84d456c728..fc6be0abeb5 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/paranoia/
 EXTRACT_SUFX=		.c
@@ -12,6 +11,8 @@ COMMENT=		Highly paranoid test of IEEE 754 conformancy
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=			${WRKDIR}
+
 do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -ffloat-store -o paranoia paranoia.c -lm)
 
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index db5028cb393..de176e67e80 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:08:12 agc Exp $
 # FreeBSD ID: ports/benchmarks/postmark/Makefile,v 1.2 1999/09/19 05:13:20 obrien Exp
 #
 
 DISTNAME=       postmark-1_5.c
 PKGNAME=	postmark-1.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=   http://www.netapp.com/ftp/
 EXTRACT_SUFX=	#
@@ -15,6 +14,7 @@ COMMENT=	NetApps file system benchmark
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} postmark.c
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
 do-build:
diff --git a/benchmarks/randread/Makefile b/benchmarks/randread/Makefile
index c2db6fb9fce..4d59771eb00 100644
--- a/benchmarks/randread/Makefile
+++ b/benchmarks/randread/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:31:04 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:08:12 agc Exp $
 #
 
 DISTNAME=	randread-0.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=randread/}
 
@@ -11,6 +10,7 @@ HOMEPAGE=	http://randread.sourceforge.net/
 COMMENT=	Program to help benchmark random disk read performance
 
 ALL_TARGET=	randread
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/randread ${PREFIX}/sbin
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index bb7bc3161a6..aa17b3efa16 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:36 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	ttcp
 PKGNAME=	${DISTNAME}-1.12
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	http://www.ccci.com/tools/ttcp/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,8 @@ MAINTAINER=	thorpej@NetBSD.org
 HOMEPAGE=	http://www.ccci.com/tools/ttcp/
 COMMENT=	TCP testing and performance measuring tool
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 MANCOMPRESSED_IF_MANZ=	YES
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 61ca6c167ad..7676d814d3d 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/benchmark/
 EXTRACT_SUFX=		.c
@@ -11,6 +10,7 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Benchmark for processors that gives you a MIPS rating
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
+WRKSRC=			${WRKDIR}
 
 do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o whetstone whetstone.c -lm)
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 5829fd5637d..503524006e0 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/20 09:54:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:08:12 agc Exp $
 # FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp
 
 DISTNAME=	xengine-1.0.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/comp.sources.x/volume09/xengine/
 DISTFILES=	part01.z patch1.z
@@ -15,6 +14,7 @@ COMMENT=	Reciprocating engine for X
 
 BUILD_DEPENDS=	gsharutils>=4.2.1:../../archivers/gsharutils
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	xengine
 USE_IMAKE=	yes