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

30 files changed, 61 insertions, 60 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index ab3138d6888..9044f50db51 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/06/14 06:50:52 tron Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:40 agc Exp $
 
 DISTNAME=	BasiliskII_src_14032003
 PKGNAME=	BasiliskII-1.0.20030314
-WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 CATEGORIES=	emulators
 MASTER_SITES=	http://gwenole.beauchesne.online.fr/basilisk2/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://gwenole.beauchesne.online.fr/basilisk2/
 COMMENT=	Open Source 68k Macintosh emulator
 
+WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 822884f2429..1ebca93ecf9 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:35:18 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:40 agc 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
@@ -15,6 +14,7 @@ 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/arnold/Makefile b/emulators/arnold/Makefile
index d15a52f53f4..f38e25efe84 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/11/22 23:55:15 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=		arnsrc27012002
 PKGNAME=		arnold-20020127
-WRKSRC=			${WRKDIR}/arnold/src
 CATEGORIES=		emulators
 MASTER_SITES=		http://arnold.emuunlim.com/download/
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,7 @@ COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
 # we want case sensitive file names.
 EXTRACT_CMD_OPTS.zip=	-aqo
 
+WRKSRC=			${WRKDIR}/arnold/src
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 ALL_TARGET=		arnold
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 695c1b4aedb..385e3ffad09 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/01/08 15:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=	atari800-1.3.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
@@ -17,6 +16,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index 466a5a59ddd..405524264f4 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2003/08/02 19:52:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:14:40 agc Exp $
 
 DISTNAME=	dn9b0401
-WRKSRC=		${WRKDIR}/darcnes
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +9,7 @@ HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/darcnes
 USE_GMAKE=	yes
 USE_BUILDLINK2=	yes
 PATCHDIR=	${.CURDIR}/../../emulators/darcnes/patches
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index 39dd7896689..b5183eb710a 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:35:27 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:40 agc 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/
 
@@ -13,6 +12,7 @@ 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 c6d1835a371..4c7c98c123b 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:35:28 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:14:40 agc 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
@@ -17,6 +16,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+WRKSRC= 	${WRKDIR}/MSX
 USE_X11=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 0cca6488a21..40395ad40e0 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.flame.org/NetBSD/
 
@@ -12,6 +11,7 @@ COMMENT=		Libraries necessary for FreeBSD compatibility, including XFree86
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 
 do-install:
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 9271eee926d..db69d2d5303 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/01/01 03:18:15 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	hatari-0.45
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 USE_GMAKE=	YES
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
index e1b224d9dfc..324839ac380 100644
--- a/emulators/hercules-images/Makefile
+++ b/emulators/hercules-images/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		mftr33
 PKGNAME=		hercules-images-20010222
-WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.conmicro.cx/hercules/
 COMMENT=		Images to IPL the Hercules emulator
 
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 EXTRACT_ONLY=
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 6dda02163ab..e76703ee9d6 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:14:41 agc 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/
@@ -38,6 +37,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-macppc NetBSD-1.5Z[A-Z]-macppc \
 			NetBSD-1.5[U-Z]-sandpoint NetBSD-1.5Z[A-Z]-sandpoint \
 			NetBSD-1.[6-9]*-sandpoint
 
+WRKSRC=			${WRKDIR}/${DISTNAME}
 SHLIB_HANDLING=		NO
 CHECK_SHLIBS=		NO
 DIST_SUBDIR=		linuxppc_lib
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index 438110daf78..21a5abc8666 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:45:56 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc 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
@@ -11,6 +10,7 @@ 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 3117e0578f6..29bcfe6083f 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/07/30 19:20:33 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	mmix-20030622
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators devel lang
 MASTER_SITES=	http://www-cs-faculty.stanford.edu/~knuth/programs/
 
@@ -11,6 +10,7 @@ COMMENT=	Simulators for Knuth's MMIX RISC architecture
 
 BUILD_DEPENDS+= cweb-[0-9]*:../../devel/cweb
 
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	all doc
 
 do-install:
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index ed08a0e4d22..56a66101779 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:14:41 agc 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
@@ -22,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}
 EMULSUBDIR=		emul/osf1
 EMULDIR=		${PREFIX}/${EMULSUBDIR}
 
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 6a854c35bf3..483aebe20c5 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:35:41 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
 PKGNAME=	palmosemulator-${POSE_VERSION}
 PKGREVISION=	2
-WRKSRC=         ${WRKDIR}/Emulator_Src_${POSE_VERSION}
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -23,6 +22,7 @@ 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 049e671969a..b0e91941bac 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/25 09:19:28 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 PEACE_VERSION=	20030919
 DISTNAME=	peace-0.0.${PEACE_VERSION}
 SITES_peace-20030919.tar.gz=http://cvs.kshosen.ac.jp/PEACE/src/
-WRKSRC=		${WRKDIR}/peace
 CATEGORIES=	emulators
 
 MAINTAINER=	peace-sacrifice@hauN.org
@@ -21,6 +20,8 @@ DEPENDS+=	icu>=2.4nb1:../../textproc/icu
 BUILD_DEPENDS=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
 BUILD_DEPENDS+=	w32api>=2.4:../../devel/w32api
 BUILD_DEPENDS+= x11-links-*:../../pkgtools/x11-links
