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

31 files changed, 62 insertions, 67 deletions

diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 99c8fe71b21..a09774efb14 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/03/09 13:26:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:53 jmmv Exp $
 #
 
 DISTNAME=	fcpackage.2_1
 PKGNAME=	Xft2-2.1
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}/${DISTNAME}/Xft
 CATEGORIES=	fonts x11
 MASTER_SITES=	http://fontconfig.org/release/
 
@@ -20,8 +21,6 @@ USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11=	YES
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Xft
-
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../x11/Xrender/buildlink2.mk"
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index 7a0474d8fe1..56a1b5cd9b3 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 18:38:54 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:53 jmmv 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=	packages@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 4ea5a0c1687..eb72b864454 100644
--- a/fonts/acroread-chsfont/Makefile
+++ b/fonts/acroread-chsfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/04/01 04:14:35 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:53 jmmv Exp $
 #
 
 DISTNAME=	chsfont
+WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 7bafcf5cbb7..849be860baf 100644
--- a/fonts/acroread-chtfont/Makefile
+++ b/fonts/acroread-chtfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/04/01 04:14:36 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:53 jmmv Exp $
 #
 
 DISTNAME=	chtfont
+WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 4a4cc129166..74d85c2743b 100644
--- a/fonts/acroread-font-share/Makefile
+++ b/fonts/acroread-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2002/04/01 04:14:36 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:54 jmmv 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 6f9d03c98f4..0751b3179a9 100644
--- a/fonts/acroread-jpnfont/Makefile
+++ b/fonts/acroread-jpnfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/01/24 15:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:54 jmmv Exp $
 #
 
 DISTNAME=	jpnfont
+WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts japanese
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 6d8d39706f9..4d5e739b82b 100644
--- a/fonts/acroread-korfont/Makefile
+++ b/fonts/acroread-korfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/04/01 04:14:37 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:54 jmmv Exp $
 #
 
 DISTNAME=	korfont
+WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 c0be032088b..1f39d076e9b 100644
--- a/fonts/acroread5-chsfont/Makefile
+++ b/fonts/acroread5-chsfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/16 06:01:14 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:54 jmmv Exp $
 #
 
 DISTNAME=	chsfont
+WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 821d9678f78..c871e00a761 100644
--- a/fonts/acroread5-chtfont/Makefile
+++ b/fonts/acroread5-chtfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/16 06:02:21 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:54 jmmv Exp $
 #
 
 DISTNAME=	chtfont
+WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 43cfa35895f..2a274717cdd 100644
--- a/fonts/acroread5-font-share/Makefile
+++ b/fonts/acroread5-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/16 05:58:14 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:55 jmmv 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 812d866e95e..52b23940425 100644
--- a/fonts/acroread5-jpnfont/Makefile
+++ b/fonts/acroread5-jpnfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/16 07:06:42 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:55 jmmv Exp $
 #
 
 DISTNAME=	jpnfont
+WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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 658b034550e..b333b273888 100644
--- a/fonts/acroread5-korfont/Makefile
+++ b/fonts/acroread5-korfont/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/16 07:07:22 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:55 jmmv Exp $
 #
 
 DISTNAME=	korfont
+WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
@@ -9,7 +10,6 @@ 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/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 6a2091138c6..8310ad6ae4e 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/28 21:14:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:55 jmmv Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
+WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/
 DISTFILES=	${FONT_FILES} ${MISC_FILES}
@@ -17,7 +18,6 @@ DIST_SUBDIR=	arphic-ttf
 CONFLICTS=	arphicttf-*
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index 269d1921191..2c919c2625b 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/28 21:14:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:55 jmmv Exp $
 #
 
 DISTNAME=	baekmuk-ttf-2.0
+WRKSRC=		${WRKDIR}
 PKGREVISION=	1
 CATEGORIES=	fonts korean
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/
@@ -12,7 +13,6 @@ COMMENT=	Baekmuk family Korean TrueType fonts
 
 FONT_FILES=	batang.ttf dotum.ttf gulim.ttf hline.ttf
 
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index 152fe4f1f8e..83f272f2609 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/17 01:47:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:56 jmmv 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.
@@ -12,7 +13,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/
 COMMENT=	BaKoMa Fonts for TeX
 
