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

11 files changed, 22 insertions, 22 deletions

diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 44a5d5cbb71..6453c21f836 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/07 21:16:10 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:48 agc Exp $
 #
 
 DISTNAME=		cdif-1.15
@@ -13,7 +13,7 @@ LICENSE=		no-commercial-use
 
 USE_PERL5=		# defined
 
-NO_WRKSUBDIR=		# defined
+WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/textproc/detex/Makefile b/textproc/detex/Makefile
index 54644311d75..b8c8ddd837e 100644
--- a/textproc/detex/Makefile
+++ b/textproc/detex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:48 agc Exp $
 #
 
 DISTNAME=	detex-2.7
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.purdue.edu/homes/trinkle/detex/
 COMMENT=	remove LaTeX commands
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/detex ${PREFIX}/bin
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index f05c4c436db..15a5253ee73 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:48 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
@@ -22,7 +22,7 @@ DEPENDS+=	iso8879-1986:../../textproc/iso8879
 NO_MTREE=       yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/docbook
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 83cfba8663b..e6c64fdcb6a 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/14 01:43:40 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:49 agc Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -12,7 +12,7 @@
 
 DISTNAME=	fop-0_15_0-forBeginners
 PKGNAME=	fop-0.15.0
-NO_WRKSUBDIR=
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/fop/recent/
 EXTRACT_SUFX=	.zip
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 49b583025a9..0e4de915057 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/23 15:47:43 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:49 agc Exp $
 #
 
 DISTNAME=		helpdc21
@@ -11,7 +11,7 @@ MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.simtel.net/pub/pd/23694.shtml
 COMMENT=		windows .hlp to .rtf converter
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}
 
 LICENSE=		no-commercial-use
 
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index c73bbfb7098..9a0d7c19d38 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:49 agc Exp $
 #
 
 DISTNAME=	html-4.0b
@@ -14,7 +14,7 @@ DEPENDS+=	iso8879-1986:../../textproc/iso8879
 NO_MTREE=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 INSTDIR=        ${PREFIX}/share/sgml/html
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index a69133c4666..77767504ff2 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp
 #
 
@@ -17,7 +17,7 @@ DIST_SUBDIR=	iso12083
 
 NO_MTREE=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 
 INSTDIR=	${PREFIX}/share/sgml/iso12083
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index e35632415a2..22bff93615e 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp
 #
 
@@ -15,7 +15,7 @@ COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 NO_MTREE=       yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/iso8879
 
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index d6e7350f080..707ce73a50a 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/04/13 05:16:18 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:50 agc Exp $
 #
 
 DISTNAME=	saxon
 PKGNAME=	saxon-6.0.2
-NO_WRKSUBDIR=
 CATEGORIES=	textproc www
 MASTER_SITES=	${HOMEPAGE}saxon6.0.2/
 EXTRACT_SUFX=	.zip
@@ -17,6 +16,7 @@ USE_JAVA=	yes
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile
index a2948842425..62ed2ed0282 100644
--- a/textproc/untex/Makefile
+++ b/textproc/untex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:50 agc Exp $
 #
 
 DISTNAME=	untex-1.3
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://hal6000.uni-duisburg.de/pub/source/
 MAINTAINER=	packages@netbsd.org
 COMMENT=	remove LaTeX commands
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 6c8da96758c..86bb3a6bb15 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:51 agc Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xalan-J,
 # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -20,7 +20,7 @@ NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
 
-NO_WRKSUBDIR=
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java