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).

6 files changed, 13 insertions, 12 deletions

diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index ec3c97278ce..e81bce02463 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/29 05:40:04 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:46 agc Exp $
 
 DISTNAME=	apNetBSD
 PKGNAME=	aperture-2.0nb1
@@ -31,7 +31,7 @@ EXTRACT_CMD=		${SH} ${DOWNLOADED_DISTFILE}
 INSTALL_FILE=		${WRKDIR}/INSTALL
 INSTALL_TARGET=		dirs includes install
 MANCOMPRESSED_IF_MANZ=	YES
-NO_WRKSUBDIR=		YES
+WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		YES
 OSVERSION_SPECIFIC=	YES
 
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 2066f697ff3..0bd6a59933c 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:42:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:47 agc Exp $
 #
 
 DISTNAME=       	crashme-2.4
@@ -10,7 +10,7 @@ MAINTAINER=		agc@netbsd.org
 HOMEPAGE=		http://people.delphi.com/gjc/crashme.html
 COMMENT=		Try to crash machine with random arguments to random system calls
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${SH} ${DOWNLOADED_DISTFILE}
 MAKEFILE=		makefile
 
diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile
index 89e44f104ea..991f9715f0b 100644
--- a/sysutils/fix4SA110rev2/Makefile
+++ b/sysutils/fix4SA110rev2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:47 agc Exp $
 #
 
 DISTNAME=	fix4SA110rev2-1.0
-NO_WRKSUBDIR=	yes
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/
 DISTFILES=	fix4SA110rev2.c fix4SA110rev2.README
@@ -14,6 +13,8 @@ COMMENT=	Modify arm32 binaries to work around SA rev2 problems
 ONLY_FOR_PLATFORM= NetBSD-*-arm32
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=		${WRKDIR}
+
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
 
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index d16251d3023..0ae1e5732c9 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/19 03:56:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=   ftp://ftp.vix.com/pub/vixie/
 MAINTAINER=	packages@netbsd.org
 COMMENT=	multiuser "tip"/"cu" replacement with logging
 
-NO_WRKSUBDIR=   yes
+WRKSRC=		${WRKDIR}
 
 pre-configure:
 	${CHMOD} -R u+w ${WRKDIR}
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
index f55a98cd2e2..9d0ac6f9991 100644
--- a/sysutils/sysgen/Makefile
+++ b/sysutils/sysgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:47 agc Exp $
 #
 
 DISTNAME=	sysgen
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	abs@netbsd.org
 COMMENT=	assign DEC Qbus or UNIBUS standard CSR and vector addresses
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	sysgen
 
 do-install:
diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile
index 5c8c7ca036b..c988b8400d6 100644
--- a/sysutils/tkcron/Makefile
+++ b/sysutils/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/05 19:51:19 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:48 agc Exp $
 #
 
 DISTNAME=	tkcron-2.12
@@ -13,7 +13,7 @@ DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 USE_X11=	yes
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 do-build:
 	${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron