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

25 files changed, 50 insertions, 60 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index d6c75e32199..f0afada236b 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/11/09 14:12:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:47 jmmv Exp $
 #
 
 DISTNAME=	BasiliskII_src_31052001
 PKGNAME=	BasiliskII-0.9.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/BasiliskII-0.9/src/Unix
 CATEGORIES=	emulators
 MASTER_SITES=	http://iphcip1.physik.uni-mainz.de/~cbauer/
 
@@ -11,8 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.uni-mainz.de/~bauec002/B2Main.html
 COMMENT=	Open Source 68k Macintosh emulator
 
-WRKSRC=		${WRKDIR}/BasiliskII-0.9/src/Unix
-
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 84c25d498a2..30a9f6461c9 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 11:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:48 jmmv Exp $
 #
 
 DISTNAME=	arcem0.50
 PKGNAME=	arcem-0.50
+WRKSRC=		${WRKDIR}/armul-arc
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arm.uk.linux.org/pub/linux/arcem/
 EXTRACT_SUFX=	.tgz
@@ -14,8 +15,6 @@ MAINTAINER=	cjep@netbsd.org
 HOMEPAGE=	ftp://ftp.arm.uk.linux.org/pub/linux/arcem/Index
 COMMENT=	Dave Gilbert's Acorn Archimedes emulator
 
-WRKSRC=		${WRKDIR}/armul-arc
-
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index a47b0dc547d..17985e71150 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/08/16 16:05:29 agc Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:48 jmmv Exp $
 #
 
 DISTNAME=		doscmd-19960502-2
 PKGNAME=		doscmd-19960502.2
+WRKSRC=			${WRKDIR}/doscmd
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/arch/i386/doscmd/
 
@@ -12,8 +13,6 @@ COMMENT=		MS-DOS emulator (NetBSD/i386 only)
 # mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
 ONLY_FOR_PLATFORM=	NetBSD-1.[345]*-i386
 
-WRKSRC=			${WRKDIR}/doscmd
-
 MAKE_ENV=		X11BASE=${X11BASE}
 
 MANCOMPRESSED_IF_MANZ=	yes
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 74aac6543e1..30ff333ca36 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/07/05 14:22:37 perry Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:48 jmmv Exp $
 
 DISTNAME=	fMSX24.tar
 PKGNAME=	fmsx-2.4
+WRKSRC= 	${WRKDIR}/MSX
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.komkon.org/fms/fMSX/
 EXTRACT_SUFX=	.Z
@@ -18,8 +19,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 USE_X11=	yes
 
-WRKSRC= 	${WRKDIR}/MSX
-
 .include "../../mk/bsd.prefs.mk"
 USE_SUN_AUDIO?=	YES
 DEFS=		-DFontDir=\"\\\"${PREFIX}/share/fmsx/\"\\\"
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 82fa4d8ad4b..f96a35a1afa 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/09/09 19:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:49 jmmv Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.flame.org/NetBSD/
 
@@ -12,7 +13,6 @@ COMMENT=		libraries necessary for FreeBSD compatibility, including XFree86
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 NO_BUILD=		yes
-WRKSRC=			${WRKDIR}
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 7f89881841d..2f61769b976 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/31 19:16:53 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:49 jmmv Exp $
 #
 
 DISTNAME=	hatari-0.25
+WRKSRC=		${WRKDIR}/hatari-0.25/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
 
@@ -9,7 +10,6 @@ MAINTAINER=	cjep@netbsd.org
 HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
-WRKSRC=		${WRKDIR}/hatari-0.25/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
index 09e1328828c..fa04e0c5d72 100644
--- a/emulators/hercules-images/Makefile
+++ b/emulators/hercules-images/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:17 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:49 jmmv Exp $
 
 DISTNAME=		mftr33
 PKGNAME=		hercules-images-20010222
+WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
@@ -12,7 +13,6 @@ COMMENT=		Images to IPL the Hercules emulator
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 EXTRACT_ONLY=
-WRKSRC=			${WRKDIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/data/hercules
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 3a4fc0352be..a53a458110f 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/12/23 16:17:34 cjep Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:40:49 jmmv Exp $
 
 DISTNAME=		linuxppc_lib-2000.4.6
+WRKSRC=			${WRKDIR}/${DISTNAME}
 CATEGORIES=		emulators
 MASTER_SITES+=		ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 MASTER_SITES+=		http://linuxppc.org/software/java/dl/motif/
@@ -39,7 +40,6 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-macppc NetBSD-1.5Z[A-Z]-macppc \
 
 SHLIB_HANDLING=		NO
 CHECK_SHLIBS=		NO
-WRKSRC=			${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=		linuxppc_lib
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index f0a3989e8fd..635acdba052 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/04 12:44:07 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:49 jmmv Exp $
 
 DISTNAME=	minivmac-0.1.7.src
 PKGNAME=	minivmac-0.1.7
+WRKSRC=		${WRKDIR}/minivmac
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=minivmac/}
 EXTRACT_SUFX=	.tgz
@@ -10,8 +11,6 @@ MAINTAINER=	kei@netbsd.org
 HOMEPAGE=	http://www.gryphel.com/c/minivmac/
 COMMENT=	miniature Macintosh emulator
 
-WRKSRC=		${WRKDIR}/minivmac
-
 USE_X11BASE=	YES
 
 SCRIPTS_ENV+=	CC="${CC}"
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
index 1be778ae671..6bd01540136 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/23 20:35:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:50 jmmv Exp $
 
 DISTNAME=	mmix
 PKGNAME=	mmix-20020615
+WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators devel lang
 MASTER_SITES=	http://www-cs-faculty.stanford.edu/~knuth/programs/
 
@@ -12,7 +13,6 @@ COMMENT=	Simulators for Knuth's MMIX RISC architecture
 BUILD_DEPENDS+= cweb-[0-9]*:../../devel/cweb
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}
 
 ALL_TARGET=	all doc
 
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index 468cd6c6b15..ed08a0e4d22 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/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:50 jmmv Exp $
 
 DISTNAME=	netscape-4.7-3.alpha
 PKGNAME=	osf1_lib-1.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.support.compaq.com/private/alpha-tools-software/netscape/
 EXTRACT_SUFX=	.rpm
@@ -28,8 +29,6 @@ EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}
-
 RPMARGS=	-i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES}
 
 CHECK_SHLIBS=	no
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index d4cd1fda86b..e9c1578e48d 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/03/08 03:05:39 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:50 jmmv Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
 PKGNAME=	palmosemulator-${POSE_VERSION}
 PKGREVISION=	1
+WRKSRC=         ${WRKDIR}/Emulator_Src_${POSE_VERSION}
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -22,7 +23,6 @@ SITES_emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
 
 #LICENSE=       GPL
 
-WRKSRC=         ${WRKDIR}/Emulator_Src_${POSE_VERSION}
 POSE_BUILD_DIR=	${WRKSRC}/BuildUnix
 POSE_SHARE_DIR=	${PREFIX}/share/palmosemulator
 POSE_SKINS_DIR=	${POSE_SHARE_DIR}/skins
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 2705eabe26d..81d36388eb1 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/01 15:13:52 kent Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:50 jmmv Exp $
 #
 PEACE_VERSION=	20020901
 DISTNAME=	peace-0.0.${PEACE_VERSION}
 SITES_peace-20020901.tar.gz=http://cvs.kshosen.ac.jp/src/
+WRKSRC=		${WRKDIR}/peace
 CATEGORIES=	emulators
 
 MAINTAINER=	peace-sacrifice@hauN.org
@@ -25,7 +26,6 @@ ONLY_FOR_PLATFORMS=	NetBSD-1.5ZC-i386 NetBSD-1.6*-i386
 
 BUILD_DEPENDS=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
 BUILD_DEPENDS+=	w32api>=1.5nb1:../../devel/w32api
-WRKSRC=		${WRKDIR}/peace
 CFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include \
 		-I${WRKDIR}/cross/i386-netbsdpe/include/c++
 LDFLAGS=	-L. -L${WRKSRC}/lib
diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile
index 6b89681d7a4..c9911551681 100644
--- a/emulators/plex86/Makefile
+++ b/emulators/plex86/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/02/17 18:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:40:50 jmmv Exp $
 
 DISTNAME=	plex86-20010106
 PKGNAME=	${DISTNAME:S/-/-0./}
+WRKSRC=		${WRKDIR}/plex86
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +11,6 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.plex86.org/
 COMMENT=	Extensible open source PC virtualization software (free VMware)
 
-WRKSRC=		${WRKDIR}/plex86
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-NetBSD \
 		--with-netbsd-source=${BSDSRCDIR}/sys
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 22c85b72518..7e73ba9974d 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2003/03/22 11:58:16 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:51 jmmv Exp $
 #
 
 DISTNAME=	simhv210-0b2
 PKGNAME=	simh-2.10.0b2
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -14,8 +15,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supnik's historical computer simulator
 
-WRKSRC=		${WRKDIR}
-
 EXTRACT_CMD=	unzip -aoq ${DOWNLOADED_DISTFILE}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index c34607c8ac3..8d59ff3a5e2 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/02/04 02:54:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:51 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
+WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.cs.wisc.edu/~larus/SPIM/ \
 			ftp://ftp.cs.wisc.edu/pub/spim/
@@ -12,7 +13,6 @@ MAINTAINER=		deberg@netbsd.org
 HOMEPAGE=		http://www.cs.wisc.edu/~larus/spim.html
 COMMENT=		MIPS R2000 Simulator
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
 DIST_SUBDIR=		${PKGNAME}
 
 HAS_CONFIGURE=		yes
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index a6e868fcb93..2c9ba8e8a47 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/06/06 20:26:35 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:51 jmmv Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
+WRKSRC=		${WRKDIR}/${PKGNAME}/src/build
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
 
@@ -11,7 +12,6 @@ COMMENT=	Multi-platform Atari 2600 VCS emulator
 
 USE_X11=	yes
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/src/build
 MAKEFILE=	makefile
 ALL_TARGET=	unix-x
 
diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile
index 05213d79223..baac5409e58 100644
--- a/emulators/swarm/Makefile
+++ b/emulators/swarm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/02/06 16:58:14 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:51 jmmv Exp $
 #
 
 DISTNAME=	swarm-0.57
+WRKSRC=		${WRKDIR}/swarm/src
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~michael/phd/bin/
 
@@ -9,8 +10,6 @@ MAINTAINER=	agc@netbsd.org
 HOMEPAGE=	http://www.dcs.gla.ac.uk/~michael/phd/swarm.html
 COMMENT=	Software arm6 core emulator
 
-WRKSRC=		${WRKDIR}/swarm/src
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index a6d5b094581..94ab84e119c 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/03/08 03:15:49 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:51 jmmv Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
 PKGNAME=		twin-3.1.14
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/twin
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.willows.com/pub/twin/
 
@@ -14,7 +15,6 @@ COMMENT=		cross-platform implementation of the win32 api
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
-WRKSRC=			${WRKDIR}/twin
 ALL_TARGET=		depend world
 AUTOCONF_REQD=		2.13
 CONFIGURE_ARGS=		--enable-debugger
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 4ead97d16d6..5e1aed1ca55 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/02/16 19:50:08 bad Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:40:52 jmmv Exp $
 
 DISTNAME=	vmware-netbsd-1.2
 PKGNAME=	vmware-module-1.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/NetBSD/misc/vmware/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,6 @@ CONFLICTS=	vmware-module-3*
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	# defined
 
 NO_SRC_ON_FTP=		already there
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
index 02e7a27a3ef..ac4cd2daa22 100644
--- a/emulators/vmware-module3/Makefile
+++ b/emulators/vmware-module3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/20 10:37:55 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:52 jmmv Exp $
 
 DISTNAME=	vmware-netbsd-3.2.2
 PKGNAME=	vmware-module-3.2.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/NetBSD/misc/vmware/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +15,6 @@ CONFLICTS=	vmware-module-1.*
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	# defined
 
 NO_SRC_ON_FTP=		already there
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 4df3f2c7c21..b9601178f5d 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/04/27 14:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:52 jmmv Exp $
 #
 
 DISTNAME=	x48_041
 PKGNAME=	x48-0.4.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	emulators
 MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
 
@@ -12,8 +13,6 @@ COMMENT=	HP48 emulator
 
 USE_IMAKE=	YES
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48 \
 		${PREFIX}/share/doc/x48/romdump
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 32a509e2697..c42b9308df9 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:52 jmmv Exp $
 #
 
 DISTNAME=	xbeeb-0.3.6
+WRKSRC=		${WRKDIR}/xbeeb
 CATEGORIES=	emulators x11
 MASTER_SITES=	ftp://ftp.netcom.net.uk/pub/Micros/BBC/Emulators/Xbeeb/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +12,6 @@ HOMEPAGE=	http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html
 COMMENT=	Acorn BBC Micro emulator with an X based interface
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/xbeeb
 MAN_PAGE=	${WRKDIR}/xbeeb.1
 
 XBEEBROOT=	share/xbeeb
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 585cea09622..2769a26555b 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/05/31 15:19:57 seb Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:52 jmmv Exp $
 #
 
 DISTNAME=		xm71010s
 PKGNAME=		xm7-1010s
+WRKSRC=			${WRKDIR}/vm
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/
 EXTRACT_SUFX=		.lzh
@@ -13,7 +14,6 @@ COMMENT=		X11-based FM-7 emulator
 
 BUILD_DEPENDS+=		nkf-1.7:../../converters/nkf
 
-WRKSRC=			${WRKDIR}/vm
 RESTRICTED=		source archive is not redistributable
 RESTRICTED+=		no-commercial-use
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index d54d33a9aa4..71a08b3f161 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/08/31 00:15:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:53 jmmv Exp $
 #
 
 DISTNAME=		zsnes136src
 PKGNAME=		zsnes-1.360
+WRKSRC=			${WRKDIR}/zsnes-1.36/src
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
@@ -16,8 +17,6 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 ALL_TARGET=		zsnes
 
-WRKSRC=			${WRKDIR}/zsnes-1.36/src
-
 GNU_CONFIGURE=		# defined
 USE_GMAKE=		# defined
 USE_BUILDLINK2=		# defined