From 95b3e3e2360a18f5efbc61ef85a063b7481be09f Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Sat, 29 Mar 2003 12:40:00 +0000
Subject: Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

---
 editors/abiword/Makefile          | 5 ++---
 editors/beav/Makefile             | 5 ++---
 editors/easyedit/Makefile         | 5 ++---
 editors/gice/Makefile             | 4 ++--
 editors/jde/Makefile              | 4 ++--
 editors/jed/Makefile              | 5 ++---
 editors/joe/Makefile              | 4 ++--
 editors/jove/Makefile             | 5 ++---
 editors/leim/Makefile             | 4 ++--
 editors/leim21/Makefile           | 4 ++--
 editors/manedit/Makefile          | 5 ++---
 editors/matlab-mode/Makefile      | 5 ++---
 editors/mined/Makefile            | 5 ++---
 editors/mule/Makefile             | 4 ++--
 editors/nedit/Makefile            | 5 ++---
 editors/ng/Makefile               | 4 ++--
 editors/nvi-m17n/Makefile         | 4 ++--
 editors/nvi/Makefile              | 5 ++---
 editors/sam/Makefile              | 4 ++--
 editors/treetext/Makefile         | 5 ++---
 editors/uemacs/Makefile           | 5 ++---
 editors/vigor/Makefile            | 4 ++--
 editors/vim-share/Makefile.common | 4 ++--
 editors/xemacs-packages/Makefile  | 4 ++--
 editors/xjed/Makefile             | 5 ++---
 25 files changed, 50 insertions(+), 63 deletions(-)

(limited to 'editors')

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 617464f2c85..71a4d70b1ae 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/02/05 17:40:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.53 2003/03/29 12:40:41 jmmv Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -8,6 +8,7 @@
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
 #PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
 
@@ -44,8 +45,6 @@ MAKE_ENV+=	OS_CFLAGS="${OS_CFLAGS}"
 MAKE_FLAGS+=	ABI_BUILD_VERSION="${ABIWORD_VERS}"
 MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/abi
-
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../converters/psiconv/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 75049a4188a..510bafde721 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:40:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:42 jmmv 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=	ftp://ftp.debian.org/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/easyedit/Makefile b/editors/easyedit/Makefile
index 3523dd2a8c3..8326ddb3bef 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/03 08:42:41 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:42 jmmv Exp $
 #
 
 DISTNAME=	ee-1.4.5a.src
 PKGNAME=	easyedit-1.4.5a
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mahon.cwx.net/
 COMMENT=	Easy to use text editor
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 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 ba73936b0c2..b507955bfa8 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/01/03 15:26:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:42 jmmv Exp $
 #
 
 DISTNAME=		gice-0.6.1
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/gice
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
 EXTRACT_SUFX=		.tgz
@@ -16,7 +17,6 @@ USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
-WRKSRC=			${WRKDIR}/gice
 ALL_TARGET=		gice
 
 do-install:
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index ab2421113f3..57ff1654e2b 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/01/25 03:10:36 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:42 jmmv Exp $
 #
 
 DISTNAME=       jde-2.3.2
+WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
 CATEGORIES=     devel editors
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
@@ -26,7 +27,6 @@ MAKE_ENV+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
 
 NO_CONFIGURE=   # set
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
 MAKEFILE=       makefile
 
 post-extract:
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 4886f40c8db..46b2ab663af 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2002/10/09 13:45:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:40:42 jmmv Exp $
 #
 
 DISTNAME=		jed-B0.99-15
 PKGNAME=		jed-0.99.15
+WRKSRC=			${WRKDIR}/jed-B0.99-15
 CATEGORIES=		editors
 MASTER_SITES=		ftp://space.mit.edu/pub/davis/jed/v0.99/ \
 			ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/
@@ -15,8 +16,6 @@ USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-X
 
-WRKSRC=			${WRKDIR}/jed-B0.99-15
-
 post-install:
 	@cd ${WRKSRC};							\
 		for dir in lib info doc; do				\
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index a6c37854075..8ca8122b62e 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:43 jmmv Exp $
 #
 
 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/joe
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
@@ -12,7 +13,6 @@ MAINTAINER=	explorer@netbsd.org
 COMMENT=	Joe's own editor
 
 ALL_TARGET=	joe
-WRKSRC=		${WRKDIR}/joe
 
 CFLAGS+=	-DTERMINFO
 
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index df036eac786..e49f5b2148a 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:40:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:43 jmmv Exp $
 #
 
 DISTNAME=	jove-4.16
+WRKSRC=		${WRKDIR}/jove
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	small emacs-style editor, but lacks the LISP engine
 
-WRKSRC=		${WRKDIR}/jove
-
 NO_CONFIGURE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index ea53dc63609..494bb425119 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/19 08:58:36 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:43 jmmv 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}
@@ -16,7 +17,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 VERSION=	20.7
-WRKSRC=		${WRKDIR}/emacs-20.7/leim
 
 post-extract:
 	@${ECHO} '#!/bin/sh' >${WRKSRC}/configure
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 2dd0e409357..89d234a6817 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/19 08:58:37 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:43 jmmv Exp $
 
 DISTNAME=	leim-${VERSION}
+WRKSRC=		${WRKDIR}/emacs-21.2/leim
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
@@ -15,7 +16,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 VERSION=	21.2
-WRKSRC=		${WRKDIR}/emacs-21.2/leim
 
 post-extract:
 	@${ECHO} '#!/bin/sh' >${WRKSRC}/configure
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 10476ca88f9..26c5f514b10 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/12/30 00:00:17 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:43 jmmv Exp $
 #
 
 DISTNAME=	manedit-0.5.6
+WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +11,6 @@ MAINTAINER=	packages@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 1043bcde5e7..443bfce580e 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 01:32:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:44 jmmv 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=
@@ -11,8 +12,6 @@ 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/mined/Makefile b/editors/mined/Makefile
index 86f93f0e9cc..899c2c93774 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/27 12:56:21 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:44 jmmv Exp $
 #
 
 DISTNAME=	mined-2000.6
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	editors
 MASTER_SITES=	http://towo.net/mined/
 
@@ -11,8 +12,6 @@ COMMENT=	html-aware editor
 
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 MAKEFILE=	makefile.bsd
 
 .include "../../devel/ncurses/buildlink2.mk"
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 5d8714fb6d0..9d35043cf98 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2002/11/29 00:24:48 kei Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:40:44 jmmv Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/mule
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/
 
@@ -20,7 +21,6 @@ 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/nedit/Makefile b/editors/nedit/Makefile
index 59497cd98f7..f1dcc3d969d 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2002/09/21 11:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/29 12:40:44 jmmv Exp $
 
 VERS=		5.3
 DISTNAME=	nedit-${VERS}-source
 PKGNAME=	nedit-${VERS}
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nedit.org/ftp/v${VERS:S/./_/g}/ \
 		http://www.au.nedit.org/ftp/v${VERS:S/./_/g}/ \
@@ -17,8 +18,6 @@ USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 ALL_TARGET=		netbsd
 
-WRKSRC=	${WRKDIR}/${PKGNAME}
-
 do-install:
 .for PROGRAM in nc nedit
 	${INSTALL_PROGRAM} ${WRKSRC}/source/${PROGRAM} ${PREFIX}/bin
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index e0416f70200..5ba50877829 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/10/25 12:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:45 jmmv Exp $
 
 DISTNAME=	ng-1.4.3
+WRKSRC=         ${WRKDIR}/ng
 CATEGORIES=     editors japanese
 MASTER_SITES=   http://tt.sakura.ne.jp/~amura/archives/ng/
 
@@ -20,7 +21,6 @@ USE_CANNA=	YES
 .include "../../inputmethod/canna-lib/buildlink2.mk"
 .endif
 
