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

24 files changed, 48 insertions, 48 deletions

diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index e7fc71a1485..ca8a2a2907c 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:36:40 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
 #
 
 DISTNAME=	libXg.utf.fonts
 PKGNAME=	libXgFonts-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	These are the UNICODE fonts for use with 9term and sam
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 
diff --git a/fonts/acroread-chsfont/Makefile b/fonts/acroread-chsfont/Makefile
index 1c5a1dbfeb1..456eb9002ab 100644
--- a/fonts/acroread-chsfont/Makefile
+++ b/fonts/acroread-chsfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:41 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chsfont
-WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Chinese Simplified)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/CHSKIT
 TAR_FILE=	${WRKSRC}/LANGCHS.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-chtfont/Makefile b/fonts/acroread-chtfont/Makefile
index 1b287436f66..6cbaec1f3a5 100644
--- a/fonts/acroread-chtfont/Makefile
+++ b/fonts/acroread-chtfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:42 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chtfont
-WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Chinese Traditional)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/CHTKIT
 TAR_FILE=	${WRKSRC}/LANGCHT.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-font-share/Makefile b/fonts/acroread-font-share/Makefile
index c59be69bea2..3ebf65c90d4 100644
--- a/fonts/acroread-font-share/Makefile
+++ b/fonts/acroread-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:43 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	font-share
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 DISTFILES=	korfont${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (common base)
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGCOM.TAR
 
 PLIST_SUBST+=	MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile
index 42e5e9f5d11..c6943f7428f 100644
--- a/fonts/acroread-jpnfont/Makefile
+++ b/fonts/acroread-jpnfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:36:44 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	jpnfont
-WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts japanese
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Japanese)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/JPNKIT
 TAR_FILE=	${WRKSRC}/LANGJPN.TAR
 
 INTERACTIVE_STAGE=	fetch
diff --git a/fonts/acroread-korfont/Makefile b/fonts/acroread-korfont/Makefile
index 5eb5b5d5a52..f03528c1103 100644
--- a/fonts/acroread-korfont/Makefile
+++ b/fonts/acroread-korfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:45 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	korfont
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Korean)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGKOR.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread5-chsfont/Makefile b/fonts/acroread5-chsfont/Makefile
index 30aca34158a..9e49c8b6f88 100644
--- a/fonts/acroread5-chsfont/Makefile
+++ b/fonts/acroread5-chsfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chsfont
-WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Chinese Simplified)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/CHSKIT
 TAR_FILE=	${WRKSRC}/LANGCHS.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-chtfont/Makefile b/fonts/acroread5-chtfont/Makefile
index a721a114018..2adb728ac09 100644
--- a/fonts/acroread5-chtfont/Makefile
+++ b/fonts/acroread5-chtfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:47 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chtfont
-WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Chinese Traditinal)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/CHTKIT
 TAR_FILE=	${WRKSRC}/LANGCHT.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-font-share/Makefile b/fonts/acroread5-font-share/Makefile
index 8357d56dd4f..5f5429d0822 100644
--- a/fonts/acroread5-font-share/Makefile
+++ b/fonts/acroread5-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:50 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	font-share
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 DISTFILES=	korfont${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Asian Font Packs for Acrobat Reader 5 (common base)
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGCOM.TAR
 
 PLIST_SUBST+=	MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
diff --git a/fonts/acroread5-jpnfont/Makefile b/fonts/acroread5-jpnfont/Makefile
index 909074f60f5..d09eee0f78e 100644
--- a/fonts/acroread5-jpnfont/Makefile
+++ b/fonts/acroread5-jpnfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:51 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	jpnfont
-WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Japanese)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/JPNKIT
 TAR_FILE=	${WRKSRC}/LANGJPN.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-korfont/Makefile b/fonts/acroread5-korfont/Makefile
