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

41 files changed, 85 insertions, 82 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 0e683ac8666..876c8d3bcff 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		abiword-${DIST_VER}
 PKGREVISION=				2
-WRKSRC=			${WRKDIR}/${DISTNAME}/abi
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=abiword/}
 
@@ -16,6 +15,7 @@ BUILD_USES_MSGFMT=	yes
 # GTK1 version and previous name of the GTK2 version
 CONFLICTS=		abiword-personal-[0-9]* abiword2-[0-9]*
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/abi
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
diff --git a/editors/abiword1/Makefile b/editors/abiword1/Makefile
index 4e7815e7494..86ab2847e84 100644
--- a/editors/abiword1/Makefile
+++ b/editors/abiword1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -8,7 +8,6 @@
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
 
@@ -23,6 +22,7 @@ ABIWORD_VERS=	1.0.5
 
 CONFLICTS=	abiword-[0-9]* abiword2-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 USE_GMAKE=	# defined
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index fbb3ebfd46b..848f10d205e 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2003/06/05 17:20:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/08/23 02:10:57 hoek Exp
 #
 
 DISTNAME=	beav_1.40-11
 PKGNAME=	beav-1.40.11
-WRKSRC=		${WRKDIR}/beav-1.40
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=hamm/hamm/source/editors/}
 
 MAINTAINER=	bad@NetBSD.ORG
 COMMENT=	Binary Editor And Viewer, a full featured binary file editor
 
+WRKSRC=		${WRKDIR}/beav-1.40
 MAKE_ENV+=	SED="${SED}"
 
 pre-patch:
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 44fe752cecd..35930ca7d5a 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	beaver-0.2.6
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	editors
 MASTER_SITES=	http://savannah.nongnu.org/download/beaver/
 
@@ -11,6 +10,7 @@ MAINTAINER=	vincent.derrien@ahoup.net
 HOMEPAGE=	http://www.nongnu.org/beaver/
 COMMENT=	Lightweight GTK+ text editor with syntax highlighting
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 159693f78ae..2e31a7b7271 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	bvi-1.3.0.src
 PKGNAME=	bvi-1.3.0
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bvi/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://bvi.sourceforge.net/
 COMMENT=	Vi-like editor for binary files
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	SHELL=${SH}
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index 3003673bb94..a74e689fa10 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:34:23 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	ee-1.4.5a.src
 PKGNAME=	easyedit-1.4.5a
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mahon.cwx.net/
 COMMENT=	Easy to use text editor
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit
 	${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/man/man1/easyedit.1
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 2ea4a21d3ec..7103b7decdd 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		gice-0.6.1
 PKGREVISION=		5
-WRKSRC=			${WRKDIR}/gice
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,7 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://gice.sourceforge.net/
 COMMENT=		Powerful C text editor with advanced features
 
+WRKSRC=			${WRKDIR}/gice
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 032e88d8007..1d8bf818353 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	hexedit-1.2.2
 PKGREVISION=			2
-WRKSRC=		${WRKDIR}/hexedit
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/
 EXTRACT_SUFX=	.src.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 COMMENT=	To view and edit files in hexadecimal or ASCII
 
+WRKSRC=		${WRKDIR}/hexedit
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 420e169cc1d..42f4c6d2020 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/08/23 15:10:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=       jde-2.3.2
-WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
 CATEGORIES=     devel editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
@@ -17,6 +16,8 @@ DEPENDS+=       eieio>=0.17:../../lang/eieio
 DEPENDS+=       semantic>=1.4rc13:../../devel/semantic
 DEPENDS+=       elib>=1.0:../../devel/elib
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
+
 .include "../../mk/emacs.mk"
 
 # XEmacs has its own JDE package
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 8d555cea20b..56b77825a20 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:34:31 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/joe
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	explorer@NetBSD.org
 COMMENT=	Joe's own editor
 
+WRKSRC=		${WRKDIR}/joe
 ALL_TARGET=	joe
 
 CFLAGS+=	-DTERMINFO
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index 0a9b7e1186b..686d82d2b81 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:34:35 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	leim-${VERSION}
-WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
@@ -12,6 +11,7 @@ COMMENT=	Libraries of Emacs Input Methods (for emacs21)
 
 DEPENDS+=	emacs>=${VERSION}:../emacs
 
+WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 7eeec10106e..111bfa8a9b0 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:34:36 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/emacs-20.7/leim
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
@@ -13,6 +12,7 @@ COMMENT=	Libraries of Emacs Input Methods
 
 DEPENDS+=	emacs-${VERSION}nb2:../emacs20
 
+WRKSRC=		${WRKDIR}/emacs-20.7/leim
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 98eda3a8b20..3a92c60e0f1 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:34:37 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	manedit-0.5.6
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://wolfpack.twu.net/ManEdit/
 COMMENT=	UNIX Manual (man, manpage) page editor, viewer, and browser for X11
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 USE_BUILDLINK2=	YES
 
 MAKE_ENV+=	CPP="${CXX}"
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index b4485c2971d..10672f13798 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:34:38 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		matlab.el
 PKGNAME=		matlab-mode-2.3
-WRKSRC=			${WRKDIR}
 CATEGORIES=		editors math
 MASTER_SITES=		http://www.mathworks.com/matlabcentral/files/104/
 EXTRACT_SUFX=
@@ -12,6 +11,7 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=104&objectType=file
 COMMENT=		Matlab mode for Emacs
 
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}
 DIST_SUBDIR=		${PKGNAME}
 
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 4baf843bc8c..295e3c559d2 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/08/09 10:48:09 seb Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/mule
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/
 
@@ -21,6 +20,7 @@ CONFLICTS=	emacs-[0-9]*
 .include "../../inputmethod/canna-lib/buildlink2.mk"
 .endif
 
+WRKSRC=		${WRKDIR}/mule
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 8fd86a3c9bb..71b9c2bbadc 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:40:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ne
 PKGNAME=	ne-1.26
-WRKSRC=		${WRKDIR}/src
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/NE/
 DISTFILES=	ne.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec
@@ -11,6 +10,7 @@ MAINTAINER=	bjh@mail.dotcom.fr
 COMMENT=	Re-write of Phoenix E.  A sensible light-weight editor
 
 DIST_SUBDIR=	${PKGNAME}
+WRKSRC=		${WRKDIR}/src
 
 EXTRACT_ONLY=	ne.tar.gz
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 16224528fe4..38f4e90b736 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/12/12 10:20:53 adam Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	nedit-${VERS}-source
 PKGNAME=	nedit-${VERS}
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nedit.org/ftp/v${VERS:S/./_/g}/ \
 		http://www.au.nedit.org/ftp/v${VERS:S/./_/g}/ \
@@ -15,6 +14,7 @@ COMMENT=	Motif based standard GUI style text editor
 
 VERS=		5.3
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 ALL_TARGET=		netbsd
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 5ba50877829..6ec9f36f95b 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ng-1.4.3
-WRKSRC=         ${WRKDIR}/ng
 CATEGORIES=     editors japanese
 MASTER_SITES=   http://tt.sakura.ne.jp/~amura/archives/ng/
 
@@ -9,6 +8,7 @@ MAINTAINER=     fk200329@fsinet.or.jp
 HOMEPAGE=	http://tt.sakura.ne.jp/~amura/ng/
 COMMENT=	Very light Emacs-clone with japanese support
 
+WRKSRC=         ${WRKDIR}/ng
 USE_BUILDLINK2=	YES
 
 .include "../../mk/bsd.prefs.mk"	# for USE_CANNA
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 107062a4c4d..57223f68b4e 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/03/29 12:40:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=	nvi-1.79
 PKGNAME=	nvi-m17n-1.79.19991117
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	editors
 MASTER_SITES=	ftp://sleepy.vwh.net/pub/ \
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
@@ -17,6 +16,7 @@ COMMENT=	Clone of vi/ex, with multilingual patch
 
 CONFLICTS=	vigor-[0-9]* nvi-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index f0a5ae0ce83..9d82dc467e9 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/01/11 19:43:27 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	nvi-1.81.5
-WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 CATEGORIES=	editors
 MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +18,7 @@ CONFIGURE_ENV+=		vi_cv_include_sys_select=no
 .  endif
 .endif
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS+=	--with-db3=${BUILDLINK_PREFIX.db3}
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 5c4a514a159..b7e31a5693b 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:34:47 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		editors plan9
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=		.msg.gz
@@ -15,6 +14,7 @@ COMMENT=		Unix version of Rob Pike's editor for plan9
 
 DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
 
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
 MANCOMPRESSED=		yes
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 34ed1001d60..a8cd467623b 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:51 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_cs_CZ
 PKGNAME=	ted-cs-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Czech spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index b3d1db46816..844ac8ad8d0 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:52 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_da_DK
 PKGNAME=	ted-da-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Danish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 5f985fdb887..7ed18777179 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:52 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_de_DE
 PKGNAME=	ted-de-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	German spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index 24ae0b200bb..af11d3b8dd1 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:54 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_en_GB
 PKGNAME=	ted-en-gb-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	UK English spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 51c83c3c8ac..96ee21b55d1 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:54 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	ted-2.14.src
 PKGNAME=	ted-en-us-2.14
-WRKSRC=		${WRKDIR}/Ted-2.14
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	US English spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}/Ted-2.14
 USE_X11BASE=	YES
 NO_BUILD=	YES
 
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index fd282bfb20e..971034a712f 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:55 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_es_ES
 PKGNAME=	ted-es-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Spanish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 40951f7634c..e8f47f0bcce 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:56 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_fr_FR
 PKGNAME=	ted-fr-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	French spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index 69eb119b644..be6d8d8763b 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_it_IT
 PKGNAME=	ted-it-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Italian spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index b3e540f26ae..75d70bac8f7 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:58 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_nl_NL
 PKGNAME=	ted-nl-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Dutch spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 4305d7cd575..0c95b8de694 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:59 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_no_NO
 PKGNAME=	ted-no-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Norwegian spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index a1719068ca1..13f0a3f1472 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:34:59 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_pl_PL
 PKGNAME=	ted-pl-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Polish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index afe653adbc8..05a6154cff5 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:00 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_pt_PT
 PKGNAME=	ted-pt-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Portuguese spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 57d119874d8..e718ab966e5 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:01 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_sv_SE
 PKGNAME=	ted-sv-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Swedish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 19c9a86e0f0..09ef095e874 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ted-2.14.src
 PKGNAME=	ted-2.14
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/Ted-2.14
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/	\
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nllgg.nl/Ted/
 COMMENT=	X11 based WordPad-like word processor
 
+WRKSRC=		${WRKDIR}/Ted-2.14
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 
diff --git a/editors/treetext/Makefile b/editors/treetext/Makefile
index 2ebb8bdcc9f..25490ec1ced 100644
--- a/editors/treetext/Makefile
+++ b/editors/treetext/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:14:06 agc Exp $
 #
 
 DISTNAME=	TreeText-0.3.3-src
 PKGNAME=	${DISTNAME:C/-src//}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/treetext/treetext
 CATEGORIES=	editors
 MASTER_SITES=	http://www.ab.wakwak.com/~tino/fox/treetext/
 EXTRACT_SUFX=	.zip
@@ -15,6 +14,7 @@ COMMENT=	Multi documents editor
 
 BROKEN=		Compilation fails due to outdated code with respect to our fox package.
 
+WRKSRC=		${WRKDIR}/treetext/treetext
 USE_BUILDLINK2=	# defined
 USE_X11BASE=	# defined
 
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 6ff43b4cdde..0add812e7c4 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:35:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:14:06 agc Exp $
 # FreeBSD: ports/editors/uemacs/Makefile,v 1.14 1999/10/07 06:49:01 tg Exp
 
 DISTNAME=	ue400dev
 PKGNAME=	uemacs-4.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://aquest.com/pub/uemacs400/disk2/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	tron@NetBSD.org
 COMMENT=	"emacs" key sequences compatible full screen editor
 
+WRKSRC=		${WRKDIR}
+
 post-extract:
 	${CP} -r ${WRKSRC}/freebsd ${WRKSRC}/netbsd
 
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 983399c5997..ce139dadc46 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/09/09 18:00:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:06 agc Exp $
 #
 
 DISTNAME=	vigor-0.016
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vigor/}
 
@@ -12,6 +11,7 @@ COMMENT=	nvi with excessive online "help"
 
 CONFLICTS+=	nvi-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 USE_X11=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index b8d601f84dc..404df7d653d 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
 PKGREVISION=	6
-WRKSRC= 	${WRKDIR}/kvim-${KVIM_VERSION}/src
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.kde.org/stable/apps/KDE3.x/utils/ \
 		http://freenux.org/kvim/
@@ -18,6 +17,7 @@ KVIM_VERSION=	6.1.141
 CONFLICTS+=	vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=	vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]*
 
+WRKSRC= 		${WRKDIR}/kvim-${KVIM_VERSION}/src
 USE_BUILDLINK2=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 661a8c5dcad..ce3c9c6162c 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.34 2003/07/17 21:35:09 grant Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/01/20 12:14:06 agc Exp $
 
 VIM_VERSION=		6.2
 VIM_PATCHLEVEL=		0
 DISTNAME=		vim-${VIM_VERSION}
-WRKSRC=			${WRKDIR}/vim62/src
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
@@ -23,6 +22,7 @@ HOMEPAGE=		http://www.vim.org/
 
 CONFLICTS+=		vim-kde-[0-9]*
 
+WRKSRC=			${WRKDIR}/vim62/src
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index a85c6653ea6..2b8e2adabd4 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2003/12/22 08:14:26 uebayasi Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.13
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=packages/}
 DISTFILES=	\
@@ -132,6 +131,7 @@ COMMENT=	Common elisp packages for xemacs 21
 
 DEPENDS+=	xemacs>=21.1.14:../../editors/xemacs
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGBASE}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes