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

51 files changed, 104 insertions, 104 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index fc2d814fcd9..ffaf4c947a4 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2003/08/09 11:20:35 seb Exp $
+# $NetBSD: Makefile,v 1.46 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/a2ps-4.13
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNU:=a2ps/} \
 			ftp://ftp.enst.fr/pub/unix/a2ps/
@@ -15,6 +14,7 @@ COMMENT=		Formats an ascii file for printing on a postscript printer
 DEPENDS+=		papersize>=1.0.2:../../print/papersize
 DEPENDS+=		psutils>=1.17:../../print/psutils
 
+WRKSRC=			${WRKDIR}/a2ps-4.13
 STRIP=			# empty
 USE_PERL5=		YES
 USE_GMAKE=		YES
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 4975fd0bff6..116d95767e1 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 22:52:22 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:24:28 agc Exp $
 
 PKGNAME=	acroread3-3.01
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/3.x/
 
@@ -16,6 +15,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index dd874c9d2e4..c2f7580e3e1 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/11/01 13:33:10 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	acroread5	# Overridden below
 PKGNAME=	acroread5-5.08
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 
@@ -19,6 +18,7 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 LICENSE=	adobe-acrobat-license
 
+WRKSRC=		${WRKDIR}
 CHECK_SHLIBS=	NO
 NO_BUILD=	YES
 SHLIB_HANDLING=	NO
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 5da93f542e2..bfadbbaeedf 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/10/08 10:07:37 taca Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:24:28 agc Exp $
 #
 
 DISTNAME=	apsfilter-7.2.5
-WRKSRC=		${WRKDIR}/apsfilter
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -18,6 +17,7 @@ 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 1fbd6e2c36f..8c18b4d5475 100644
--- a/print/bg5pdf/Makefile
+++ b/print/bg5pdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:16:16 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:24:28 agc Exp $
 #
 
 DISTNAME=	bg5pdf-1.0.0
-WRKSRC=		${WRKDIR}/bg5pdf
 CATEGORIES=	print chinese
 MASTER_SITES=	http://students.washington.edu/cschin/bg5ps/bg5pdf/
 
@@ -10,6 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://students.washington.edu/cschin/bg5ps/bg5pdf/
 COMMENT=	Wrap big5 encoding text file into PDF file by using PDFlib
 
+WRKSRC=				${WRKDIR}/bg5pdf
 USE_BUILDLINK2=			yes
 PYTHON_VERSIONS_ACCEPTED=	21
 PYBINMODULE=			# defined
diff --git a/print/bww2tex/Makefile b/print/bww2tex/Makefile
index e8ec8634c02..2c9b2e2218c 100644
--- a/print/bww2tex/Makefile
+++ b/print/bww2tex/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:24:28 agc Exp $
 #
 
 DISTNAME=	bww2tex-2.00
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	http://www.stanford.edu/~wrinnes/bagpipe.tex/bww2tex/
 DISTFILES=	bww2tex200.tar.gz
@@ -13,6 +12,7 @@ COMMENT=	Bagpipe Music Writer Gold to BagpipeTeX converter
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 MAKEFILE=	${WRKSRC}/makefile
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index eddc8f32383..2d02436ccc3 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2004/01/10 03:32:09 jlam Exp $
+# $NetBSD: Makefile,v 1.71 2004/01/20 12:24:28 agc Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -10,7 +10,6 @@ PKGREVISION=		# empty
 BASE_VERS=		1.1.20
 DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
-WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
 			ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -28,6 +27,7 @@ CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 UNLIMIT_RESOURCES=	datasize memorysize
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
diff --git a/print/cupsomatic-ppds/Makefile b/print/cupsomatic-ppds/Makefile
index 8745978b36a..58ef2fa7ffd 100644
--- a/print/cupsomatic-ppds/Makefile
+++ b/print/cupsomatic-ppds/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:16:19 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	all-com-ppds
 PKGNAME=	cupsomatic-ppds-20010515
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/cupsomatic-ppd
 CATEGORIES=	print
 
 # Not sure why ${MASTER_SITE_LOCAL:=${PKGNAME}} doesn't work, but the
@@ -26,6 +25,7 @@ COMMENT=	Free software printer drivers for use with CUPS
 
 CONFLICTS+=	cupsomatic-200012??
 
+WRKSRC=		${WRKDIR}/cupsomatic-ppd
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 DEPENDS+=	cups>=1.1.14nb1:../../print/cups
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index b61454833d1..fa951302f07 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:52:24 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	cupsomatic
 PKGNAME=	${DISTNAME}-2.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 EXTRACT_SUFX=	# empty
 
@@ -25,6 +24,7 @@ COMMENT=	Foomatic CUPS printer filter
 
 CONFLICTS+=	cupsomatic-200012??
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 DEPENDS+=	cups>=1.1.14nb1:../../print/cups
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 48e520beb2f..0216b6f4375 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
 
@@ -14,6 +13,7 @@ CONFLICTS+=	dvipdfmx-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 CONFLICTS+=	teTeX-bin>=2.0
 
+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 bbf999fe485..467023b16dd 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:52:26 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:24:28 agc 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}/}
@@ -17,6 +16,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.linuxprinting.org/gswrapper.html
 COMMENT=	Foomatic Ghostscript Wrapper
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_BUILDLINK2=		YES
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 6b6663d8aee..2114a4c91b9 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.07
 PKGREVISION=	1
 GS_VERS=	${BASEGS_VERS}.1
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-source//}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.easysw.com/pub/ghostscript/ \
 		ftp://ftp2.easysw.com/pub/ghostscript/ \
@@ -23,6 +22,7 @@ CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
 
 DEPENDS+=	ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index f6fd91822fb..8dcb28bbe0a 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.49 2003/09/17 19:41:03 grant Exp $
+# $NetBSD: Makefile.common,v 1.50 2004/01/20 12:24:28 agc 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/.//}/
@@ -19,6 +18,7 @@ CONFLICTS+=		hpijs-[0-9]*
 DEPENDS+=		ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
 
+WRKSRC=			${WRKDIR}/gs${GS_VERS}
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile
index af408838a0a..abf16750e26 100644
--- a/print/ja-a2ps/Makefile
+++ b/print/ja-a2ps/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:52:30 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:24:28 agc 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/
@@ -12,6 +11,7 @@ EXTRACT_SUFX=	# None
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Text file to postscript converter (with Japanese support)
 
+WRKSRC=		${WRKDIR}
 USE_PERL5=	YES
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} .
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index daabe47e15e..62f0f9de87d 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:24:28 agc Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGNAME=	ja-${DISTNAME}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
 
@@ -19,6 +18,7 @@ CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	dvipdfmx-[0-9]*
 CONFLICTS+=	teTeX-bin>=2.0
 
+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 99ea261309a..6983e851a42 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:30 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:24:29 agc Exp $
 
 DISTNAME=	jsclasses-030624
 PKGNAME=	ja-${DISTNAME}
-WRKSRC=		${WRKDIR}/jsclasses
 CATEGORIES=	print japanese
 MASTER_SITES=	http://www.matsusaka-u.ac.jp/~okumura/jsclasses/
 EXTRACT_SUFX=	.zip
@@ -13,6 +12,7 @@ COMMENT=	New document class files for pLaTeX
 
 DEPENDS+=	ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
 
+WRKSRC=			${WRKDIR}/jsclasses
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index 7e79e7ed4cd..16d93786771 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:24:29 agc Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
 PKGREVISION=	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/ \
@@ -21,6 +20,7 @@ COMMENT=	Library files for pTeX
 
 DEPENDS+=	teTeX>=2.0.1:../../print/teTeX
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		teTeX
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 4cebebe0c47..160738d6ac5 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:24:29 agc Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/lgrind/source
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ COMMENT=	Source pretty printer for LaTeX
 
 DEPENDS+=	teTeX-1.0.*:../../print/teTeX1
 
+WRKSRC=		${WRKDIR}/lgrind/source
 USE_X11=	yes
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NO_CONFIGURE=	yes
diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index b1b5127f3ba..c7f705b0a74 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/09/15 10:51:39 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	papersize-1.0.8
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,6 +9,7 @@ DISTFILES=	# empty
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Manipulate the default papersize in certain packages
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index dab3b2fe553..2888310d383 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:26 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	pcps840
 PKGNAME=	pcps-8.40
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print textproc
 MASTER_SITES=	ftp://garbo.uwasa.fi/unix/pcps/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.swreg.org/soft_shop/695/shopscr3.shtml
 COMMENT=	Converts text files to PostScript(tm)
 
+WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 ALL_TARGET=
 MAKE_ENV+=	"CC=${CC} ${CFLAGS} -DUNIX"
diff --git a/print/psify/Makefile b/print/psify/Makefile
index 016e2aacb08..aa938904f64 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	psify-19980216
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${HOMEPAGE}
 DISTFILES=	Makefile psify.c psify.lex psify.man
@@ -11,6 +10,7 @@ MAINTAINER=     kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.mit.edu/afs/athena/system/pmax_ul4/srvd.74/usr/sipb/src/psify/
 COMMENT=	Pretty print C, CLU, SCHEME, Java and ARGUS source files
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	psify
 EXTRACT_ONLY=	#empty
 NO_CONFIGURE=	yes
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 7d27d2fd0ab..089d5b019f1 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2003/11/03 00:36:02 dillo Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/20 12:24:29 agc 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/
 
@@ -15,6 +14,7 @@ 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-renderPM/Makefile b/print/py-reportlab-renderPM/Makefile
index 933f049c808..bbda490b0d1 100644
--- a/print/py-reportlab-renderPM/Makefile
+++ b/print/py-reportlab-renderPM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/10 19:16:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	renderPM-0-9
@@ -11,8 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.reportlab.com/rl_addons.html
 COMMENT=	Pixmap rendering for reportlab
 
-WRKSRC=	${WRKDIR}
-PYBINMODULE= yes
+WRKSRC=		${WRKDIR}
+PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 11b897b925b..d7a3f88f3ad 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/28 19:08:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	ReportLab_1_18
 PKGNAME=	${PYPKGPREFIX}-reportlab-1.18
-WRKSRC=		${WRKDIR}/reportlab/lib
 CATEGORIES=	print
 MASTER_SITES=   ftp://ftp.reportlab.com/
 EXTRACT_SUFX=	.tgz
@@ -12,7 +11,8 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.reportlab.com/
 COMMENT=	Powerful PDF-generating toolkit for Python
 
-PYBINMODULE= yes
+WRKSRC=		${WRKDIR}/reportlab/lib
+PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index e68cb37e758..30975154124 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:52:38 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:24:29 agc 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=	tech-pkg@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 8d1261f0481..8c256b73128 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/12/24 12:51:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	tetex-texmf-2.0.2
 PKGNAME=	teTeX-share-2.0.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
@@ -13,6 +12,7 @@ COMMENT=	Machine-independent part of teTeX, version 2
 
 CONFLICTS+=	teTeX2-share-[0-9]*
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index af1ff8f4774..f95931333fd 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2003/12/24 12:51:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:24:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
 DISTNAME=	tetex-texmfsrc-2.0.2
 PKGNAME=	teTeX-sharesrc-2.0.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
@@ -16,6 +15,7 @@ CONFLICTS+=	teTeX2-sharesrc-[0-9]*
 
 DEPENDS+=	teTeX-share>=2.0.2:../teTeX-share
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
 USE_BUILDINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 25dda1b784b..eb102bec045 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/04 17:52:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:24:29 agc Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/teTeX-1.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
 
@@ -18,6 +17,7 @@ DEPENDS+=	dialog-0.6z*:../../misc/dialog
 # games/omega previously installed an omega executable too
 CONFLICTS+=	omega<0.90.4nb1
 
+WRKSRC=			${WRKDIR}/teTeX-1.0
 DIST_SUBDIR=		teTeX
 ALL_TARGET=		all
 INSTALL_TARGET=		install strip
diff --git a/print/teTeX1-share/Makefile b/print/teTeX1-share/Makefile
index 8cb0445988e..5becc7e61a8 100644
--- a/print/teTeX1-share/Makefile
+++ b/print/teTeX1-share/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/24 12:54:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:24:29 agc 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,6 +13,7 @@ COMMENT=	Machine-independent part of teTeX
 
 CONFLICTS+=	teTeX2-share-[2-9]*
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
 USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/print/teTeX1-sharesrc/Makefile b/print/teTeX1-sharesrc/Makefile
