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/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile
index a4e4b02e60e..1f67b7c3405 100644
--- a/pkgtools/buildlink-x11/Makefile
+++ b/pkgtools/buildlink-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/22 17:45:57 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:41 agc Exp $
 
 DISTNAME=	buildlink-x11-0.8
 CATEGORIES=	pkgtools devel x11
@@ -11,7 +11,7 @@ COMMENT=	allows X11 pkgs to be built using the buildlink.mk infrastructure
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	# defined
-NO_WRKSUBDIR=	# defined
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	# defined
 NO_MTREE=	# defined
 USE_X11BASE=	# defined
diff --git a/pkgtools/pkgconflict/Makefile b/pkgtools/pkgconflict/Makefile
index f91a2c583bf..caba25e33c2 100644
--- a/pkgtools/pkgconflict/Makefile
+++ b/pkgtools/pkgconflict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/10 14:21:56 wennmach Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:41 agc Exp $
 #
 
 DISTNAME=	pkgconflict-0.3
@@ -11,7 +11,7 @@ COMMENT=	Scripts to find conflicting packages in pkgsrc
 
 DEPENDS+=	postgresql>=7.0:../../databases/postgresql
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index 739ac28c4be..dec6e19833d 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:42 agc Exp $
 #
 
 DISTNAME=	pkgdep-1.0
@@ -12,7 +12,7 @@ COMMENT=	Script for displaying dependence information on software packages
 USE_PERL5=	YES
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index e47a5e9d563..22fc546d463 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/31 10:24:40 dent Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:42 agc Exp $
 #
 
 DISTNAME=		pkgdiff-0.100
@@ -13,7 +13,7 @@ COMMENT=		Tools to ease creating and maintaining patches for pkgsrc
 USE_PERL5=		YES
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index feed707133e..d054712db3c 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2001/07/15 12:56:58 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2001/09/09 20:36:42 agc Exp $
 #
 
 DISTNAME=		pkglint-3.07
@@ -15,7 +15,7 @@ DEPENDS+=		digest-2001*:../../pkgtools/digest
 USE_PERL5=		YES
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/pkgtools/pkgmanpages/Makefile b/pkgtools/pkgmanpages/Makefile
index 1eb28c51208..4d27571f02d 100644
--- a/pkgtools/pkgmanpages/Makefile
+++ b/pkgtools/pkgmanpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:51:30 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:42 agc Exp $
 #
 
 DISTNAME=	pkgmanpages-19991222
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.netbsd.org/
 COMMENT=	manual page(s) for the packages collection
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index 72695168d37..1a1c93a80af 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/24 11:06:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/09 20:36:43 agc Exp $
 #
 
 DISTNAME=	port2pkg-1.9
@@ -14,7 +14,7 @@ DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
 USE_PERL5=	YES
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 1e1baf5ac50..731e4a825c5 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/04/13 18:13:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:43 agc Exp $
 #
 
 DISTNAME=	url2pkg-1.15
@@ -10,7 +10,7 @@ MAINTAINER=	hubertf@netbsd.org
 COMMENT=	Shellscript to help with the first steps to build a package
 
 EXTRACT_ONLY=	# empty
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 NO_PATCH=	yes
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 1f54a19bfa1..78687e8c520 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/29 22:24:49 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:43 agc Exp $
 
 DISTNAME=	x11-links-0.2
 CATEGORIES=	pkgtools x11
@@ -11,7 +11,7 @@ COMMENT=	shadow tree of links to X11R6 headers and libraries
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	# defined
-NO_WRKSUBDIR=	# defined
+WRKSRC=		${WRKDIR}
 NO_BUILD=	# defined
 NO_MTREE=	# defined
 USE_X11=	# defined
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 68611586dbf..89ef8435f79 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/07/13 07:09:22 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:43 agc Exp $
 #
 
 DISTNAME=	xpkgwedge-1.6
@@ -12,7 +12,7 @@ COMMENT=	allows X11 pkgs to be built and used outside of /usr/X11R6
 
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	# defined
-NO_WRKSUBDIR=	# defined
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	# defined
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL