Deprecate NO_WRKSUBDIR, replacing it with an explicit assignment of:

WRKSRC= ${WRKDIR}

This is much cleaner, much more indicative of what happens, and removes
another of the negative definitions (NO_.* = value).

10 files changed, 20 insertions, 20 deletions

diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index cd5f1947d02..c0ba0e205e8 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:13 agc Exp $
 
 DISTNAME=		dhry2.1
 PKGNAME=		dhrystone-2.1
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		root@garbled.net
 COMMENT=		Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index 5b453884a81..036936b4004 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:13 agc Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Mathematical benchmark
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 8537c8c9614..7c4b1d64146 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
@@ -10,7 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://performance.netlib.org/performance/html/flops.html
 COMMENT=		Floating point benchmark to give your MFLOPS rating
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 668d4b5dc31..7416e03262e 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		benchmark program for variable sized arrays
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/benchmarks/linpack-bench/Makefile b/benchmarks/linpack-bench/Makefile
index e5242915b4c..562471662fa 100644
--- a/benchmarks/linpack-bench/Makefile
+++ b/benchmarks/linpack-bench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 22:29:38 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:14 agc Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-bench-940225
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		# empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Collection of benchmarks for floating point
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index 44c7ec0882e..e4d83aadfc4 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Sieve of Eratosthenes benchmark
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index 033acd4aeea..a44aab97a53 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/09 11:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:15 agc Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.c
 MAINTAINER=		root@garbled.net
 COMMENT=		Highly paranoid test of IEEE 754 conformancy
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 do-build:
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index a17671e5994..8ed3019e39e 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/17 07:02:15 garbled Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:15 agc Exp $
 # FreeBSD ID: ports/benchmarks/postmark/Makefile,v 1.2 1999/09/19 05:13:20 obrien Exp
 #
 
@@ -16,7 +16,7 @@ EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} postmark.c
 
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o postmark postmark.c)
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 3b6b3af623b..6edd5580a8a 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/09 11:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:15 agc Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.c
 MAINTAINER=		root@garbled.net
 COMMENT=		Benchmark for processors that gives you a MIPS rating
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 do-build:
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 7230fcdd0a8..8847a5ae251 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:15 agc Exp $
 # FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp
 
 DISTNAME=	xengine-1.0.1
@@ -14,7 +14,7 @@ COMMENT=	Reciprocating engine for X
 BUILD_DEPENDS=	gsharutils-4.2.1:../../archivers/gsharutils
 
 DIST_SUBDIR=	xengine
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
 EXTRACT_CMD=	zcat ${DOWNLOADED_DISTFILE} | gunshar