index 39306ab5d0f..b480ba18ab1 100644
--- a/print/teTeX1-sharesrc/Makefile
+++ b/print/teTeX1-sharesrc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/24 12:56:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:24:29 agc 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,6 +14,7 @@ COMMENT=	Sources for machine-independent part of teTeX
 
 DEPENDS+=	teTeX-share-1.0.[2-9]*:../teTeX1-share
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
 USE_BUILDINK2=	yes
 EXTRACT_ONLY=	# empty
diff --git a/print/tex-bagpipetex/Makefile b/print/tex-bagpipetex/Makefile
index eb39a201df9..02f7c26862b 100644
--- a/print/tex-bagpipetex/Makefile
+++ b/print/tex-bagpipetex/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:24:29 agc 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
@@ -14,6 +13,7 @@ COMMENT=	MusixTeX macros to typeset bagpipe music
 
 DEPENDS+=	tex-musixtex>=109:../tex-musixtex
 
+WRKSRC=         ${WRKDIR}
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
 
diff --git a/print/tex-eurosym/Makefile b/print/tex-eurosym/Makefile
index b13109ab9a1..9b4f563a9e0 100644
--- a/print/tex-eurosym/Makefile
+++ b/print/tex-eurosym/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	eurosym-1.0
 PKGNAME=	tex-${DISTNAME}
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/eurosym
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -15,6 +14,7 @@ COMMENT=	Euro symbols for LaTeX
 # included in teTeX2
 DEPENDS+=	teTeX-bin-1.0.*:../../print/teTeX1-bin
 
+WRKSRC=		${WRKDIR}/eurosym
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index ee6c83bc954..e6ded5baafd 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	hugelatex-1.0
 PKGNAME=	tex-${DISTNAME}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	print
 MASTER_SITES=	# none
 DISTFILES=	# nada
@@ -14,6 +13,7 @@ COMMENT=	LaTeX format files with large limits
 
 DEPENDS+=	teTeX-1.0*:../../print/teTeX1
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# nothing
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index a56416ec231..f27f87d1340 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:52:43 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:24:29 agc 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
@@ -14,6 +13,7 @@ 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 547ef91aaea..9950daa6d7c 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:24:29 agc 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,6 +14,7 @@ COMMENT=	TeX macros to typeset music
 
 DEPENDS+=       teTeX-1.0*:../../print/teTeX1
 
+WRKSRC=		${WRKDIR}/musixtex-T109
 NO_CONFIGURE=	yes
 
 TEXMF=		${LOCALBASE}/share/texmf
diff --git a/print/tex-ocrb/Makefile b/print/tex-ocrb/Makefile
index dfbf8fd29b1..66312b90cd3 100644
--- a/print/tex-ocrb/Makefile
+++ b/print/tex-ocrb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:52:43 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	ocr-b
 PKGNAME=	tex-ocrb-1.0
 # PKGREVISION=	1
-WRKSRC=		${WRKDIR}/ocr-b
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=fonts/${DISTNAME}/}
 
@@ -14,6 +13,7 @@ COMMENT=	OCR-B font for LaTeX
 
 DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX-bin
 
+WRKSRC=		${WRKDIR}/ocr-b
 DIST_SUBDIR=	${DISTNAME}
 DISTFILES= ocrb10.mf ocrb10e.mf ocrb10f.mf ocrb10g.mf ocrb10l.mf \
 	ocrb10s.mf ocrb10x.mf ocrb5.mf ocrb6.mf ocrb7.mf ocrb8.mf \
diff --git a/print/tex-prosper/Makefile b/print/tex-prosper/Makefile
index 0454f4ba973..315cb198b53 100644
--- a/print/tex-prosper/Makefile
+++ b/print/tex-prosper/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/25 13:27:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	prosper-1.00.4
 PKGNAME=	tex-${DISTNAME}
-WRKSRC=		${WRKDIR}/prosper
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prosper/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} PPRblends.sty.gz
@@ -14,6 +13,7 @@ COMMENT=	LaTeX class for writing transparencies
 
 DEPENDS=	teTeX-bin-[0-9]*:../../print/teTeX-bin
 
+WRKSRC=		${WRKDIR}/prosper
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/tex-textpos/Makefile b/print/tex-textpos/Makefile
index dd67eb00a96..b81a4aaa71d 100644
--- a/print/tex-textpos/Makefile
+++ b/print/tex-textpos/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:16:28 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:24:29 agc Exp $
 #
 
 NAME=		textpos
 DISTNAME=	${NAME}
 PKGNAME=	tex-${NAME}-1.2b
 # PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${NAME}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/supported/${NAME}/}
 
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 # HOMEPAGE=	
 COMMENT=	Absolute positioning of text on the LaTeX page
 
+WRKSRC=		${WRKDIR}/${NAME}
 DIST_SUBDIR=	${NAME}
 DISTFILES=	textpos.ins LICENCE README textpos.dtx VERSION
 
diff --git a/print/texfamily-share/Makefile b/print/texfamily-share/Makefile
index f59e39e819d..799485940a7 100644
--- a/print/texfamily-share/Makefile
+++ b/print/texfamily-share/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:52:44 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:24:29 agc 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,6 +21,7 @@ COMMENT=	Machine-independent part of TeXfamily (pTeX, JTeX, MuLTeX)
 
 DEPENDS+=	teTeX>=1.0.7nb1:../../print/teTeX
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	TeXfamily
 EXTRACT_ONLY=	jis${EXTRACT_SUFX} nmin-ngoth${EXTRACT_SUFX} \
 		standard${EXTRACT_SUFX} morisawa${EXTRACT_SUFX}
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index a945db24e2c..55fa4bd8c12 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:31 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-arabic
 PKGNAME=	${DISTNAME}-20030216
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index a28e8e7dc7b..8be59514abb 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/01/18 18:48:31 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-chinese-simplified-2004-jan-16
 PKGNAME=	xpdf-chinese-simplified-20040116
-WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 22292952688..ef67d838cd4 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/18 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-chinese-traditional-2004-jan-16
 PKGNAME=	xpdf-chinese-traditional-20040116
-WRKSRC=		${WRKDIR}/xpdf-chinese-traditional
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-chinese-traditional
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 9d21e9192c1..97e9ecf8c07 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/11/11 09:11:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-cyrillic-2003-jun-28
 PKGNAME=	xpdf-cyrillic-20030628
-WRKSRC=		${WRKDIR}/xpdf-cyrillic
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-cyrillic
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index a79f7ad01fa..04c86d2edf2 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/11/11 09:06:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-greek-2003-jun-28
 PKGNAME=	xpdf-greek-20020628
-WRKSRC=		${WRKDIR}/xpdf-greek
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-greek
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index fb1abeb2229..e3e01988e87 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:32 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:24:29 agc Exp $
 #
 
 DISTNAME=	xpdf-hebrew
 PKGNAME=	${DISTNAME}-20030216
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index afb9dcfd5a9..78f1849619e 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/01/18 16:30:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:24:30 agc Exp $
 #
 
 DISTNAME=	xpdf-japanese-2004-jan-16
 PKGNAME=	xpdf-japanese-20040116
-WRKSRC=		${WRKDIR}/xpdf-japanese
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-japanese
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index 6f810e7ff68..b2645a0d987 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/18 16:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:30 agc Exp $
 #
 
 DISTNAME=	xpdf-korean-2004-jan-16
 PKGNAME=	xpdf-korean-20040116
-WRKSRC=		${WRKDIR}/xpdf-korean
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/xpdf-korean
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index 0679dd81795..423e0d25314 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:24:30 agc Exp $
 #
 
 DISTNAME=	xpdf-latin2
 PKGNAME=	${DISTNAME}-20021022
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -16,6 +15,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index abdde8a15d5..73cbc77827f 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:33 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:24:30 agc Exp $
 #
 
 DISTNAME=	xpdf-thai
 PKGNAME=	${DISTNAME}-20020116
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index 2af6c096387..4e424cc892f 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:34 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:24:30 agc Exp $
 #
 
 DISTNAME=	xpdf-turkish
 PKGNAME=	${DISTNAME}-20020410
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,6 +14,7 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/yup/Makefile b/print/yup/Makefile
index 8f2379fc855..d708ea8c534 100644
--- a/print/yup/Makefile
+++ b/print/yup/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:16:34 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:24:30 agc 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
@@ -13,6 +12,7 @@ COMMENT=		Print multiple PostScript/ASCII pages per sheet
 
 USE_PERL5=		# defined
 
+WRKSRC=			${WRKDIR}/yup-r1
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined