Move WRKSRC definition away from the first paragraph in a Makefile.

48 files changed, 104 insertions, 96 deletions

diff --git a/textproc/GutenMark-words/Makefile b/textproc/GutenMark-words/Makefile
index 34c965aa225..149af313115 100644
--- a/textproc/GutenMark-words/Makefile
+++ b/textproc/GutenMark-words/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:27:24 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	GutenMark-words-20030107
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.sandroid.org/GutenMark/Wordlists/
 DISTFILES=	${WORDLISTS} GutenMark.cfg
@@ -19,6 +18,7 @@ WORDLISTS=	special.words.gz english.names.gz US.places.gz \
 		swedish.words.gz finnish.words.gz nonenglish.words.gz
 SITES_GutenMark.cfg=http://www.sandroid.org/GutenMark/
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${DISTNAME}
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	YES
diff --git a/textproc/GutenMark/Makefile b/textproc/GutenMark/Makefile
index e1dfaf4b821..1fe95f79b2f 100644
--- a/textproc/GutenMark/Makefile
+++ b/textproc/GutenMark/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:24 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	GutenMark_source_${GVER}
 PKGNAME=	GutenMark-${GVER}
-WRKSRC=		${WRKDIR}/GutenMark-source
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.sandroid.org/GutenMark/SoftwareSnapshots/
 
@@ -13,6 +12,7 @@ COMMENT=	Automatic, high-quality Gutenberg text formatter to LaTeX or HTML
 
 DEPENDS+=	GutenMark-words-[0-9]*:../../textproc/GutenMark-words
 
+WRKSRC=		${WRKDIR}/GutenMark-source
 GVER=		20020714
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile
index 35f43edc53c..c6b008d7ea3 100644
--- a/textproc/biblook/Makefile
+++ b/textproc/biblook/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:26 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	biblook
 PKGNAME=	${DISTNAME}-2.9
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://compgeom.cs.uiuc.edu/~jeffe/files/
 
@@ -13,6 +12,7 @@ COMMENT=	Indexing and searching tools for BibTeX bibliography databases
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=		${WRKDIR}
 MAKE_FLAGS=     CC="${CC}"
 
 # override definitions in the package's Makefile via command line
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index 0f74260d4b7..523e64a9f8c 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2003/09/17 14:57:26 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	catdoc-0.91.4
-WRKSRC=		${WRKDIR}/catdoc
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/misc/
 
@@ -13,6 +12,7 @@ COMMENT=	Reads MS-Word file and puts out its content as plain text
 DISTINFO_FILE=		${.CURDIR}/../../textproc/catdoc/distinfo
 PATCHDIR=		${.CURDIR}/../../textproc/catdoc/patches
 
+WRKSRC=			${WRKDIR}/catdoc
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 0340afb7cdc..6a70e8b4c7d 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:27:28 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=		cdif-1.15
-WRKSRC=			${WRKDIR}
 CATEGORIES=		textproc
 MASTER_SITES=		ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/
 EXTRACT_SUFX=		# empty
@@ -12,6 +11,7 @@ COMMENT=		Word context diff
 
 LICENSE=		no-commercial-use
 
+WRKSRC=			${WRKDIR}
 USE_PERL5=		# defined
 
 NO_CONFIGURE=		# defined
diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index ab842e4da46..944b6331bbf 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/07 09:05:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:49 agc Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between apache-ant and crimson, each of which
@@ -6,7 +6,6 @@
 
 DISTNAME=	${PKGNAME}-bin
 PKGNAME=	crimson-1.1.3
-WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/crimson/
 
@@ -14,6 +13,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/crimson/
 COMMENT=	Apache.org implementation of JAXP, SAX, and DOM
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_JAVA=	run
 USE_BUILDLINK2=	# defined
 NO_CONFIGURE=	# defined
diff --git a/textproc/docbook-simple/Makefile b/textproc/docbook-simple/Makefile
index 984ec2215ad..a62f141605d 100644
--- a/textproc/docbook-simple/Makefile
+++ b/textproc/docbook-simple/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/12/23 22:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	docbook-simple-1.1b1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://docbook.org/xml/simple/1.1b1/
 EXTRACT_SUFX=	.zip
@@ -14,6 +13,7 @@ COMMENT=	Simplified DocBook XML DTD
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
+WRKSRC=		${WRKDIR}
 INSTDIR=	${DESTDIR}${PREFIX}/share/xml
 DTDDIR=		${INSTDIR}/docbook-simple
 DTDFILES=	sdbcent.mod sdocbook-custom.dtd sdocbookref-custom.dtd \
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index a8e32890300..7143ea92fe4 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:13 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	docbook-xml-4.2
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/4.2/
 EXTRACT_SUFX=	.zip
@@ -12,6 +11,7 @@ MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://www.oasis-open.org/docbook
 COMMENT=	XML DTD designed for computer documentation
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
 
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 2c28701f010..b547062139b 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/11/15 02:16:31 danw Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:26:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
 DISTNAME=	docbook-4.2
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=		http://www.oasis-open.org/docbook/sgml/4.2/
 SITES_docbk41.zip=	http://www.oasis-open.org/docbook/sgml/4.1/
@@ -22,6 +21,7 @@ COMMENT=	SGML DTD designed for computer documentation
 BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 DEPENDS+=	iso8879>=1986:../../textproc/iso8879
 
+WRKSRC=		${WRKDIR}
 NO_MTREE=       yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 0e3e9f81283..52980104181 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 22:54:13 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1999/04/24 09:25:32 kuriyama Exp
 
 DISTNAME=	db157
 PKGNAME=	dsssl-docbook-modular-1.57
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/docbook
 CATEGORIES=	textproc
 MASTER_SITES=	http://nwalsh.com/docbook/dsssl/
 DISTFILES=	db157.zip db157d.zip
@@ -19,6 +18,7 @@ DEPENDS+=	docbook>=4.0:../../textproc/docbook
 EXTRACT_CMD=	unzip ${DOWNLOADED_DISTFILE}
 NO_MTREE=	yes
 
+WRKSRC=		${WRKDIR}/docbook
 USE_BUILDLINK2=	# defined
 INSTDIR=	${PREFIX}/share/sgml/docbook/dsssl/modular
 
diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile
index 298d62d62e5..0408b8561d0 100644
--- a/textproc/flyspell/Makefile
+++ b/textproc/flyspell/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:14 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	flyspell.el
 PKGNAME=	flyspell-1.7c
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/
 EXTRACT_SUFX=	# empty
@@ -16,6 +15,7 @@ DEPENDS=	ispell-emacs-[0-9]*:../../textproc/ispell-emacs
 
 EXTRACT_ONLY=	# None
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 NO_CONFIGURE=	#
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 1fe1efdba62..3f413ff2076 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:26: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,6 @@
 
 DISTNAME=	fop-0_15_0-forBeginners
 PKGNAME=	fop-0.15.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/fop/recent/
 EXTRACT_SUFX=	.zip
@@ -21,6 +20,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/fop/
 COMMENT=	The Apache Project's XSL Formatting Objects implementation
 
+WRKSRC=		${WRKDIR}
 USE_JAVA=	run
 USE_BUILDLINK2=
 NO_CONFIGURE=
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 9f61da6b908..0a94a9eca80 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=		helpdc21
 PKGNAME=		helpdeco-21
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SIMTEL:=win95/winhelp/}
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,8 @@ COMMENT=		Windows .hlp to .rtf converter
 
 LICENSE=		no-commercial-use
 
+WRKSRC=			${WRKDIR}
+
 # from ftp://ftp.simtel.net/pub/simtelnet/MIRRORS.TXT
 MASTER_SITE_SIMTEL+=	ftp://ftp.cdrom.com/pub/simtelnet/ \
 			ftp://ftp.datacanyon.com/pub/simtelnet/ \
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index f7fb253905d..a9b5a4c1d52 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:54:19 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	html-4.0b
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 
@@ -13,6 +12,7 @@ COMMENT=	SGML DTDs for the Hypertext Markup Language
 
 DEPENDS+=	iso8879>=1986:../../textproc/iso8879
 
+WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index fced6b4e561..9dbfcdf2e6d 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/01/07 02:21:17 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	icu-2.6.1
-WRKSRC=		${WRKDIR}/${PKGBASE}/source
 CATEGORIES=	textproc
 #
 # The IBM site has long delays that can cause ftp to timeout.  Use the
@@ -16,6 +15,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://oss.software.ibm.com/icu/
 COMMENT=	Robust and full-featured Unicode services
 
+WRKSRC=			${WRKDIR}/${PKGBASE}/source
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index e48be304deb..0a647de0743 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp
 #
 
 DISTNAME=	iso12083-1993
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://info.ex.ac.uk/pub/SGML/ISO-12083/ \
 		ftp://ftp.ifi.uio.no/pub/SGML/ISO12083/ \
@@ -17,6 +16,7 @@ COMMENT=	SGML DTDs from the The Electronic Publishing Special Interest Group
 
 DIST_SUBDIR=	iso12083
 
+WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 NO_BUILD=	yes
 EXTRACT_ONLY=	# empty
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 8f6f713909d..9fc878ac22d 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:42:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:26:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp
 #
 
 DISTNAME=	isoENTS
 PKGNAME=	iso8879-1986
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 EXTRACT_SUFX=	.zip
@@ -14,6 +13,7 @@ MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.iso.ch/cate/d16387.html
 COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 
+WRKSRC=		${WRKDIR}
 NO_MTREE=       yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index be5d04a3e4b..b6f5eeaa393 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/08/09 11:27:49 seb Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	ispell-3.1.20
 PKGNAME=	ispell-base-3.1.20
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/ispell-3.1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
 
@@ -17,6 +16,7 @@ COMMENT=	Interactive spelling checker
 
 CONFLICTS+=	ispell-[0-9]*
 
+WRKSRC=		${WRKDIR}/ispell-3.1
 MAKE_FLAGS+=	TMPDIR="${WRKDIR}"
 
 USE_MAKEINFO=	YES
diff --git a/textproc/ispell-british/Makefile b/textproc/ispell-british/Makefile
index 698868ed405..b704fd3b0b2 100644
--- a/textproc/ispell-british/Makefile
+++ b/textproc/ispell-british/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:22 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:49 agc Exp $
 #
 
 DISTNAME=	ispell-3.1.20
 PKGNAME=	ispell-${DICT_LANG}-3.1.20
-WRKSRC=		${WRKDIR}/ispell-3.1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
 
@@ -13,6 +12,7 @@ COMMENT=	British dictionary for interactive spelling checker
 
 DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
 
+WRKSRC=		${WRKDIR}/ispell-3.1
 ALL_TARGET=	config.sh all-languages
 
 DICT_LANG=	british
diff --git a/textproc/ispell-catalan/Makefile b/textproc/ispell-catalan/Makefile
index 944965b8882..9525ca982fa 100644
--- a/textproc/ispell-catalan/Makefile
+++ b/textproc/ispell-catalan/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:22 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	ispell-sc-ca
 PKGNAME=	ispell-catalan-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.softcatala.org/cgi-bin/gaudi/contadorb/load.cgi?/fitxers/linux/
 EXTRACT_SUFX=	.zip
@@ -14,6 +13,8 @@ COMMENT=	Catalan dictionary for interactive spelling checker
 
 DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
 
+WRKSRC=		${WRKDIR}
+
 post-extract:
 	( cd ${WRKSRC} 							\
 		&& ${MV} catalan_i.dic catala.dic && 			\
diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile
index a1f6c5ad6e7..aaf643933ec 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:23 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	ispell.el
 PKGNAME=	ispell-emacs-3.6
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://kdstevens.com/pub/stevens/
 EXTRACT_SUFX=	.gz
@@ -15,6 +14,7 @@ COMMENT=	Emacs interface for ispell spell checker
 DEPENDS=	ispell-base-[0-9]*:../../textproc/ispell-base
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}
 
 NO_CONFIGURE=	#
 NO_BUILD=	#
diff --git a/textproc/ispell-francais/Makefile b/textproc/ispell-francais/Makefile
index 539d4b50ad5..9cee7c142ae 100644
--- a/textproc/ispell-francais/Makefile
+++ b/textproc/ispell-francais/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:23 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	francais-IREQ-1.4
 PKGNAME=	ispell-francais-1.4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.robot.ireq.ca/pub/ispell/
 
@@ -13,4 +12,6 @@ COMMENT=	French dictionary for interactive spelling checker
 
 DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-russian/Makefile b/textproc/ispell-russian/Makefile
index 3d7c0825abb..c74cac3aea6 100644
--- a/textproc/ispell-russian/Makefile
+++ b/textproc/ispell-russian/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/09/25 17:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	rus-ispell-0.99f5
 PKGNAME=	ispell-russian-0.99.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/
 
@@ -11,6 +10,7 @@ COMMENT=	Russian (KOI8-R) ispell dictonary from Alexander Lebedev
 
 DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
 
+WRKSRC=		${WRKDIR}
 MAKE_ENV+=	CAT=${CAT} RM=${RM} SED=${SED} TR=${TR} UNIQ="uniq"
 
 .ifdef YO
diff --git a/textproc/makeztxt/Makefile b/textproc/makeztxt/Makefile
index 80d5d076a01..a5b1030dd6f 100644
--- a/textproc/makeztxt/Makefile
+++ b/textproc/makeztxt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:30 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	${PKGNAME}b-src
 PKGNAME=	makeztxt-1.40
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}b
 CATEGORIES=	textproc converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gutenpalm/}
 
@@ -11,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://gutenpalm.sourceforge.net/makeztxt.php
 COMMENT=	ASCII text to Palm zTXT database converter
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}b
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/makeztxt ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/makeztxt
diff --git a/textproc/namazu1/Makefile b/textproc/namazu1/Makefile
index 8af92f84c27..e8f66256057 100644
--- a/textproc/namazu1/Makefile
+++ b/textproc/namazu1/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:30 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/03/31 11:52:07 flathill Exp $
 
 DISTNAME=	namazu-1.3.0.11
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 
@@ -17,6 +16,8 @@ DEPENDS+=	nkf-1.7:../../converters/nkf
 DEPENDS+=	p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen
 .endif
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
 CONFIGURE_ARGS+=	--with-cgi-dir=${LOCALBASE}/libexec/cgi-bin
 .if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
 CONFIGURE_ARGS+=	-without-chasen
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index 3c8ddef773b..f5481869ecc 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:27:37 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	PDF-111
 PKGNAME=	p5-PDF-1.11
 SVR4_PKGNAME=	p5pdf
-WRKSRC=		${WRKDIR}/PDF
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PDF/}
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/CapeCanaveral/Hangar/4794/
 COMMENT=	Perl5 module for pdf document manipulation
 
+WRKSRC=			${WRKDIR}/PDF
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/.packlist
 
diff --git a/textproc/p5-Text-DelimMatch/Makefile b/textproc/p5-Text-DelimMatch/Makefile
index e1364a2217c..432973d1482 100644
--- a/textproc/p5-Text-DelimMatch/Makefile
+++ b/textproc/p5-Text-DelimMatch/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/11/18 13:42:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	DelimMatch-1.06a
 PKGNAME=	p5-Text-${DISTNAME}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
 SVR4_PKGNAME=	p5tdm
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/DelimMatch/
 COMMENT=	Find regexp delimited strings with proper nesting
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/a$//}
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/DelimMatch/.packlist
 
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index 907a96af513..dfc6358eb03 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/03 22:14:46 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	libxml-enno-1.05a
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5lxe
-WRKSRC=		${WRKDIR}/libxml-enno-1.05
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/T/TJ/TJMATHER/}
 
@@ -20,6 +19,7 @@ DEPENDS+=	p5-Parse-Yapp>=1.04:../../devel/p5-Parse-Yapp
 CONFLICTS+=	p5-XML-DOM-[0-9]* p5-XML-XQL-[0-9]*
 CONFLICTS+=	p5-XML-Checker-[0-9]* p5-XML-RegExp-[0-9]*
 
+WRKSRC=			${WRKDIR}/libxml-enno-1.05
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-enno/.packlist
 
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index 20335a876fb..ba517f67d67 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/09/09 14:18:58 recht Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	postgresql_autodoc-1.12
-WRKSRC=		${WRKDIR}/postgresql_autodoc
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://www.rbt.ca/autodoc/binaries/
 
@@ -13,6 +12,7 @@ COMMENT=	Generate HTML, DOT, and XML description of database structure
 DEPENDS=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
 DEPENDS+=	p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 
+WRKSRC=		${WRKDIR}/postgresql_autodoc
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_BUILDLINK2=	yes
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index 2292ac8b652..fb0a71197f6 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/09/18 02:43:49 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	HappyDoc_r2_1
 PKGNAME=	${PYPKGPREFIX}-HappyDoc-2.1
-WRKSRC=		${WRKDIR}/HappyDoc-r2_1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=happydoc/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://happydoc.sf.net/
 COMMENT=	Python tool to generate Python API documents
 
+WRKSRC=		${WRKDIR}/HappyDoc-r2_1
 PYDISTUTILSPKG=	# defined
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 USE_BUILDLINK2=	yes
diff --git a/textproc/py-dtml/Makefile b/textproc/py-dtml/Makefile
index 8b620de358f..5393f2e3c3d 100644
--- a/textproc/py-dtml/Makefile
+++ b/textproc/py-dtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
 PKGNAME=	py-dtml-2.2.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/lib/python/DocumentTemplate
 CATEGORIES=	textproc
 MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	DTML and StructuredText from Zope, also independently useful
 
 DEPENDS+=	py-extclass>=2.2.2:../../lang/py-extclass
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/lib/python/DocumentTemplate
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 EXTRACT_ELEMENTS=	${DISTNAME}/lib/python/DocumentTemplate \
 			${DISTNAME}/lib/python/StructuredText \
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 19e20d3a9d5..c9340264411 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/04 11:47:17 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	libxml2-2.6.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-WRKSRC=		${WRKDIR}/${DISTNAME}/python
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ MAINTAINER=	minskim@bawi.org
 HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	Python wrapper for libxml2
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/python
 PYDISTUTILSPKG=	YES
 USE_BUILDLINK2=	YES
 NO_CONFIGURE=	YES
diff --git a/textproc/pyDict/Makefile b/textproc/pyDict/Makefile
index 322da0831d7..93e0b49b654 100644
--- a/textproc/pyDict/Makefile
+++ b/textproc/pyDict/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	pyDict-0.2.5.1
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/dict
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pydict/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/pydict/
 COMMENT=	Chinese <-> English dictionary, under both console and X11
 
+WRKSRC=		${WRKDIR}/dict
 USE_X11BASE=	yes
 
 NO_CONFIGURE=	yes
diff --git a/textproc/qsubst/Makefile b/textproc/qsubst/Makefile
index ddfae7644e2..99765780ad1 100644
--- a/textproc/qsubst/Makefile
+++ b/textproc/qsubst/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:27:50 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	qsubst-20010422
-WRKSRC=		${WRKDIR}/qsubst
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Query-replace strings in files
 
+WRKSRC=		${WRKDIR}/qsubst
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rfcutil/Makefile b/textproc/rfcutil/Makefile
index 7c04e7821c1..b43dc8b6421 100644
--- a/textproc/rfcutil/Makefile
+++ b/textproc/rfcutil/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:47 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	rfc-3.2
 PKGNAME=	rfcutil-3.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.dewn.com/rfc/
 EXTRACT_SUFX=	#
@@ -14,6 +13,7 @@ COMMENT=	Search for RFCs and do ports, services & protocol lookups
 
 DEPENDS+=	w3m-[0-9]*:../../www/w3m
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	#
 
 NO_BUILD=	YES
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 751ca965fcd..fe445e3d83f 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 22:54:48 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:26:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/12/08 15:45:27 tg Exp
 #
 
 DISTNAME=	rman
 PKGNAME=	rman-3.0.9
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://polyglot.sourceforge.net/pub/polyglotman/ \
 		http://polyglotman.sourceforge.net/
@@ -13,6 +12,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://polyglotman.sourceforge.net/
 COMMENT=	Produces HTML from formatted and unformatted man pages
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if exists(${X11BASE}/bin/rman)
diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index f3278672c0b..6223fdcc0f4 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=		RTF-1.10
 PKGNAME=		rtf-tools-1.10
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/rtf
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.snake.net/software/RTF/
 EXTRACT_SUFX=		.tar.Z
@@ -15,6 +14,7 @@ COMMENT=		RTF to troff/groff/text converter
 
 BUILD_DEPENDS+=		libts-1.08:../../devel/libts
 
+WRKSRC=			${WRKDIR}/rtf
 INSTALL_TARGET=		install install.man
 
 post-patch:
diff --git a/textproc/ruby-rexml/Makefile b/textproc/ruby-rexml/Makefile
index 0cd40ec3a11..f940d300848 100644
--- a/textproc/ruby-rexml/Makefile
+++ b/textproc/ruby-rexml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/26 16:16:51 taca Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	rexml_2.4.8
 PKGNAME=	${RUBY_PKGNAMEPREFIX}rexml-2.4.8
-WRKSRC=		${WRKDIR}/rexml
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.germane-software.com/archives/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	rasputin@idoru.mine.nu
 HOMEPAGE=	http://www.germane-software.com/software/rexml/
 COMMENT=	Pure Ruby XML parser based on Java Electric XML
 
+WRKSRC=		${WRKDIR}/rexml
 USE_RUBY=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 09bf219b454..12b4faa15a5 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:54:51 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	saxon
 PKGNAME=	saxon-6.0.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	${HOMEPAGE}saxon6.0.2/
 EXTRACT_SUFX=	.zip
@@ -12,6 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://users.iclway.co.uk/mhkay/saxon/
 COMMENT=	Michael H. Kay's Java XSLT processor
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME}
 USE_JAVA=	run
 USE_BUILDLINK2=
diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index 1b4d3eaff24..29aae261a42 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	subtitleripper-0.3-1
@@ -6,7 +6,6 @@ PKGREVISION=	1
 CATEGORIES=	textproc graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=subtitleripper/}
 EXTRACT_SUFX=	.tgz
-WRKSRC=		${WRKDIR}/subtitleripper
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/subtitleripper/
@@ -14,6 +13,7 @@ COMMENT=	Sub title ripping program
 
 DEPENDS+=	gocr-[0-9]*:../../textproc/gocr
 
