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, 12 insertions, 12 deletions

diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index bc012854b09..96a9502bdc4 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/05/20 05:23:26 jonb Exp $
+# $NetBSD: Makefile,v 1.21 2001/09/09 20:36:52 agc Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -6,7 +6,6 @@
 
 DISTNAME=	mod_auth_cookie.c
 PKGNAME=	ap-auth-cookie-1.7
-NO_WRKSUBDIR=	yes
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.kciLink.com/pub/
 EXTRACT_SUFX=	.gz
@@ -20,6 +19,7 @@ DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
 EXTRACT_CMD=	${DO_NADA}
+WRKSRC=		${WRKDIR}
 
 post-extract:
 	@(${ECHO} '#include "ap_compat.h"'; ${GZIP_CMD} -dc ${DISTDIR}/${DISTFILES}) \
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index ebad0cbfa19..892afbd1f02 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/15 02:56:38 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:52 agc Exp $
 #
 
 DISTNAME=	hiawatha
 PKGNAME=	hiawatha-0.1
-NO_WRKSUBDIR=
 CATEGORIES=	textproc www
 MASTER_SITES=	${HOMEPAGE} ${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=	.zip
@@ -19,6 +18,7 @@ DEPENDS+=	saxon-*:../../textproc/saxon
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
+WRKSRC=		${WRKDIR}
 
 USE_JAVA=	yes
 DIST_SUBDIR=	${PKGNAME}
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index 963bef0cbe9..08c0112e19d 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/21 13:28:09 kei Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:53 agc Exp $
 #
 
 DISTNAME=	htmllint
@@ -14,7 +14,7 @@ COMMENT=	Another HTML-Lint program
 DEPENDS+=	p5-Jcode>=0.68:../../japanese/p5-Jcode
 
 USE_PERL5=	# defined
-NO_WRKSUBDIR=	# defined
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index c4fc349b9c0..5ebe27a9cff 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
 
 DISTNAME=		netscape-v304-export.x86-unknown-bsd
 PKGNAME=		navigator3-3.04
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		yes
 SCRIPTS_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 NO_BUILD=		yes
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index bfa3ec75b12..58cc0efe556 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/27 14:26:18 abs Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
 #
 
 COMMENT=	Open new communicator, navigator, or mozilla window
@@ -22,7 +22,7 @@ DISTFILES=	# empty
 MASTER_SITES=	# empty
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index c217ce7438b..e4ae1d7247a 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
 
 DISTNAME=	w3c-httpd-3.0A
@@ -10,7 +10,7 @@ MAINTAINER=	package@netbsd.org
 HOMEPAGE=	http://www.w3.org/pub/WWW/Daemon/
 COMMENT=	WWW server from the W3 Consortium (W3C)
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 pre-configure:
 .if !defined(MD5_PW)