-WRKSRC=         ${WRKDIR}/ng
 ALL_TARGET=	ng
 MAKEFLAGS+=	USE_CANNA=${USE_CANNA}
 
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 2560f57292e..107062a4c4d 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2002/11/09 02:18:09 itojun Exp $
+# $NetBSD: Makefile,v 1.23 2003/03/29 12:40:45 jmmv 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,7 +18,6 @@ COMMENT=	Clone of vi/ex, with multilingual patch
 CONFLICTS=	vigor-[0-9]* nvi-[0-9]*
 
 USE_BUILDLINK2=	YES
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	YES
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 6396da6a5d8..0b71c328ef6 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/10 12:52:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:45 jmmv 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,7 +20,5 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
-
 .include "../../databases/db3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 2e485d5c542..53cf6ceeb86 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:52 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:45 jmmv 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
@@ -14,7 +15,6 @@ 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/treetext/Makefile b/editors/treetext/Makefile
index 0c5c73aaaea..d9e734c8473 100644
--- a/editors/treetext/Makefile
+++ b/editors/treetext/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2002/10/09 14:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:46 jmmv Exp $
 #
 
 DISTNAME=	TreeText-0.3.3-src
 PKGNAME=	${DISTNAME:C/-src//}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/treetext/treetext
 CATEGORIES=	editors
 MASTER_SITES=	http://www.ab.wakwak.com/~tino/fox/treetext/
 EXTRACT_SUFX=	.zip
@@ -15,8 +16,6 @@ COMMENT=	multi documents editor
 USE_BUILDLINK2=	# defined
 USE_X11BASE=	# defined
 
-WRKSRC=		${WRKDIR}/treetext/treetext
-
 post-extract:
 	@${LN} -s ${WRKSRC}/makefile ${WRKSRC}/Makefile
 	@${SED} -e 's|$${X11BASE}|${X11BASE}|' ${FILESDIR}/MakeInclude \
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 2da0373f1e3..fb707392def 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:46 jmmv 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
@@ -10,8 +11,6 @@ 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 d7f696c9d6e..517f8f49b31 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/01/29 16:23:13 agc Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:46 jmmv Exp $
 #
 
 DISTNAME=	vigor-0.016
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	editors
 MASTER_SITES=	http://www.red-bean.com:8080/
 
@@ -14,7 +15,6 @@ CONFLICTS+=	nvi-[0-9]*
 USE_X11=	yes
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-x
 #		--enable-perlinterp \
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 4c80a7206a6..4cc7012066d 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.31 2003/03/16 08:02:38 martti Exp $
+# $NetBSD: Makefile.common,v 1.32 2003/03/29 12:40:47 jmmv Exp $
 
 VIM_VERSION=		6.1
 VIM_PATCHLEVEL=		405
 DISTNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
+WRKSRC=			${WRKDIR}/vim61/src
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
@@ -24,7 +25,6 @@ CONFLICTS+=		vim-kde-[0-9]*
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/vim61/src
 
 # See "configure --help" extra options. These might affect the installed
 # files (and PLIST might not include all files) so use at your own risk!
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 6176dc67363..c1f0e3d5da2 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/03/04 22:06:29 tron Exp $
+# $NetBSD: Makefile,v 1.34 2003/03/29 12:40:47 jmmv Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.11
+WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.xemacs.org/pub/xemacs/packages/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
@@ -134,7 +135,6 @@ DEPENDS+=	xemacs>=21.1.14:../../editors/xemacs
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
 
 .include "../../editors/xemacs/Makefile.pkg"
 
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index e7d3c37a57c..6132668fed6 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 12:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:47 jmmv Exp $
 #
 
 DISTNAME=		jed-B0.99-15
 PKGNAME=		xjed-0.99.15
+WRKSRC=			${WRKDIR}/jed-B0.99-15
 CATEGORIES=		editors
 MASTER_SITES=		ftp://space.mit.edu/pub/davis/jed/v0.99/ \
 			ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/
@@ -16,8 +17,6 @@ USE_X11=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-x
 
-WRKSRC=			${WRKDIR}/jed-B0.99-15
-
 post-install:
 	@cd ${WRKSRC};							\
 		for dir in lib info doc; do				\
-- 
cgit v1.2.3