+
+WRKSRC=		${WRKDIR}/peace
 CPPFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include \
 		-I${WRKDIR}/cross/i386-netbsdpe/include/c++
 LDFLAGS=	-L${WRKSRC}/lib
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 9f6fb181385..f5aa7e475b3 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/09/26 21:36:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	simhv30-2
 PKGNAME=	simh-3.0.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -14,6 +13,7 @@ HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supnik's historical computer simulator
 
 EXTRACT_CMD=	unzip -aoq ${DOWNLOADED_DISTFILE}
+WRKSRC=		${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6d76dfbbb2b..489c560d09b 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/05/05 16:24:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/release
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.snes9x.com/zips/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
+WRKSRC=			${WRKDIR}/release
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index e9049c0a88e..74e342d97ec 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:35:45 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.cs.wisc.edu/~larus/SPIM/ \
 			ftp://ftp.cs.wisc.edu/pub/spim/
@@ -15,6 +14,7 @@ COMMENT=		MIPS R2000 Simulator
 
 DIST_SUBDIR=		${PKGNAME}
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 7ff1569da2c..dd4f1b56a53 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:18 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src/build
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://stella.atari.org/
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src/build
 USE_X11=	yes
 
 MAKEFILE=	makefile
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 592359ead64..e2529e98c4f 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/30 06:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:14:41 agc 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/
 
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.willows.com/
 COMMENT=		Cross-platform implementation of the win32 api
 
+WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 235c61baa66..8beb019e619 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:34:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		VisualBoyAdvance-src-1.6a
 PKGNAME=		vba-1.6.0.1
-WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vba/}
 EXTRACT_SUFX=		.zip
@@ -11,6 +10,7 @@ MAINTAINER=		snj@pobox.com
 HOMEPAGE=		http://vboy.emuhq.com/
 COMMENT=		Gameboy advance emulator
 
+WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
 USE_GMAKE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 7d0a6240c7a..2be9708f6b1 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:36:22 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:41 agc 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
@@ -15,6 +14,7 @@ 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/Makefile b/emulators/vmware/Makefile
index ffb2f1fac87..9f9315fcf58 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/09/18 16:25:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	VMware-2.0.4-1142
 PKGNAME=	vmware-2.0.4
-WRKSRC=		${WRKDIR}/vmware-distrib
 CATEGORIES=	emulators
 MASTER_SITES=   http://www4.vmware.com/software/ \
 		http://www.vmware.com/download1/software/ \
@@ -24,6 +23,7 @@ DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
+WRKSRC=		${WRKDIR}/vmware-distrib
 CHECK_SHLIBS=	NO
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index fdb30a38ff8..2e8c77a4d51 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/10/05 07:12:21 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
-WRKSRC=		${WRKDIR}/vmware-distrib
 CATEGORIES=	emulators
 MASTER_SITES=	http://download3.vmware.com/software/wkst/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -21,6 +20,7 @@ DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
+WRKSRC=		${WRKDIR}/vmware-distrib
 CHECK_SHLIBS=	NO
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0d6c67647e5..01a70ad8ed0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2004/01/17 15:22:22 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	Wine-20031212
 PKGNAME=	${DISTNAME:S/W/w/}
 PKGREVISION=	 	1
-WRKSRC= 	${WRKDIR}/${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ibiblio.org/Linux/ALPHA/wine/development/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/} \
@@ -25,6 +24,7 @@ ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386
 
 BUILDLINK_DEPENDS.freetype2=	freetype>=2.1.4
 
+WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 97ca68a43c6..13c53dfdd52 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:36:27 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	x48_041
 PKGNAME=	x48-0.4.1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	emulators
 MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://home.earthlink.net/~rmmlgetz/
 COMMENT=	HP48 emulator
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_IMAKE=	YES
 
 post-install:
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 17fc3c2cee3..ec523fa29fa 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/11/23 07:16:39 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:41 agc 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,6 +10,7 @@ MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html
 COMMENT=	Acorn BBC Micro emulator with an X based interface
 
+WRKSRC=		${WRKDIR}/xbeeb
 USE_IMAKE=	yes
 MAN_PAGE=	${WRKDIR}/xbeeb.1
 
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 2769a26555b..b45816d9794 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=		xm71010s
 PKGNAME=		xm7-1010s
-WRKSRC=			${WRKDIR}/vm
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/
 EXTRACT_SUFX=		.lzh
@@ -22,6 +21,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 # convert CRLF to LF
 EXTRACT_CMD=		lha xqt ${DOWNLOADED_DISTFILE}
 
+WRKSRC=			${WRKDIR}/vm
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile.x11
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 662b37901b4..951e8a661e7 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/26 21:41:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=		zsnes136src
 PKGNAME=		zsnes-1.360
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/zsnes-1.36/src
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
@@ -18,6 +17,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 ALL_TARGET=		zsnes
 
+WRKSRC=			${WRKDIR}/zsnes-1.36/src
 GNU_CONFIGURE=		# defined
 USE_GMAKE=		# defined
 USE_BUILDLINK2=		# defined