index 9070c17a3aa..0c69eed6643 100644
--- a/fonts/acroread5-korfont/Makefile
+++ b/fonts/acroread5-korfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:52 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	korfont
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Korean)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGKOR.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index 219d41b27d3..038c35b411c 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/12/19 23:40:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	artwiz-aleczapka-1.3
 PKGNAME=        ${DISTNAME:S/aleczapka/fonts/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/artwiz-aleczapka
 CATEGORIES=	fonts
 MASTER_SITES=	http://fluxbox.org/artwiz-aleczapka/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.vastwaters.com/
 COMMENT=	Set of free fonts for X11 desktops
 
+WRKSRC=			${WRKDIR}/artwiz-aleczapka
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_PKGINSTALL=		yes
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index c114263418b..a96dcf21b32 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:57 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	bakoma-20010719
 PKGNAME=	bakoma-fonts-1.1
-WRKSRC=		${WRKDIR}/bakoma
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "on the fly" distfile creation from CTAN messes up the checksums.
@@ -17,6 +16,7 @@ LICENSE+=		no-commercial-use
 NO_SRC_ON_CDROM=	#defined
 NO_BIN_ON_CDROM=	#defined
 BAKOMA_DIR=		${PREFIX}/share/tex-contrib/BaKoMa
+WRKSRC=			${WRKDIR}/bakoma
 
 do-build:
 	${RM} -f ${WRKSRC}/fontmap.map
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index ecbd0bfd108..397dade868a 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:07 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		http://www.tea.forus.or.jp/toshi/exhibition/
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		${MASTER_SITES}/elisat10.html
 COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index ff279278471..5555002ab95 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:08 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		http://www.wheel.gr.jp/~dai/software/ \
 			ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
@@ -18,6 +17,7 @@ SITES_elisau10${EXTRACT_SUFX}=	\
 			http://hp.vector.co.jp/authors/VA004814/freesoft/
 SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 1d232a27a21..d1d167d7eb8 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:09 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		${MASTER_SITE_LOCAL} # original site was closed.
 
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 19a5d8d1cdb..400451d0b97 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:37:14 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:17 agc Exp $
 # Based on FreeBSD Id: Makefile,v 1.6 1999/02/12 17:23:40 motoyuki Exp
 #
 
 DISTNAME=	jisx0212fonts-0.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts x11 japanese
 MASTER_SITES=	ftp://ginkaku.kudpc.kyoto-u.ac.jp/fonts/ \
 		ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ \
@@ -13,6 +12,7 @@ DISTFILES=	${BDF14} ${BDF16} ${BDF24} ${BDF40}
 MAINTAINER=	itojun@itojun.org
 COMMENT=	X11 X0212-1990 font.  14, 16, 24 and 40 dots availble
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 EXTRACT_ONLY=	${DISTFILES}
 MAKE_ENV+=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile
index c8e5a944ea7..0b71ed66c11 100644
--- a/fonts/kcfonts/Makefile
+++ b/fonts/kcfonts/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=      kcfonts-1.05
-WRKSRC=        ${WRKDIR}
 CATEGORIES=    fonts
 MASTER_SITES=  ftp://freebsd.sinica.edu.tw/pub/distfiles/
 
 MAINTAINER=    kevlo@midassol.com
 COMMENT=       Kuo Chauo Chinese Fonts collection
 
+WRKSRC=        ${WRKDIR}
 USE_X11BASE=   yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile
index 35b45241925..5223f77bab3 100644
--- a/fonts/mkfontalias/Makefile
+++ b/fonts/mkfontalias/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:47:07 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	mkfontalias.py
 PKGNAME=	mkfontalias-20000521
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	http://home.c2i.net/dark/
 EXTRACT_SUFX=	# empty
@@ -12,6 +11,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://home.c2i.net/dark/linux.html#fuzzy
 COMMENT=	Creates a fonts.alias from the fonts.dir for TrueType fonts
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile
index fd8aa8d21c3..71841e433c4 100644
--- a/fonts/mkfontscale/Makefile
+++ b/fonts/mkfontscale/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/10/13 09:53:59 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	mkfontscale-20020524
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/mkfontscale
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.pps.jussieu.fr/~jch/software/files/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.pps.jussieu.fr/~jch/software/files/
 COMMENT=	Create an index of scalable font files for X
 
+WRKSRC=		${WRKDIR}/mkfontscale
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 3e2addc2301..bad44b8bdb8 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:47:09 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts graphics x11
 MASTER_SITES=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	Convert X font from PCF to BDF
 
+WRKSRC=		${WRKDIR}
 USE_GMAKE=	YES
 MAKEFILE=	Makefile.gcc
 
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index 588b1f4a826..a56039cc29e 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/05 06:49:31 junyoung Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	pfaedit_full-${VERSION}
 PKGNAME=	pfaedit-20${VERSION}
-WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
 CATEGORIES=	fonts editors
 MASTER_SITES=	http://pfaedit.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	Postscript font editor
 
 VERSION=	040102
 
+WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
 USE_GMAKE=	YES
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/fonts/ttmkfdir/Makefile b/fonts/ttmkfdir/Makefile
index c734e78d244..9854bf65794 100644
--- a/fonts/ttmkfdir/Makefile
+++ b/fonts/ttmkfdir/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:47:10 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	ttmkfdir
 PKGNAME=	ttmkfdir-0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts x11
 MASTER_SITES=	http://www.joerg-pommnitz.de/TrueType/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.joerg-pommnitz.de/TrueType/xfsft.html
 COMMENT=	Tool that creates a fonts.scale file
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 do-install:
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index c9d3759a4c0..59768b2f675 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -12,6 +11,7 @@ COMMENT=		Configuration file for VFlib to use kochi-ttf
 DEPENDS+=		ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 DEPENDS+=		kochi-ttf-[0-9]*:../../fonts/kochi-ttf
 
+WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
 NO_BUILD=		YES