+WRKSRC=			${WRKDIR}/subtitleripper
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 
diff --git a/textproc/tei/Makefile b/textproc/tei/Makefile
index 3c38bff0668..5be4489b5e6 100644
--- a/textproc/tei/Makefile
+++ b/textproc/tei/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:46:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	dtd
 PKGNAME=	tei-4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/P4X/DTD/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ MAINTAINER=	minskim@bawi.org
 HOMEPAGE=	http://www.tei-c.org/
 COMMENT=	DTD of the Text Encoding Initiative
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/textproc/teixsl-fo/Makefile b/textproc/teixsl-fo/Makefile
index a5662e88eea..e6d245ed04e 100644
--- a/textproc/teixsl-fo/Makefile
+++ b/textproc/teixsl-fo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:48:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	teixsl-fo
 PKGNAME=	${DISTNAME}-3.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Stylesheets/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ MAINTAINER=	minskim@bawi.org
 HOMEPAGE=	http://www.tei-c.org/Stylesheets/teixsl.html
 COMMENT=	XSLT Stylesheets to convert TEI to XSL Formatting Objects
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/textproc/teixsl-html/Makefile b/textproc/teixsl-html/Makefile
index b636ae96423..3094545f8d4 100644
--- a/textproc/teixsl-html/Makefile
+++ b/textproc/teixsl-html/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:49:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:50 agc Exp $
 
 DISTNAME=	teixsl-html
 PKGNAME=	${DISTNAME}-3.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Stylesheets/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ MAINTAINER=	minskim@bawi.org
 HOMEPAGE=	http://www.tei-c.org/Stylesheets/teixsl.html
 COMMENT=	XSLT Stylesheets to convert TEI to HTML
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile
index a551d2a4c30..1e7d053ca33 100644
--- a/textproc/untex/Makefile
+++ b/textproc/untex/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:27:54 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	untex-1.3
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://hal6000.uni-duisburg.de/pub/source/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Remove LaTeX commands
 
+WRKSRC=		${WRKDIR}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/untex.man ${PREFIX}/man/man1/untex.1
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 4ec90d72710..cda7f34f980 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:27:55 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	Xalan-C_1_0-linux
 PKGNAME=	xalan-c-1.0
-WRKSRC=		${WRKDIR}/xml-xalan/c/src
 CATEGORIES=	textproc
 MASTER_SITES=	http://xml.apache.org/dist/xalan-c/
 
@@ -14,6 +13,7 @@ COMMENT=	The Apache Project's XSLT implementation
 DEPENDS+=	icu>=1.7:../../textproc/icu
 DEPENDS+=	xerces-c>=1.3.0:../../textproc/xerces-c
 
+WRKSRC=		${WRKDIR}/xml-xalan/c/src
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 5a80d58b892..cf0e84ab21d 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 17:27:55 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:50 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
@@ -6,7 +6,6 @@
 
 DISTNAME=	xalan-j_1_2
 PKGNAME=	xalan-j-1.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/xalan-j/
 
@@ -16,6 +15,7 @@ COMMENT=	The Apache Project's XSLT implementation
 
 DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
 
+WRKSRC=		${WRKDIR}
 USE_JAVA=	run
 USE_BUILDLINK2=
 NO_CONFIGURE=
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 421d63766dc..9373b88720b 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 17:27:56 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:50 agc Exp $
 #
 
 DISTNAME=	xerces-c-src1_7_0
 PKGNAME=	${DISTNAME:S/-src/-/:S/_/./g}
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/xercesc
 CATEGORIES=	textproc
 MASTER_SITES=	http://xml.apache.org/dist/xerces-c/stable/archives/Xerces-C_${DISTNAME:S/xerces-c-src//}/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/xerces-c/
 COMMENT=	Validating C++ XML parser with DOM and SAX support
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src/xercesc
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index c7582e1add0..28827fdb401 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/21 17:27:57 martti Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:26:50 agc Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xerces-J,
 # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -6,7 +6,6 @@
 
 DISTNAME=	Xerces-J-bin.1.2.0
 PKGNAME=	xerces-j-1.2.0
-WRKSRC=		${WRKDIR}/xerces-1_2_0
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/xerces-j/
 
@@ -14,6 +13,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://xml.apache.org/xerces-j/
 COMMENT=	The Apache Project's validating XML parser with DOM and SAX support
 
+WRKSRC=		${WRKDIR}/xerces-1_2_0
 USE_JAVA=	run
 USE_BUILDLINK2=
 NO_CONFIGURE=