Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

38 files changed, 76 insertions, 95 deletions

diff --git a/textproc/GutenMark-words/Makefile b/textproc/GutenMark-words/Makefile
index f7b596932f8..f05918f35db 100644
--- a/textproc/GutenMark-words/Makefile
+++ b/textproc/GutenMark-words/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/08 18:41:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:35 jmmv Exp $
 #
 
 DISTNAME=	GutenMark-words-20030107
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.sandroid.org/GutenMark/Wordlists/
 DISTFILES=	${WORDLISTS} GutenMark.cfg
@@ -21,7 +22,6 @@ SITES_GutenMark.cfg=http://www.sandroid.org/GutenMark/
 DIST_SUBDIR=	${DISTNAME}
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	YES
-WRKSRC=		${WRKDIR}
 
 post-extract:
 	${CP} ${_DISTDIR}/GutenMark.cfg ${WRKDIR}/GutenMark.cfg.in
diff --git a/textproc/GutenMark/Makefile b/textproc/GutenMark/Makefile
index 7f5e09fd8cb..434b0a64d80 100644
--- a/textproc/GutenMark/Makefile
+++ b/textproc/GutenMark/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/05 15:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:35 jmmv Exp $
 #
 
 DISTNAME=	GutenMark_source_${GVER}
 PKGNAME=	GutenMark-${GVER}
+WRKSRC=		${WRKDIR}/GutenMark-source
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.sandroid.org/GutenMark/SoftwareSnapshots/
 
@@ -13,7 +14,6 @@ COMMENT=	automatic, high-quality Gutenberg text formatter to LaTeX or HTML
 DEPENDS+=	GutenMark-words-[0-9]*:../../textproc/GutenMark-words
 
 GVER=		20020714
-WRKSRC=		${WRKDIR}/GutenMark-source
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 ALL_TARGET=	GutenMark
diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile
index 6a4cb53dca2..1b1ff423a9b 100644
--- a/textproc/biblook/Makefile
+++ b/textproc/biblook/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/31 10:54:21 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:35 jmmv Exp $
 #
 
 DISTNAME=	biblook
 PKGNAME=	${DISTNAME}-2.9
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://compgeom.cs.uiuc.edu/~jeffe/files/
 
@@ -10,8 +11,6 @@ MAINTAINER=	seb@pbox.org
 HOMEPAGE=	http://compgeom.cs.uiuc.edu/~jeffe/biblook.html
 COMMENT=	indexing and searching tools for BibTeX bibliography databases
 
-WRKSRC=		${WRKDIR}
-
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_FLAGS=     CC=${CC}
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 1d5ed9cf5a6..6685025014f 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2001/06/11 06:34:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/29 12:42:35 jmmv Exp $
 #
 
 DISTNAME=	catdoc-0.91.4
+WRKSRC=		${WRKDIR}/catdoc
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/misc/
 
@@ -11,8 +12,6 @@ COMMENT=	reads MS-Word file and puts out its content as plain text
 
 DEPENDS=	tk>=8.3.2:../../x11/tk
 
-WRKSRC=		${WRKDIR}/catdoc
-
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 6453c21f836..a3d1d4c8fa2 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:48 agc Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:35 jmmv Exp $
 #
 
 DISTNAME=		cdif-1.15
+WRKSRC=			${WRKDIR}
 CATEGORIES=		textproc
 MASTER_SITES=		ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/
 EXTRACT_SUFX=		# empty
@@ -13,7 +14,6 @@ LICENSE=		no-commercial-use
 
 USE_PERL5=		# defined
 
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index 1681f842e40..33d49ac747e 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/02/17 07:42:21 salo Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:36 jmmv Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between jakarta-ant and crimson, each of which
@@ -6,6 +6,7 @@
 
 DISTNAME=	${PKGNAME}-bin
 PKGNAME=	crimson-1.1.3.1
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/crimson/
 
@@ -13,7 +14,6 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://xml.apache.org/crimson/
 COMMENT=	Apache.org implementation of JAXP, SAX, and DOM
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
 USE_JAVA=	run
 USE_BUILDLINK2=	# defined
 NO_CONFIGURE=	# defined
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index ab9ed87ed4c..8fe6253dc3f 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/01/29 21:17:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:36 jmmv Exp $
 #
 
 DISTNAME=	docbook-xml-4.2
-WRKSRC=		${WRKDIR}
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/4.2/
 EXTRACT_SUFX=	.zip
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 014a2c321ca..70459f036d4 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2003/03/22 10:31:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:42:36 jmmv 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/ \
@@ -26,7 +27,6 @@ NO_MTREE=       yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       yes
-WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/docbook
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index a130f900db9..0695d0f6730 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2003/01/29 21:35:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:42:36 jmmv 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
@@ -17,7 +18,6 @@ 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 a13bb8d6637..705fd2f75d2 100644
--- a/textproc/flyspell/Makefile
+++ b/textproc/flyspell/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/04 09:12:09 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:36 jmmv 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
@@ -15,7 +16,6 @@ DEPENDS=	ispell-emacs-[0-9]*:../../textproc/ispell-emacs
 
 EXTRACT_ONLY=	# None
 
-WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 NO_CONFIGURE=	#
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 61d7facd1a3..7bfe52a51b1 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 18:55:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:37 jmmv Exp $
 #
 
 DISTNAME=		helpdc21
 PKGNAME=		helpdeco-21
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SIMTEL:=win95/winhelp/}
 EXTRACT_SUFX=		.zip
@@ -12,8 +13,6 @@ MAINTAINER=		collver1@attbi.com
 HOMEPAGE=		http://www.simtel.net/pub/pd/23694.shtml
 COMMENT=		windows .hlp to .rtf converter
 
-WRKSRC=			${WRKDIR}
-
 LICENSE=		no-commercial-use
 
 # from ftp://ftp.simtel.net/pub/simtelnet/MIRRORS.TXT
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index 51861a17baf..6e7231000e4 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/01/29 21:15:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:37 jmmv Exp $
 #
 
 DISTNAME=	html-4.0b
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 
@@ -16,7 +17,6 @@ NO_MTREE=	yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
 
 INSTDIR=        ${PREFIX}/share/sgml/html
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 25675b7911e..281751d8157 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/03/21 23:44:05 salo Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:37 jmmv Exp $
 #
 
 DISTNAME=	icu-2.4
+WRKSRC=		${WRKDIR}/${PKGBASE}/source
 CATEGORIES=	textproc
 MASTER_SITES=	http://oss.software.ibm.com/icu/download/${PKGVERSION}/
 EXTRACT_SUFX=	.tgz
@@ -10,7 +11,6 @@ MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://oss.software.ibm.com/icu
 COMMENT=	Robust and full-featured unicode support
 
-WRKSRC=		${WRKDIR}/${PKGBASE}/source
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_BUILDLINK2=	YES
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 36baaec85f9..e48be304deb 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/01/29 21:15:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:37 jmmv 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/ \
@@ -18,7 +19,6 @@ DIST_SUBDIR=	iso12083
 
 NO_MTREE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 USE_BUILDLINK2=	yes
 
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index c5a6d7cb0db..8f6f713909d 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2003/01/29 21:15:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:42:37 jmmv 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
@@ -17,7 +18,6 @@ NO_MTREE=       yes
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       yes
-WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/iso8879
 
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index 097f7735edb..b1f4475703a 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2003/01/10 15:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:42:38 jmmv 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/
 
@@ -18,8 +19,6 @@ CONFLICTS+=	ispell-[0-9]*
 
 MAKE_FLAGS+=	TMPDIR="${WRKDIR}"
 
-WRKSRC=		${WRKDIR}/ispell-3.1
-
 INFO_FILES=	ispell.info
 
 .if exists(/usr/include/inttypes.h)
diff --git a/textproc/ispell-british/Makefile b/textproc/ispell-british/Makefile
index 93bcb3de768..bdddfbddb8b 100644
--- a/textproc/ispell-british/Makefile
+++ b/textproc/ispell-british/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/01/10 15:30:46 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:38 jmmv 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/
 
@@ -12,8 +13,6 @@ 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 4bc4bd03ac9..f4fbc932a28 100644
--- a/textproc/ispell-catalan/Makefile
+++ b/textproc/ispell-catalan/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/01/03 15:27:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:38 jmmv 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
@@ -13,8 +14,6 @@ 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 821f083403b..906c2d184fd 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/04 09:10:00 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:38 jmmv Exp $
 #
 
 DISTNAME=	ispell.el
 PKGNAME=	ispell-emacs-3.6
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://kdstevens.com/pub/stevens/
 EXTRACT_SUFX=	.gz
@@ -13,7 +14,6 @@ COMMENT=	Emacs interface for ispell spell checker
 
 DEPENDS=	ispell-base-[0-9]*:../../textproc/ispell-base
 
-WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 NO_CONFIGURE=	#
diff --git a/textproc/ispell-francais/Makefile b/textproc/ispell-francais/Makefile
index 184e6694bc1..60338a4af2f 100644
--- a/textproc/ispell-francais/Makefile
+++ b/textproc/ispell-francais/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/03/15 15:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:38 jmmv Exp $
 #
 
 DISTNAME=	francais-IREQ-1.4
 PKGNAME=	ispell-francais-1.4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.robot.ireq.ca/pub/ispell/
 
@@ -12,6 +13,4 @@ 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 7bb023b8c96..98877859de5 100644
--- a/textproc/ispell-russian/Makefile
+++ b/textproc/ispell-russian/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/19 15:53:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:39 jmmv Exp $
 
 DISTNAME=	rus-ispell-0.99f3
 PKGNAME=	ispell-russian-0.99.3
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/
 
@@ -10,8 +11,6 @@ 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/namazu1/Makefile b/textproc/namazu1/Makefile
index d7f23319bfd..7bc006bd693 100644
--- a/textproc/namazu1/Makefile
+++ b/textproc/namazu1/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:39 seb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:39 jmmv 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/
 
@@ -31,7 +32,6 @@ GNU_CONFIGURE=	yes
 
 CONFLICTS+=	namazu-[0-9]*
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONTRIBDIR=	${WRKDIR}/${DISTNAME}/contrib
 
 CONFDIR=	${LOCALBASE}/etc/namazu
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index 25be327ca57..06e2ad1d379 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:03 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:39 jmmv 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
@@ -15,7 +16,5 @@ COMMENT=	perl5 module for pdf document manipulation
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/.packlist
 
-WRKSRC=		${WRKDIR}/PDF
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index 13ef0ece14e..c91c38aa5a7 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/10/27 20:48:57 seb Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:39 jmmv 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/}
 
@@ -19,8 +20,6 @@ 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 2e0cab0516f..6ee5055607e 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/26 22:20:36 mjl Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:39 jmmv Exp $
 #
 
 VERS=		1.01
 DISTNAME=	postgresql_autodoc-${VERS}
+WRKSRC=         ${WRKDIR}
 CATEGORIES=	textproc database
 MASTER_SITES=	http://www.rbt.ca/autodoc/
 
@@ -17,8 +18,6 @@ DEPENDS+=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
 NO_BUILD=	YES
 REPLACE_PERL=	postgresql_autodoc.pl
 
-WRKSRC=         ${WRKDIR}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/postgresql_autodoc.pl ${PREFIX}/bin/postgresql_autodoc
 
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index 3ee044b61df..231170a819c 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/25 17:02:43 shell Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:40 jmmv Exp $
 
 DISTNAME=	HappyDoc_r2_1
 PKGNAME=	${PYPKGPREFIX}-HappyDoc-2.1
+WRKSRC=		${WRKDIR}/HappyDoc-r2_1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=happydoc/}
 
@@ -12,8 +13,6 @@ COMMENT=	python tool to generate Python API documents
 PYDISTUTILSPKG=	# defined
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-WRKSRC=		${WRKDIR}/HappyDoc-r2_1
-
 post-extract:
 	${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX}
 
diff --git a/textproc/py-dtml/Makefile b/textproc/py-dtml/Makefile
index 2548f3bd706..b409b803b1d 100644
--- a/textproc/py-dtml/Makefile
+++ b/textproc/py-dtml/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/01/22 18:28:59 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:40 jmmv 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
@@ -18,8 +19,6 @@ EXTRACT_ELEMENTS=	${DISTNAME}/lib/python/DocumentTemplate \
 			${DISTNAME}/lib/python/StructuredText \
 			${DISTNAME}/lib/python/ts_regex.py
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/lib/python/DocumentTemplate
-
 do-configure:
 	( cd ${WRKSRC} ;\
 	  ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . ;\
diff --git a/textproc/pyDict/Makefile b/textproc/pyDict/Makefile
index 441f9ead11c..39b3c403210 100644
--- a/textproc/pyDict/Makefile
+++ b/textproc/pyDict/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/10/29 17:51:11 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:40 jmmv Exp $
 
 DISTNAME=	pyDict-0.2.5.1
+WRKSRC=		${WRKDIR}/dict
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pydict/}
 
@@ -10,7 +11,6 @@ COMMENT=	Chinese <-> English dictionary, under both console and X11
 
 USE_X11BASE=	yes
 
-WRKSRC=		${WRKDIR}/dict
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
diff --git a/textproc/qsubst/Makefile b/textproc/qsubst/Makefile
index a953f6d8a7b..3e03b0f932d 100644
--- a/textproc/qsubst/Makefile
+++ b/textproc/qsubst/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/22 05:55:05 simonb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:41 jmmv Exp $
 #
 
 DISTNAME=	qsubst-20010422
+WRKSRC=		${WRKDIR}/qsubst
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@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 ec462d89705..ff4e8841fdd 100644
--- a/textproc/rfcutil/Makefile
+++ b/textproc/rfcutil/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/04/17 20:58:43 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:41 jmmv Exp $
 #
 
 DISTNAME=	rfc-3.2
 PKGNAME=	rfcutil-3.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.dewn.com/rfc/
 EXTRACT_SUFX=	#
@@ -13,7 +14,6 @@ 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 3419310b4b6..eecbc539407 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2002/12/07 02:39:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:42:41 jmmv 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}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://polyglot.sourceforge.net/pub/polyglotman/ \
 		http://polyglotman.sourceforge.net/
@@ -12,8 +13,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://polyglotman.sourceforge.net/
 COMMENT=	Produces HTML from formatted and unformatted man pages
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if exists(${X11BASE}/bin/rman)
diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index cce5c14cf1d..961653c380d 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 18:55:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:41 jmmv Exp $
 #
 
 DISTNAME=		RTF-1.10
 PKGNAME=		rtf-tools-1.10
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/rtf
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.primate.wisc.edu/software/RTF/
 EXTRACT_SUFX=		.tar.Z
@@ -14,7 +15,6 @@ 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/saxon/Makefile b/textproc/saxon/Makefile
index ff30b62dce2..4baa71ad85f 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/28 21:14:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:42 jmmv Exp $
 #
 
 DISTNAME=	saxon
 PKGNAME=	saxon-6.0.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	${HOMEPAGE}saxon6.0.2/
 EXTRACT_SUFX=	.zip
@@ -17,8 +18,6 @@ USE_BUILDLINK2=
 NO_CONFIGURE=
 NO_BUILD=
 
-WRKSRC=		${WRKDIR}
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/saxon.jar ${PREFIX}/lib/java
diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile
index 62ed2ed0282..02a5aec2e0b 100644
--- a/textproc/untex/Makefile
+++ b/textproc/untex/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:50 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:42 jmmv Exp $
 #
 
 DISTNAME=	untex-1.3
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://hal6000.uni-duisburg.de/pub/source/
 
 MAINTAINER=	packages@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 3a185389075..208622dd3be 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/04/19 20:02:32 manu Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:42 jmmv 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/
 
@@ -13,7 +14,6 @@ COMMENT=	the Apache Project's XSLT implementation
 DEPENDS+=	icu>=1.7:../../textproc/icu
 DEPENDS+=	xerces-c-1.3.*:../../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 5608fb0cc7f..8c110bdeb02 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/03/28 21:14:37 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:42 jmmv 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,6 +6,7 @@
 
 DISTNAME=	xalan-j_1_2
 PKGNAME=	xalan-j-1.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	textproc www
 MASTER_SITES=	http://xml.apache.org/dist/xalan-j/
 
@@ -20,8 +21,6 @@ USE_BUILDLINK2=
 NO_CONFIGURE=
 NO_BUILD=
 
-WRKSRC=		${WRKDIR}
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 04d60551733..d33722ca6ca 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/03/22 00:40:49 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:42 jmmv Exp $
 #
 
 DISTNAME=	xerces-c-src1_3_0
 PKGNAME=	xerces-c-1.3.0
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xerces-c-src1_3_0/src/
 CATEGORIES=	textproc
 MASTER_SITES=	http://xml.apache.org/dist/xerces-c/stable/
 
@@ -11,7 +12,6 @@ MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://xml.apache.org/xerces-c/
 COMMENT=	The Apache Project's validating XML parser with DOM and SAX support
 
-WRKSRC=		${WRKDIR}/xerces-c-src1_3_0/src/
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_BUILDLINK2=	YES
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 50ca27ee276..e362add348b 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/03/28 21:14:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:43 jmmv 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,6 +6,7 @@
 
 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/
 
@@ -18,8 +19,6 @@ USE_BUILDLINK2=
 NO_CONFIGURE=
 NO_BUILD=
 
-WRKSRC=		${WRKDIR}/xerces-1_2_0
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java