-WRKSRC=			${WRKDIR}/bakoma
 LICENSE+=		no-commercial-use
 NO_SRC_ON_CDROM=	#defined
 NO_BIN_ON_CDROM=	#defined
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index e70ef34ee52..19653ffc996 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2002/09/01 16:17:06 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/03/29 12:40:56 jmmv Exp $
 
 DISTNAME=	# empty
 CATEGORIES=	fonts
+WRKSRC=		${WRKDIR}
 MASTER_SITES=	ftp://ftp.mirror.ac.uk/sites/ftp.netscape.com/pub/communicator/extras/fonts/windows/ \
 		ftp://ftp.riken.go.jp/pub/net/netscape/communicator/extras/fonts/windows/ \
 		ftp://ftp.man.poznan.pl/mirrors/mirrorsite.netscape.com/netscape/communicator/extras/fonts/windows/ \
@@ -29,7 +30,6 @@ DIST_SUBDIR=	cyberbit-ttf
 
 EXTRACT_CMD=	${LOCALBASE}/bin/unzip -Laq $${extract_file}
 EXTRACT_ONLY=	${FONT_FILE}
-WRKSRC=		${WRKDIR}
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index 708b75ee768..15a83086720 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/06/15 13:01:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:56 jmmv Exp $
 #
 
 DISTNAME=	dbz
 PKGNAME=	dbz-ttf-20020507
+WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.andrew.cmu.edu/~twm/fonts/
 EXTRACT_SUFX=	.zip
@@ -14,7 +15,6 @@ COMMENT=	Divide By Zero TrueType fonts created by Tom Murphy 7
 
 LICENSE=	limited-redistribution
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 USE_X11BASE=	yes
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index ce3d82f12cc..ef44325804d 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/03/09 13:26:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:56 jmmv Exp $
 #
 
 DISTNAME=	fcpackage.2_1
 PKGNAME=	fontconfig-2.1
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}/${DISTNAME}/fontconfig
 CATEGORIES=	fonts gnome
 MASTER_SITES=	http://fontconfig.org/release/
 
@@ -35,8 +36,6 @@ EGDIR=		${PREFIX}/share/examples/fontconfig
 CONF_FILES=	${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf
 CONF_FILES+=	${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/fontconfig
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/src/fontconfig.man \
 	    ${PREFIX}/man/man3/fontconfig.3
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index 29335b14a9e..84cf10d1773 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/28 21:14:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:56 jmmv Exp $
 #
 
 DISTNAME=	geoslab703-ttf-20010522
+WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.will-harris.com/fonts/
 DISTFILES=	geo703l.ttf geo703li.ttf
@@ -13,7 +14,6 @@ COMMENT=	Free TrueType fonts from Bitstream, useful for web viewing
 DIST_SUBDIR=	geoslab703-ttf
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index e46c480b4ac..abb794d770a 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:35:39 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
+WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		http://www.tea.forus.or.jp/toshi/exhibition/
 
@@ -13,7 +14,6 @@ USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
 #ALIAS=			${WRKDIR}/fonts.alias
-WRKSRC=			${WRKDIR}
 
 LICENSE=		no-commercial-use
 
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 0e3e9d209c6..886ee36c9c5 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:36:57 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv 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/
@@ -20,7 +21,6 @@ SITES_clR5x8.bdf=	ftp://ftp.jp.netbsd.org/pub/NetBSD-jp/tut-jp/fonts/
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
-WRKSRC=			${WRKDIR}
 DISTPATCH=		${WRKSRC}/clR5x8-s5x8.diff
 
 LICENSE=		no-commercial-use
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 6a1b2088c8e..bc523378cba 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:38:32 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv 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.
 
@@ -11,7 +12,6 @@ COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
-WRKSRC=			${WRKDIR}
 
 #LICENSE=		no-commercial-use
 
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 9e4b6ab8b4d..8115e50a442 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:23 agc Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:57 jmmv 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,7 +14,6 @@ MAINTAINER=	itojun@itojun.org
 COMMENT=	X11 X0212-1990 font.  14, 16, 24 and 40 dots availble
 
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	${DISTFILES}
 MAKE_ENV+=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
 
diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile
index b2b47ad413c..c8e5a944ea7 100644
--- a/fonts/kcfonts/Makefile
+++ b/fonts/kcfonts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/18 16:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv Exp $
 
 DISTNAME=      kcfonts-1.05
+WRKSRC=        ${WRKDIR}
 CATEGORIES=    fonts
 MASTER_SITES=  ftp://freebsd.sinica.edu.tw/pub/distfiles/
 
@@ -9,6 +10,4 @@ COMMENT=       Kuo Chauo Chinese Fonts collection
 
 USE_X11BASE=   yes
 
-WRKSRC=        ${WRKDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index 69ece9bbf67..8d1d0044482 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:57 jmmv Exp $
 
 DISTNAME=	kochi-gothic-20020503
 PKGNAME=	kochi-ttf-20020503
+WRKSRC=		${WRKDIR}/kochi-gothic
 CATEGORIES=	fonts japanese
 MASTER_SITES=	http://www.on.cs.keio.ac.jp/~yasu/linux/fonts/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,8 +17,6 @@ DEPENDS+=	mkfontscale>=20020524:../../fonts/mkfontscale
 
 KOCHI_VERSION=	0.2.20020503
 
-WRKSRC=		${WRKDIR}/kochi-gothic
-
 NO_BUILD=	yes
 USE_X11BASE=	yes
 USE_PKGINSTALL=	yes
diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile
index 033f5d555e4..3bfa8b8bc7b 100644
--- a/fonts/mkfontalias/Makefile
+++ b/fonts/mkfontalias/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:50 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:58 jmmv Exp $
 #
 
 DISTNAME=	mkfontalias.py
 PKGNAME=	mkfontalias-20000521
+WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	http://home.c2i.net/dark/
 EXTRACT_SUFX=	# empty
@@ -12,7 +13,6 @@ HOMEPAGE=	http://home.c2i.net/dark/linux.html#fuzzy
 COMMENT=	creates a fonts.alias from the fonts.dir for TrueType fonts
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 PYTHON_PATCH_SCRIPTS=	${DISTNAME}
diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile
index 50feee6520f..0c94e32d95c 100644
--- a/fonts/mkfontscale/Makefile
+++ b/fonts/mkfontscale/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/02/26 04:01:10 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:58 jmmv Exp $
 
 DISTNAME=	mkfontscale-20020524
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/mkfontscale
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.pps.jussieu.fr/~jch/software/files/
 
@@ -11,8 +12,6 @@ COMMENT=	create an index of scalable font files for X
 
 USE_IMAKE=	YES
 
-WRKSRC=		${WRKDIR}/mkfontscale
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(${X11BASE}/include/X11/fonts/fontenc.h)
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 3df1b7c8f7e..78d20c4219a 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/31 05:44:43 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:58 jmmv 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,7 +12,6 @@ HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	convert X font from PCF to BDF
 
 USE_GMAKE=	YES
-WRKSRC=		${WRKDIR}
 MAKEFILE=	Makefile.gcc
 
 do-install:
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index ca6cbf96eb5..b12efa35068 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:58 jmmv Exp $
 #
 
 DISTNAME=	pfaedit_full-020910
 PKGNAME=	pfaedit-20020910
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/pfaedit
 CATEGORIES=	fonts editors
 MASTER_SITES=	http://pfaedit.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -12,7 +13,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://pfaedit.sourceforge.net/
 COMMENT=	postscript font editor
 
-WRKSRC=		${WRKDIR}/pfaedit
 USE_LIBTOOL=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=	YES
diff --git a/fonts/ttmkfdir/Makefile b/fonts/ttmkfdir/Makefile
index 3a028029be4..5653c786f2f 100644
--- a/fonts/ttmkfdir/Makefile
+++ b/fonts/ttmkfdir/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 23:59:49 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:59 jmmv Exp $
 #
 
 DISTNAME=	ttmkfdir
 PKGNAME=	ttmkfdir-0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts x11
 MASTER_SITES=	http://www.joerg-pommnitz.de/TrueType/
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@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 36c7a88b670..301a45bec5d 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:28:01 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:59 jmmv Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
+WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -12,7 +13,6 @@ DEPENDS+=		ja-vflib-lib-*:../../print/ja-vflib-lib
 DEPENDS+=		kochi-ttf-*:../../fonts/kochi-ttf
 
 EXTRACT_ONLY=		# empty
-WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		YES
 NO_BUILD=		YES