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

13 files changed, 26 insertions, 26 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index bb193b72116..2f4301db6cc 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/15 11:51:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp 
 #
 
@@ -15,7 +15,7 @@ RESTRICTED=	"Do not modify. Do not charge for redistribution"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK_ONLY=	yes
 
 do-install:
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 201024b0dc4..1f8be07f61a 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/13 20:34:08 nra Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:09 agc Exp $
 #
 
 DISTNAME=		bicom101
@@ -13,7 +13,7 @@ COMMENT=		data compressor in the PPM family
 
 LICENSE=		no-commercial-use
 USE_BUILDLINK_ONLY=	yes
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 do-build:
 	for i in bialib bicom; do \
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 893bb8f3fb3..1bb80b88b01 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/15 11:51:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:10 agc Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
 USE_BUILDLINK_ONLY=	# defined
-NO_WRKSUBDIR=		# defined
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
 
 do-build:
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index fc6dad5d81b..d9ceef0f831 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/15 11:49:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:10 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
@@ -13,7 +13,7 @@ COMMENT=	The HA archiver using the HSC compression method
 
 USE_BUILDLINK_ONLY=	yes
 
-NO_WRKSUBDIR=   yes
+WRKSRC=			${WRKDIR}
 MAKEFILE=       makefile.nix
 MAKE_FLAGS=     CC="${CC}"
 ALL_TARGET=     ha
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 531bc6ef525..7d1c65ec726 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:15:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:10 agc Exp $
 
 DISTNAME=       hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
 PKGNAME=        hpack-0.79
@@ -9,7 +9,7 @@ MAINTAINER=     packages@netbsd.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security
 
 CRYPTO=		yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 PATCHDIR=	${WRKDIR}/.patches
 USE_RSAREF2=	NO
 
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index fd2517cd2ba..1cb468ef763 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/02/16 13:15:36 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:10 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp 
 #
 
@@ -19,7 +19,7 @@ RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
 
 pre-extract:
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index 0e27e19201c..2f8a2c3af6f 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/09 08:17:44 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:10 agc Exp $
 
 DISTNAME=		stuffit-5.2.0.603-linux
 PKGNAME=		stuffit-5.2.0.603
-NO_WRKSUBDIR=		YES
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://ftp.aladdinsys.com/pub/linux/StuffIt_for_Linux/ \
 			ftp://ftp2.aladdinsys.com/pub/linux/StuffIt_for_Linux/
@@ -13,6 +12,7 @@ COMMENT=		Stuffit Archive Creator and Expander
 
 DEPENDS+=		suse_base>=6:../../emulators/suse_base
 
+WRKSRC=			${WRKDIR}
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/archivers/szdd/Makefile b/archivers/szdd/Makefile
index 61b1038ca4a..a6c3daa150b 100644
--- a/archivers/szdd/Makefile
+++ b/archivers/szdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/16 10:17:00 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:11 agc Exp $
 #
 
 DISTNAME=		xfd_SZDD
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.kyz.uklinux.net/packers.php3#SZDD
 COMMENT=		extracts Microsoft SZDD files
 
 USE_BUILDLINK_ONLY=	yes
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} clean
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 69459623213..5930822e307 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/16 10:21:15 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:11 agc Exp $
 #
 
 DISTNAME=	unacepub
@@ -16,7 +16,7 @@ USE_BUILDLINK_ONLY=	yes
 USE_GMAKE=		yes
 
 DIST_SUBDIR=	unace-1.2
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 MAKEFILE=	unix/makefile
 
 do-install:
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 334a9d818d4..c556f10386f 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/16 10:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:11 agc Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
 USE_BUILDLINK_ONLY=	# defined
-NO_WRKSUBDIR=		# defined
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
 
 do-build:
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index 9277396f43f..e7b670cd912 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/07/16 10:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:11 agc Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
 PKGNAME=	${PRGNAME}-2.3
-NO_WRKSUBDIR=	YES
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/packages/TeX/tools/xbin/
 DISTFILES=	${DISTNAME}.c ${PRGNAME}.man
@@ -16,6 +15,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 USE_BUILDLINK_ONLY=	# defined
+WRKSRC=			${WRKDIR}
 
 PRGNAME=	xbin
 EXTRACT_ONLY=	# blank
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 5dfee9a6279..38369d20067 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/16 10:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:12 agc Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -24,7 +24,7 @@ MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
 
 USE_BUILDLINK_ONLY=	yes
-NO_WRKSUBDIR=		yes
+WRKSRC=		${WRKDIR}
 PLIST_SRC=	${WRKSRC}/PLIST
 
 BUILD_DEFS+=	ZIP_ENCRYPTION
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index f53e57dff11..e54a0a29a92 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/16 10:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:12 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp 
 #
 
@@ -13,7 +13,7 @@ COMMENT=	Manipulate archives of files in compressed form
 LICENSE=	zoo-license
 
 USE_BUILDLINK_ONLY=	yes
-NO_WRKSUBDIR=		yes
+WRKSRC=		${WRKDIR}
 ALL_TARGET=     bsdansi
 MAKEFILE=       makefile
 MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \