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

41 files changed, 82 insertions, 86 deletions

diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 75fdc6b27cd..750e0a4f319 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/03/26 04:05:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:42:13 jmmv Exp $
 
 PKGNAME=	acroread3-3.01
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/3.x/
 
@@ -56,7 +57,6 @@ DISTNAME=	${PKGNAME}
 LDD?=		${TRUE}
 .endif
 
-WRKSRC=		${WRKDIR}
 PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
 		${PKGDIR}/PLIST.post
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 7fdaa39c7d9..2af77d7a79f 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/26 04:05:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:13 jmmv Exp $
 
 DISTNAME=	acroread5	# Overridden below
 PKGNAME=	acroread5-5.06
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 
@@ -22,8 +23,6 @@ SHLIB_HANDLING=	NO
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=		${WRKDIR}
-
 ONLY_FOR_PLATFORM=	*-*-i386 SunOS-*-sparc
 
 # Default (overridden below)
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 3750b739bad..89a47fedc0d 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:14 jmmv Exp $
 #
 
 DISTNAME=	apsfilter-7.2.2
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/apsfilter
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -18,8 +19,6 @@ DEPENDS+=	netpbm>=9.7nb1:../../graphics/netpbm
 DEPENDS+=	a2ps-[0-9]*:../../print/a2ps
 DEPENDS+=	psutils-[0-9]*:../../print/psutils
 
-WRKSRC=		${WRKDIR}/apsfilter
-
 HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
 USE_PKGINSTALL=	YES
diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile
index 4589d100553..8c17bdfc4d4 100644
--- a/print/bg5pdf/Makefile
+++ b/print/bg5pdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/08 19:21:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:14 jmmv Exp $
 #
 
 DISTNAME=	bg5pdf-1.0.0
+WRKSRC=		${WRKDIR}/bg5pdf
 CATEGORIES=	print chinese
 MASTER_SITES=	http://students.washington.edu/cschin/bg5ps/bg5pdf/
 
@@ -17,8 +18,6 @@ PYTHON_PATCH_SCRIPTS=		bg5pdf
 
 MAKE_ENV+=	PYINC=${PYINC} PYSITELIB=${PYSITELIB}
 
-WRKSRC=		${WRKDIR}/bg5pdf
-
 post-extract:
 	${RM} -f ${WRKSRC}/bg5pdflib.so
 
diff --git a/print/bww2tex/Makefile b/print/bww2tex/Makefile
index 6b336e94fca..e8ec8634c02 100644
--- a/print/bww2tex/Makefile
+++ b/print/bww2tex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/25 14:00:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:14 jmmv Exp $
 #
 
 DISTNAME=	bww2tex-2.00
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	http://www.stanford.edu/~wrinnes/bagpipe.tex/bww2tex/
 DISTFILES=	bww2tex200.tar.gz
@@ -13,7 +14,6 @@ COMMENT=	Bagpipe Music Writer Gold to BagpipeTeX converter
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 MAKEFILE=	${WRKSRC}/makefile
 
 do-install:
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index fe3337e8d0f..a040607adb2 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2002/09/13 06:53:36 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:14 jmmv Exp $
 
 DISTNAME=	cupsomatic
 PKGNAME=	${DISTNAME}-2.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 EXTRACT_SUFX=	# empty
 
@@ -31,7 +32,6 @@ DEPENDS+=	foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
 DEPENDS+=	mpage-[0-9]*:../../print/mpage
 
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
 
 FILTERDIR=	${PREFIX}/libexec/cups/filter
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index e00f0328f60..a61a3ff2079 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/02/24 15:30:54 kei Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:14 jmmv Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
+WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
 
@@ -11,7 +12,6 @@ COMMENT=	DVI to PDF translator
 CONFLICTS+=	dvipdfmx-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 
-WRKSRC=			${WRKDIR}/dvipdfm
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index a106bb0a94c..cf53967050e 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/09/13 06:53:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:15 jmmv Exp $
 
 DISTNAME=	foomatic-gswrapper
 PKGNAME=	foomatic-gswrapper-1.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 EXTRACT_SUFX=	# empty
 MASTER_SITES=	${MASTER_SITE_LOCAL:=${PKGNAME_NOREV}/}
@@ -19,7 +20,6 @@ COMMENT=	Foomatic Ghostscript Wrapper
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_BUILDLINK2=		YES
-WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
 
 REPLACE_PERL=	${DISTNAME}
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 98c56c2d349..a0e1c11b10f 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.43 2003/03/14 19:37:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.44 2003/03/29 12:42:15 jmmv Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
+WRKSRC=			${WRKDIR}/gs${GS_VERS}
 CATEGORIES=		print
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/aladdin/gs${GS_VERS:S/.//}/
@@ -23,7 +24,6 @@ USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 
 GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=			${WRKDIR}/gs${GS_VERS}
 DISTFILES+=		${GS_SRCS}
 EXTRACT_ONLY=		${GS_SRCS}
 
diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile
index 7cc6536328b..f8cb17f4e17 100644
--- a/print/ja-a2ps/Makefile
+++ b/print/ja-a2ps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/01/13 13:00:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:15 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.5 1999/04/16 04:57:06 taoka Exp $
 
 DISTNAME=	a2ps.pl-1.45
 PKGNAME=	ja-a2ps-1.45
+WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
@@ -14,7 +15,6 @@ COMMENT=	Text file to postscript converter (with Japanese support)
 USE_PERL5=	YES
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} .
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 REPLACE_PERL=	a2ps.pl-1.45
 
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index 02375be5768..00e98374386 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/02/24 15:30:54 kei Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:15 jmmv Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGNAME=        ja-${DISTNAME}
+WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
 
@@ -16,7 +17,6 @@ COMMENT=	DVI to PDF translator with Japanese patch
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	dvipdfmx-[0-9]*
 
-WRKSRC=		${WRKDIR}/dvipdfm
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile
index 3ea97b3d277..a41e1cc506e 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:05:55 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:15 jmmv Exp $
 
 DISTNAME=	jsclasses
 PKGNAME=	ja-jsclasses-0.0.0.20021127
+WRKSRC=		${WRKDIR}/jsclasses
 CATEGORIES=	print japanese
 MASTER_SITES=	http://www.matsusaka-u.ac.jp/~okumura/jsclasses/
 EXTRACT_SUFX=	.lzh
@@ -13,7 +14,6 @@ COMMENT=	new document class files for pLaTeX
 DEPENDS+=	ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
 BUILD_DEPENDS+=	ack>=1.39:../../converters/ack
 
-WRKSRC=		${WRKDIR}/jsclasses
 PLATEX_DIR=	${PREFIX}/share/texmf.local/ptex/platex
 NO_BUILD=	YES
 
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index 551e7d7afca..b5a75a0c4b4 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:02:49 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:16 jmmv Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
@@ -20,7 +21,6 @@ COMMENT=	library files for pTeX
 DEPENDS+=	teTeX2>=2.0.1:../../print/teTeX2
 
 DIST_SUBDIR=		teTeX
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 TEXMFLOCAL=		${PREFIX}/share/texmf.local
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index d2b357237e7..bcb0996d1cd 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2002/08/27 03:00:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:16 jmmv Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/lgrind/source
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +15,6 @@ DEPENDS+=	teTeX-1.0.*:../../print/teTeX
 
 USE_X11=	yes
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
-WRKSRC=		${WRKDIR}/lgrind/source
 NO_CONFIGURE=	yes
 
 pre-patch:
diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index ba4b9b8942d..75fa9bc7796 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/03/28 21:14:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:16 jmmv Exp $
 #
 
 DISTNAME=	papersize-1.0.4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Manipulate the default papersize in certain packages
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 2da485785b2..93889973a1e 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/12/04 11:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:16 jmmv Exp $
 #
 
 DISTNAME=	pcps840
 PKGNAME=	pcps-8.40
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print textproc
 MASTER_SITES=	ftp://garbo.uwasa.fi/unix/pcps/
 
@@ -14,7 +15,6 @@ MAKEFILE=	makefile
 ALL_TARGET=
 MAKE_ENV+=	"CC=${CC} ${CFLAGS} -DUNIX"
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 
 LICENSE=        shareware
 RESTRICTED=	This is shareware for your evaluation and subsequent payment
diff --git a/print/psify/Makefile b/print/psify/Makefile
index a79ed8b2782..016e2aacb08 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:46 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:16 jmmv Exp $
 #
 
 DISTNAME=	psify-19980216
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${HOMEPAGE}
 DISTFILES=	Makefile psify.c psify.lex psify.man
@@ -12,7 +13,6 @@ COMMENT=	Pretty print C, CLU, SCHEME, Java and ARGUS source files
 
 DIST_SUBDIR=	psify
 EXTRACT_ONLY=	#empty
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
 INSTALL_TARGET=	install prefix=${PREFIX}
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index e4162076704..63d7d8e3709 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:01 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/03/29 12:42:17 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
 #
 
 DISTNAME=	psutils-p17
 PKGNAME=	psutils-1.17
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/psutils
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/
 
@@ -14,7 +15,6 @@ COMMENT=	Utilities for manipulating PostScript documents
 
 DEPENDS+=	papersize-[0-9]*:../../print/papersize
 
-WRKSRC=		${WRKDIR}/psutils
 USE_PERL5=	yes
 USE_PKGINSTALL=	yes
 
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 70875d79045..2b63aef642a 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/12/07 18:02:03 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:17 jmmv Exp $
 #
 
 DISTNAME=	ReportLab_1_16
 PKGNAME=	${PYPKGPREFIX}-reportlab-1.16
+WRKSRC=		${WRKDIR}/reportlab/lib
 CATEGORIES=	print
 MASTER_SITES=   ftp://ftp.reportlab.com/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.reportlab.com/
 COMMENT=	powerful PDF-generating toolkit for Python
 
-WRKSRC=		${WRKDIR}/reportlab/lib
-
 PYBINMODULE= yes
 PYDISTUTILSPKG=	yes
 USE_BUILDLINK2=	yes
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index a4bd20fc793..cd2e7dfefe2 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:30 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:17 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.7 1998/08/31 07:51:40 tg Exp
 #
 
 DISTNAME=	rtf2LaTeX.1.5
 PKGNAME=	rtf2latex-1.5
+WRKSRC=		${WRKDIR}/rtf2LaTeX
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.dante.de/pub/tex/support/rtf2latex/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Filter that converts RTF (MS's Rich Text Format) into LaTeX
 
-WRKSRC=		${WRKDIR}/rtf2LaTeX
 NO_CONFIGURE=	yes
 
 post-extract:
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index 1a5114deba6..c61ddb46c59 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2003/03/28 21:14:30 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/29 12:42:17 jmmv Exp $
 #
 
 DISTNAME=	teTeX-texmf-1.0.2
 PKGNAME=	teTeX-share-1.0.2
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
 
@@ -14,7 +15,6 @@ COMMENT=	Machine-independent part of teTeX
 CONFLICTS+=	teTeX2-share-[2-9]*
 
 DIST_SUBDIR=	teTeX
-WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index eb6b41fdfbd..a28896eeb74 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2003/03/28 21:14:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:17 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
 DISTNAME=	teTeX-texmfsrc-1.0.1
 PKGNAME=	teTeX-sharesrc-1.0.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
 
@@ -15,7 +16,6 @@ COMMENT=	Sources for machine-independent part of teTeX
 DEPENDS+=	teTeX-share>=1.0.2nb1:../teTeX-share
 
 DIST_SUBDIR=	teTeX
-WRKSRC=		${WRKDIR}
 USE_BUILDINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
diff --git a/print/teTeX2-share/Makefile b/print/teTeX2-share/Makefile
index 7768a7c7c44..a66ce3561d6 100644
--- a/print/teTeX2-share/Makefile
+++ b/print/teTeX2-share/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/15 08:17:08 kei Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:17 jmmv Exp $
 
 DISTNAME=	tetex-texmf-2.0.2
 PKGNAME=	teTeX2-share-2.0.2
 PKGREVISION=	# empty
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
@@ -13,7 +14,6 @@ COMMENT=	Machine-independent part of teTeX, version 2
 CONFLICTS+=	teTeX-share-[0-9]*
 
 DIST_SUBDIR=	teTeX
-WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
diff --git a/print/teTeX2-sharesrc/Makefile b/print/teTeX2-sharesrc/Makefile
index dc36f614876..4c2636ee3b0 100644
--- a/print/teTeX2-sharesrc/Makefile
+++ b/print/teTeX2-sharesrc/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/03/15 08:17:09 kei Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:18 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 
 DISTNAME=	tetex-texmfsrc-2.0.2
 PKGNAME=	teTeX2-sharesrc-2.0.2
 PKGREVISION=	# empty
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
@@ -14,7 +15,6 @@ COMMENT=	Sources for machine-independent part of teTeX, version 2
 DEPENDS+=	teTeX2-share>=2.0.2:../teTeX2-share
 
 DIST_SUBDIR=	teTeX
-WRKSRC=		${WRKDIR}
 USE_BUILDINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
diff --git a/print/tex-bagpipetex/Makefile b/print/tex-bagpipetex/Makefile
index 8aeb70ef225..eb39a201df9 100644
--- a/print/tex-bagpipetex/Makefile
+++ b/print/tex-bagpipetex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/01/25 23:16:25 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:18 jmmv Exp $
 #
 
 DISTNAME=	bagpipetex-3.01
 PKGNAME=	tex-${DISTNAME}
+WRKSRC=         ${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	http://www.stanford.edu/~wrinnes/bagpipe.tex/distribution/
 DISTFILES=	bagpipe301.tar.gz
@@ -15,7 +16,6 @@ DEPENDS+=	tex-musixtex>=109:../tex-musixtex
 
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
-WRKSRC=         ${WRKDIR}
 
 TEXMF_CNF=      ${LOCALBASE}/share/texmf/web2c/texmf.cnf
 
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index a83d3997e61..fde3611bfc9 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/03/28 21:14:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:18 jmmv Exp $
 #
 
 DISTNAME=	hugelatex-1.0
 PKGNAME=	tex-${DISTNAME}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	# none
 DISTFILES=	# nada
@@ -16,7 +17,6 @@ DEPENDS+=	teTeX-1.0*:../teTeX
 EXTRACT_ONLY=	# nothing
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
 
 TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
 
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index a5ed09c2fef..62a79eb42af 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/03/14 00:49:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:18 jmmv Exp $
 #
 
 DISTNAME=	jadetex-2.20
 PKGNAME=	tex-${DISTNAME}
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	http://www.tug.org/applications/jadetex/
 EXTRACT_SUFX=	.zip
@@ -13,7 +14,6 @@ COMMENT=	Process tex files produced by the TeX backend of Jade
 
 DEPENDS+=	tex-hugelatex-1.0nb1:../tex-hugelatex
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
 
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index a706f281197..2dcf352979f 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/01/25 04:10:42 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:19 jmmv Exp $
 #
 
 DISTNAME=	musixtex-109
 PKGNAME=	tex-${DISTNAME}
+WRKSRC=		${WRKDIR}/musixtex-T109
 CATEGORIES=	print
 #MASTER_SITES=	ftp://ftp.tex.ac.uk/tex-archive/macros/musixtex/taupin/
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/musixtex/taupin/}
@@ -15,7 +16,6 @@ COMMENT=	TeX macros to typeset music
 DEPENDS+=       teTeX-1.0*:../../print/teTeX
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/musixtex-T109
 
 TEXMF=		${LOCALBASE}/share/texmf
 TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
diff --git a/print/texfamily-share/Makefile b/print/texfamily-share/Makefile
index fd21f39316f..63f268703fc 100644
--- a/print/texfamily-share/Makefile
+++ b/print/texfamily-share/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:19 jmmv Exp $
 
 DISTNAME=	TeXfamily-share-1.2.1
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
 		ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
@@ -22,7 +23,6 @@ COMMENT=	Machine-independent part of TeXfamily (pTeX, JTeX, MuLTeX)
 DEPENDS+=	teTeX>=1.0.7nb1:../../print/teTeX
 
 DIST_SUBDIR=	TeXfamily
-WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	jis${EXTRACT_SUFX} nmin-ngoth${EXTRACT_SUFX} \
 		standard${EXTRACT_SUFX} morisawa${EXTRACT_SUFX}
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index 2a56a243262..31446e30e48 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/25 14:28:21 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:19 jmmv Exp $
 #
 
 DISTNAME=	xpdf-arabic
 PKGNAME=	${DISTNAME}-20030216
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index ce1325fa805..7100b1b6bd0 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/25 14:28:22 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:20 jmmv Exp $
 #
 
 DISTNAME=	xpdf-chinese-simplified
 PKGNAME=	${DISTNAME}-20020617
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -16,7 +17,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index c2554b2054a..4e1f6986521 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:22 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:20 jmmv Exp $
 #
 
 DISTNAME=	xpdf-chinese-traditional
 PKGNAME=	${DISTNAME}-20020414
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 3ae47548472..05f2f6172f8 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:23 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:20 jmmv Exp $
 #
 
 DISTNAME=	xpdf-cyrillic
 PKGNAME=	${DISTNAME}-20020116
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index 9ba3862633c..ff42e60aa5c 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:23 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:20 jmmv Exp $
 #
 
 DISTNAME=	xpdf-greek
 PKGNAME=	${DISTNAME}-20020213
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index 7a1a7503ece..2ea8eacb387 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/25 14:28:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:21 jmmv Exp $
 #
 
 DISTNAME=	xpdf-hebrew
 PKGNAME=	${DISTNAME}-20030216
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index f8bbfe8f622..3f165f6bb52 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:24 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:21 jmmv Exp $
 #
 
 DISTNAME=	xpdf-japanese
 PKGNAME=	${DISTNAME}-20020401
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index 82ab7a8bd75..016e86253dd 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:24 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:21 jmmv Exp $
 #
 
 DISTNAME=	xpdf-korean
 PKGNAME=	${DISTNAME}-20020401
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index a6cbe2071f4..bffc34fff7c 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/25 14:28:24 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:21 jmmv Exp $
 #
 
 DISTNAME=	xpdf-latin2
 PKGNAME=	${DISTNAME}-20021022
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -16,7 +17,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index adc5fcd4a5e..9eab1342b03 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:25 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:22 jmmv Exp $
 #
 
 DISTNAME=	xpdf-thai
 PKGNAME=	${DISTNAME}-20020116
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index 5cc4e000f0a..7730550712d 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/25 14:28:25 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:22 jmmv Exp $
 #
 
 DISTNAME=	xpdf-turkish
 PKGNAME=	${DISTNAME}-20020410
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +16,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 USE_PKGINSTALL=	yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/yup/Makefile b/print/yup/Makefile
index 7424dad500c..dc5044de54b 100644
--- a/print/yup/Makefile
+++ b/print/yup/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/06/19 12:18:37 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:22 jmmv Exp $
 #
 
 DISTNAME=		yup-r1-rel
 PKGNAME=		yup-1.0
+WRKSRC=			${WRKDIR}/yup-r1
 CATEGORIES=		print
 MASTER_SITES=		http://redback.spyda.net/~mjch/yup/
 EXTRACT_SUFX=		.tgz
@@ -11,7 +12,6 @@ MAINTAINER=		grant@netbsd.org
 COMMENT=		print multiple PostScript/ASCII pages per sheet
 
 USE_PERL5=		# defined
-WRKSRC=			${WRKDIR}/yup-r1
 
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined