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

84 files changed, 172 insertions, 168 deletions

diff --git a/games/adom/Makefile b/games/adom/Makefile
index 89fe8007363..cee812592d9 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/03 08:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=	adom-111-elf
 PKGNAME=	adom-1.1.1
-WRKSRC=		${WRKDIR}/adom
 CATEGORIES=	games
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 
@@ -13,6 +12,7 @@ COMMENT=	Ancient Domains of Mystery - yet another roguelike game
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
 
+WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 CHECK_SHLIBS=	NO
diff --git a/games/an/Makefile b/games/an/Makefile
index 76aac23b0e3..c3d574733f4 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:50 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=	an-0.93
-WRKSRC=		${WRKDIR}/an-0.93
 CATEGORIES=	games
 MASTER_SITES=	ftp://suburbia.net/pub/rmj/
 
 MAINTAINER=	jonb@NetBSD.org
 COMMENT=	Very fast anagram generator
 
+WRKSRC=		${WRKDIR}/an-0.93
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index b79d13e128b..6ebf3c3728b 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/09/17 19:40:21 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=		angband-283
 PKGNAME=		angband-tty-2.8.3
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		games
 MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/ \
 			ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Source/
@@ -15,6 +14,7 @@ COMMENT=		Tolkien based variant of Moria for tty/console displays
 
 CONFLICTS=		angband-x11-[0-9]*
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		# defined
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 MAKEFILE=		Makefile.std
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 4d83aa2f875..3644949564d 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=		asc-source-1.13.8.0
 PKGNAME=		${DISTNAME:S/-source//}
 PKGREVISION=				2
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${AUDIO_FILES}
@@ -16,6 +15,7 @@ COMMENT=		Turn based strategy game
 AUDIO_FILES=		frontiers.mp3 machine_wars.mp3 time_to_strike.mp3
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index a9ed785b8ff..fc2f4af5f24 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/battalionSource
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.evl.uic.edu/aej/
 DISTFILES=		battalionSource1.4.tar.Z battalionSUN4.tar.gz
@@ -15,6 +14,7 @@ COMMENT=		Virtual reality 3D GL game for X11
 
 NOT_FOR_PLATFORM=	*-*-alpha	# relies on Mesa (gcc)
 
+WRKSRC=			${WRKDIR}/battalionSource
 EXTRACT_ONLY=		battalionSource1.4.tar.Z
 USE_BUILDLINK2=		yes
 USE_X11=		yes
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index f3a805f56d7..943e0bc3d09 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/11/06 19:06:42 gavan Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=	battleball.21.src
 PKGNAME=	battleball-2.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/battleball-2.1-src
 CATEGORIES=	games x11
 MASTER_SITES=	http://linuxberg.prover.com.br/files/x11/entertain/
 
@@ -11,6 +10,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.cs.utexas.edu/users/pahardin/bb.html
 COMMENT=	3d game of soccer, with tanks
 
+WRKSRC=		${WRKDIR}/battleball-2.1-src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 USE_GCC_SHLIB=	YES
diff --git a/games/bridge-hands/Makefile b/games/bridge-hands/Makefile
index fb6a4c23ff4..05316b24995 100644
--- a/games/bridge-hands/Makefile
+++ b/games/bridge-hands/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:49:35 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=	hands-2.0.bsd386
 PKGNAME=	bridge-hands-2.0
-WRKSRC=		${WRKDIR}/hands/source
 CATEGORIES=	games
 MASTER_SITES=	http://www.whiteoaks.com/hands/
 
@@ -12,6 +11,7 @@ COMMENT=	Generate hands for duplicate bridge
 
 EXTRACT_ELEMENTS=	hands/source
 
+WRKSRC=			${WRKDIR}/hands/source
 USE_BUILDLINK2=		# defined
 
 do-build:
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 297627fe785..b40fc427a6b 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/12/13 10:36:03 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=	bzflag-1.10.20031209
 PKGNAME=	${DISTNAME:S/20031209/0/}
-WRKSRC=		${WRKDIR}/bzflag-1.9.10.20031209
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	blymn@baea.com.au
 HOMEPAGE=	http://www.bzflag.org/
 COMMENT=	OpenGL tank game
 
+WRKSRC=		${WRKDIR}/bzflag-1.9.10.20031209
 GNU_CONFIGURE=	yes
 USE_NCURSES=	# resize_term()
 USE_X11=	yes
diff --git a/games/cbzone/Makefile b/games/cbzone/Makefile
index 999d83a39e6..fb55b1dc77e 100644
--- a/games/cbzone/Makefile
+++ b/games/cbzone/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=		cbzone-sound
 PKGNAME=		cbzone-2.0c
-WRKSRC=			${WRKDIR}/cbzone
 CATEGORIES=		games x11
 MASTER_SITES=		ftp://ftp.cdrom.com/pub/X11/R5contrib/
 
 MAINTAINER=		root@garbled.net
 COMMENT=		Simple classic game of 3D tank warfare
 
+WRKSRC=			${WRKDIR}/cbzone
 USE_GMAKE=		yes
 USE_IMAKE=		yes
 
diff --git a/games/cgoban-java/Makefile b/games/cgoban-java/Makefile
index a88dbde6039..0cbf9888039 100644
--- a/games/cgoban-java/Makefile
+++ b/games/cgoban-java/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:39 agc Exp $
 #
 
 DISTNAME=	cgoban-unix-2.5.5
 PKGNAME=	${DISTNAME:S/unix/java/}
-WRKSRC=		${WRKDIR}/cgoban
 CATEGORIES=	games java
 MASTER_SITES=	http://kgs.kiseido.com/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +11,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://kgs.kiseido.com/en_US/download.html
 COMMENT=	Java Go server client and SGF viewer/editor
 
+WRKSRC=		${WRKDIR}/cgoban
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 USE_JAVA2=	yes
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index d48cb812e77..c3a02e07e34 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/09/19 23:08:22 dent Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=	civctp-demo-10251999
 PKGNAME=	civctp-demo-19991025
-WRKSRC=		${WRKDIR}/${WRKNAME}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.linuxgames.com/loki/demos/civctp/ \
 		ftp://download.linuxlords.com/pub/demos/civctp/ \
@@ -12,6 +11,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.lokigames.com/products/civctp/
 COMMENT=	Civilization: Call to Power - graphical strategy (linux demo)
 
+WRKSRC=			${WRKDIR}/${WRKNAME}
 NO_CONFIGURE=		yes
 
 # Someone needs to look at alpha, powerpc and sparc compat_linux
diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile
index e88dac23d2e..f70271ae2c4 100644
--- a/games/colchess-book-colchess/Makefile
+++ b/games/colchess-book-colchess/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:37 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${CHESS_ENGINE}-book-${DIST_SUBDIR}
-WRKSRC=			${WRKDIR}/ColChess
 CATEGORIES=		games
 MASTER_SITES=		http://www.ast.cam.ac.uk/~cmf/chess/
 EXTRACT_SUFX=		.tgz
@@ -15,6 +14,7 @@ DEPENDS+=		colchess>=7.0:../../games/colchess
 
 CONFLICTS+=		colchess-book-[0-9]*
 
+WRKSRC=			${WRKDIR}/ColChess
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		colchess-7.0
 NO_CONFIGURE=		# defined
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index a7b1999bb95..76e57210c2b 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:37 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		book_large
 PKGNAME=		${CHESS_ENGINE}-book-large-20000512
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		http://www.ast.cam.ac.uk/~cmf/chess/
 EXTRACT_SUFX=		.tgz
@@ -14,6 +13,7 @@ DEPENDS+=		colchess>=7.0:../../games/colchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/colchess/Makefile b/games/colchess/Makefile
index c853c6572d1..e8cef6ed6bb 100644
--- a/games/colchess/Makefile
+++ b/games/colchess/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:49:36 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:39 agc Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${DISTNAME}-7.0
-WRKSRC=			${WRKDIR}/ColChess
 CATEGORIES=		games
 MASTER_SITES=		http://www.ast.cam.ac.uk/~cmf/chess/
 EXTRACT_SUFX=		.tgz
@@ -11,6 +10,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.ast.cam.ac.uk/~cmf/chess/colchess/
 COMMENT=		Chess analysis engine
 
+WRKSRC=			${WRKDIR}/ColChess
 DIST_SUBDIR=		${PKGNAME}
 NO_CONFIGURE=		# defined
 MAKE_ENV+=		PREFIX="${PREFIX}"
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 1d74a5291a0..1af3f84487f 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/09/26 14:04:54 tron Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://set.gmd.de/pub/as/janus/craft/
 EXTRACT_SUFX=	.tar.Z
@@ -11,6 +10,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://set.gmd.de/~hua/
 COMMENT=	Warcraft-like game for X11
 
+WRKSRC=		${WRKDIR}
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
diff --git a/games/crafty-book-enormous/Makefile b/games/crafty-book-enormous/Makefile
index e304801d650..ee4a9a5821b 100644
--- a/games/crafty-book-enormous/Makefile
+++ b/games/crafty-book-enormous/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:49:38 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		enormous
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -23,6 +22,7 @@ REASON=			"Files too large"
 NO_SRC_ON_CDROM=	${REASON}
 NO_SRC_ON_FTP=		${REASON}
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/crafty-book-large/Makefile b/games/crafty-book-large/Makefile
index eb267806007..e2ef38bccb6 100644
--- a/games/crafty-book-large/Makefile
+++ b/games/crafty-book-large/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:49:40 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		large
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -22,6 +21,7 @@ REASON=			"Files too large"
 NO_SRC_ON_CDROM=	${REASON}
 NO_SRC_ON_FTP=		${REASON}
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 50ea010c765..5774faf15c4 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:49:40 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ DEPENDS+=		crafty>=17.0:../../games/crafty
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index 1912df87bce..235c7c1c311 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:49:41 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ DEPENDS+=		crafty>=17.0:../../games/crafty
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 2c03357b580..0e63d33195b 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2003/07/21 16:49:38 martti Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		crafty-18.15
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/v18/ \
 			ftp://ftp.cis.uab.edu/pub/hyatt/ \
@@ -14,6 +13,7 @@ COMMENT=		Chess engine
 
 USE_BUILDLINK2=		YES
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${DISTNAME}
 CRAFTY_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CRAFTY_STARTPGN=	start.pgn
diff --git a/games/dipmap/Makefile b/games/dipmap/Makefile
index 79ecd3e26de..66eaa1033cb 100644
--- a/games/dipmap/Makefile
+++ b/games/dipmap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/02 13:15:56 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		mapit.v1-16
 PKGNAME=		dipmap-1.16
-WRKSRC=			${WRKDIR}/mapit
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.ugcs.caltech.edu/pub/diplomacy/Sources/
 EXTRACT_SUFX=		.tar.Z
@@ -11,6 +10,7 @@ MAINTAINER=		njohnston@globaltetrahedron.com
 HOMEPAGE=		http://www.diplom.org/Online/mapsoftware.html
 COMMENT=		Generate postscript maps from results of play-by-email Diplomacy games
 
+WRKSRC=			${WRKDIR}/mapit
 MAKEFILE=		makefile
 NO_CONFIGURE=		yes
 
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index 31f65b83449..0e4e51386d4 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/09/19 05:18:37 dent Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=	eus-demo
 PKGNAME=	eus-demo-1.0
-WRKSRC=		${WRKDIR}/${WRKNAME}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.linuxgames.com/loki/demos/eus/ \
 		ftp://download.linuxlords.com/pub/demos/eus/ \
@@ -12,6 +11,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.lokigames.com/products/eus/
 COMMENT=	Eric's Ultimate Solitaire (linux demo)
 
+WRKSRC=			${WRKDIR}/${WRKNAME}
 NO_CONFIGURE=		yes
 
 # Someone needs to look at alpha, powerpc and sparc compat_linux
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index a6715268e31..fbf1c713103 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:43 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index 45c98f2ba18..748fd72ab5b 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:44 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/exchess/Makefile b/games/exchess/Makefile
index 80fd329f552..8e661570fd6 100644
--- a/games/exchess/Makefile
+++ b/games/exchess/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:49:43 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		EXCH314S
 PKGNAME=		exchess-3.14
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		http://pc.astro.brandeis.edu/BRAG/people/dch/
 EXTRACT_SUFX=		.zip
@@ -13,6 +12,7 @@ COMMENT=		Experimental chess engine
 
 NO_CONFIGURE=		# defined
 
+WRKSRC=			${WRKDIR}
 LIBDIR=			${PREFIX}/lib/exchess
 DOCDIR=			${PREFIX}/share/doc/exchess
 
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 0d46c3d949f..f3aee378069 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
 PKGNAME=		falcons-eye-1.9.3
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=falconseye/}
 EXTRACT_SUFX=		.zip
@@ -17,6 +16,7 @@ EXTRACT_CMD=		unzip -aq ${DOWNLOADED_DISTFILE}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index ad2f2c86a25..5cad65cdb79 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	finalbattle.0.0
 PKGNAME=	finalbattle-0.0
-WRKSRC=		${WRKDIR}/final
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/finalbattle/
 
@@ -11,6 +10,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/finalbattle/
 COMMENT=	Multiplayer space battle simulation for X
 
+WRKSRC=		${WRKDIR}/final
 MAKEFILE=	makefile
 
 USE_X11BASE=	yes
diff --git a/games/fortune-strfile/Makefile b/games/fortune-strfile/Makefile
index c4b0b864a6a..2b30eaa68fa 100644
--- a/games/fortune-strfile/Makefile
+++ b/games/fortune-strfile/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:49:45 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=	fortune-strfile-0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games
 DISTFILES=	# empty
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Tool to prepare a fortune database
 
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 
 # we depend on the "make" infrastructure
diff --git a/games/fortunes-de/Makefile b/games/fortunes-de/Makefile
index a1550f993d4..2524f2ebdc1 100644
--- a/games/fortunes-de/Makefile
+++ b/games/fortunes-de/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:38:22 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	fortunes-de_0.6.orig
 PKGNAME=	fortunes-de-0.6
-WRKSRC=		${WRKDIR}/fortunes-de-0.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/f/fortunes-de/}
 
@@ -14,6 +13,8 @@ COMMENT=	German data files for fortune
 BUILD_DEPENDS+=	fortune-strfile-*:../../games/fortune-strfile
 STRFILE=	${LOCALBASE}/bin/strfile
 
+WRKSRC=		${WRKDIR}/fortunes-de-0.6
+
 do-build:
 	${FIND} ${WRKSRC}/data -type f -exec ${STRFILE} {} \;
 
diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile
index 0cf0ad5090c..a19fa7bf404 100644
--- a/games/freeciv-manual/Makefile
+++ b/games/freeciv-manual/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:46 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	manual-1.8.1-2
 PKGNAME=	freeciv-manual-1.8.1.2
-WRKSRC=		${WRKDIR}/manual
 CATEGORIES=	games
 MASTER_SITES=	http://www.freeciv.org/ftp/contrib/manual/
 
@@ -11,6 +10,7 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.freeciv.org/
 COMMENT=	Manuals for freeciv (game, client, and server)
 
+WRKSRC=		${WRKDIR}/manual
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
 
diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile
index ec4d73dd3a5..da8e8b462cf 100644
--- a/games/galaxa/Makefile
+++ b/games/galaxa/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/06/08 19:19:32 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	galaxa.0.1
 PKGNAME=	galaxa-0.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/galaxa
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/galaxa/
 
@@ -12,6 +11,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.newbreedsoftware.com/galaxa/
 COMMENT=	Space game based loosely on "Galaga"
 
+WRKSRC=		${WRKDIR}/galaxa
 MAKEFILE=	makefile
 USE_X11=	yes
 
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 1b6c28b6574..f49ecbdface 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	gemdropx
 PKGNAME=	gemdropx-0.3
-WRKSRC=		${WRKDIR}/gemdropx
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/
 
@@ -11,6 +10,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/gemdropx/
 COMMENT=	Color puzzle game for X11 similar to Gem Drop
 
+WRKSRC=		${WRKDIR}/gemdropx
 MAKEFILE=	makefile
 
 USE_X11BASE=	yes
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 7df98c540b6..c83e9d0d466 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/01/18 13:58:57 cube Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	gltron-0.70-source
 PKGBASE=	${DISTNAME:S/-source$//}
 PKGNAME=	${PKGBASE}
-WRKSRC=		${WRKDIR}/${PKGBASE}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gltron/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://gltron.sourceforge.net/
 COMMENT=	3D lightcycle game inspired by the movie Tron
 
+WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/games/gnuchess-book-chess/Makefile b/games/gnuchess-book-chess/Makefile
index c8466ade4fa..cee23d4b506 100644
--- a/games/gnuchess-book-chess/Makefile
+++ b/games/gnuchess-book-chess/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:49:48 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
 DISTNAME=		chess-5.00
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}/book
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_GNU:=chess/}
 
@@ -15,6 +14,7 @@ DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
 CONFLICTS+=		gnuchess-book-[0-9]*
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/book
 CHESS_ENGINE=		gnuchess
 NO_CONFIGURE=		# defined
 
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index ff29526aba7..95ab3881d55 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:49:48 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,7 @@ DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/gnuchess-book-small/Makefile b/games/gnuchess-book-small/Makefile
index 9b6cf4d9e2e..5af94f65a9b 100644
--- a/games/gnuchess-book-small/Makefile
+++ b/games/gnuchess-book-small/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:49:49 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.cis.uab.edu/pub/hyatt/common/${DISTNAME}/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		# defined
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 710d167961b..352a74ac54b 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:38:34 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:15:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
 DISTNAME=	chess-5.00
 PKGNAME=	gnuchess-5.00
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU:=chess/}
 
@@ -17,6 +16,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/chess/chess.html
 COMMENT=	GNU chess engine
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 ALL_TARGET=	gnuchess
diff --git a/games/gnuchess4/Makefile b/games/gnuchess4/Makefile
index 553e4c92fa2..c28e21554a4 100644
--- a/games/gnuchess4/Makefile
+++ b/games/gnuchess4/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:49:49 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
 DISTNAME=		gnuchess-4.0.pl80
 PKGNAME=		gnuchess4-4.0.80
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -16,6 +15,7 @@ CONFLICTS=		gnuchess-4.*
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		yes
 
 post-install:
diff --git a/games/gtkgo/Makefile b/games/gtkgo/Makefile
index 469744cedcc..e25bd15d28a 100644
--- a/games/gtkgo/Makefile
+++ b/games/gtkgo/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:41 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	gtkgo-0_0_10
 PKGBASE=	${DISTNAME:S/_/./g}
 PKGNAME=	${PKGBASE}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${PKGBASE}
 CATEGORIES=	games gnome
 MASTER_SITES=	http://norbertdejonge.sourceforge.net/
 
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://norbertdejonge.sourceforge.net/gtkgo.html
 COMMENT=	Go board with skin support
 
+WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_X11=	YES
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 6ede249d6f7..5162d50a75c 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/09/19 05:18:36 dent Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	heretic2-demo-x86
 PKGNAME=	heretic2-demo-2.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.linuxgames.com/loki/demos/heretic2/ \
 		ftp://download.linuxlords.com/pub/demos/heretic2/ \
@@ -23,6 +22,7 @@ ONLY_FOR_PLATFORM=*-*-i386
 DISTBINNAME=	heretic2_demo.x86
 BINNAME=	heretic2-demo
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index a41e1962e4d..85c0f71bdab 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/11/08 08:29:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=	icbm3d.0.4
 PKGNAME=	${DISTNAME:S/./-/}
-WRKSRC=		${WRKDIR}/icbm3d
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/
 
@@ -11,6 +10,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/icbm3d/
 COMMENT=	3D X11 game of defense
 
+WRKSRC=		${WRKDIR}/icbm3d
 MAKEFILE=	makefile
 USE_X11=	yes
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 51162bd87bb..5aede5ca138 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/04/10 20:10:17 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:15:40 agc Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
-WRKSRC=			${WRKDIR}/imaze
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 DISTFILES=		imaze-sounds.tar imaze1.3.tar.Z
@@ -13,6 +12,7 @@ COMMENT=		Multiplayer, networked, action,x 3D maze game
 
 EXTRACT_ONLY=		imaze1.3.tar.Z
 
+WRKSRC=			${WRKDIR}/imaze
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 
diff --git a/games/iso-pernangband/Makefile b/games/iso-pernangband/Makefile
index 75f4cb37448..41543ab63c4 100644
--- a/games/iso-pernangband/Makefile
+++ b/games/iso-pernangband/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:40 agc Exp $
 #
 
 DISTNAME=		iso-pern_src-0_2_6
 PKGNAME=		iso-pernangband-0.2.6
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/iso-pern_src/src
 CATEGORIES=		games
 MASTER_SITES=		http://www.simugraph.com/simutrans/data/
 
@@ -12,6 +11,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.isoband.cjb.net/
 COMMENT=		Isometric (pseudo 3D) view for Angband
 
+WRKSRC=			${WRKDIR}/iso-pern_src/src
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index 6c70de73c88..fa6ae7d31e8 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:49:52 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		new_brain
 PKGNAME=		knightcap-brain-19980616
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://samba.anu.edu.au/pub/KnightCap/
 EXTRACT_SUFX=		.dat
@@ -13,6 +12,7 @@ COMMENT=		Book of losing moves for KnightCap
 
 ONLY_FOR_PLATFORMS=	*-*-i386
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME}
 
 EXTRACT_ONLY=		# empty
diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile
index 90dbfbe0e30..d2e7f0bb802 100644
--- a/games/knightcap/Makefile
+++ b/games/knightcap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:49:52 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		KnightCap-3.6
 PKGNAME=		knightcap-3.6
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/Export
 CATEGORIES=		games
 MASTER_SITES=		ftp://samba.anu.edu.au/pub/KnightCap/
 
@@ -13,6 +12,7 @@ COMMENT=		Chess engine with 3D OpenGL-rendered chessboard
 
 ALL_TARGET=		KnightCap
 
+WRKSRC=			${WRKDIR}/Export
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index 286a53e6452..83cf4bdaec6 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:38:57 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	kulki-1.01
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/kulki
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.put.poznan.pl/adanilecki/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.cs.put.poznan.pl/adanilecki/
 COMMENT=	Simple logic game - "balls"
 
+WRKSRC=			${WRKDIR}/kulki
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/games/level9/Makefile b/games/level9/Makefile
index 5a560cd73ea..716afbeecf1 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/10/21 11:10:46 dillo Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		Level9_3.0_Source
 PKGNAME=		level9-3.0
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/Unix
 CATEGORIES=		games
 MASTER_SITES=		http://www.ifarchive.org/if-archive/level9/interpreters/level9/
 EXTRACT_SUFX=		.zip
@@ -13,6 +12,7 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://www.ifarchive.org/if-archive/level9/interpreters/level9/
 COMMENT=		Curses port of the Level 9 text adventure interpreter
 
+WRKSRC=			${WRKDIR}/Unix
 USE_BUILDLINK2=		yes
 # uses halfkey (present since 1.6M)
 INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6-* NetBSD-1.6.*
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index b041d137aeb..c37b1e2bab8 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/06/07 14:47:18 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
-WRKSRC=			${WRKDIR}/Maelstrom
 CATEGORIES=		games x11
 MASTER_SITES+=		ftp://ftp.devolution.com/pub/maelstrom/
 MASTER_SITES+=		ftp://ftp.devolution.com/pub/maelstrom/Maelstrom-binaries/
@@ -21,6 +20,7 @@ CONFLICTS=		maelstrom-[0-9]* maelstrom-sdl-[0-9]*
 
 EXTRACT_ONLY=		${DISTNAME}
 
+WRKSRC=			${WRKDIR}/Maelstrom
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${BUILDLINK_PREFIX.xpm}
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index b1b2a953ed0..fd25e33ecfa 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/21 16:49:55 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	majesty_demo
 PKGNAME=	majesty-demo-20030310
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games
 MASTER_SITES=	http://demos.linuxgamepublishing.com/majesty/
 EXTRACT_SUFX=	.run
@@ -17,6 +16,8 @@ EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 
 ONLY_FOR_PLATFORM=*-*-i386
 
+WRKSRC=		${WRKDIR}
+
 .if (${MACHINE_ARCH} == "i386")
 DEPENDS+=       suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
diff --git a/games/moria/Makefile b/games/moria/Makefile
index 6c1f851e0ad..741579ec07b 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:39:03 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		um5.5.2
 PKGNAME=		moria-5.5.2
-WRKSRC=			${WRKDIR}/umoria
 CATEGORIES=		games
 # The "offical" master site has lost the pub/Games directory.
 #MASTER_SITES=		ftp://ftp.cis.ksu.edu/pub/Games/Moria/source/
@@ -13,6 +12,8 @@ MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://www-math.bgsu.edu/~grabine/moria.html
 COMMENT=		Rogue-like game with a different sense of scale than Rogue
 
+WRKSRC=			${WRKDIR}/umoria
+
 do-configure:
 	@${RM} -f ${WRKSRC}/*.[ch] ${WRKSRC}/Makefile
 	@cd ${WRKSRC}; ${LN} -s source/* unix/* .
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index ce94aea6634..fd4293b0ad6 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2003/10/14 13:42:18 pooka Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/01/20 12:15:41 agc Exp $
 #
 
 NETHACK_BASEVER=	3.4.2
@@ -7,7 +7,6 @@ NETHACK_DISTVER=	342
 NETHACK_DIR=		nethackdir340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}
-WRKSRC=			${WRKDIR}/nethack-${NETHACK_BASEVER}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/nethack/
 EXTRACT_SUFX=		.tgz
@@ -15,6 +14,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		pooka@NetBSD.org
 HOMEPAGE=		http://www.nethack.org/
 
+WRKSRC=			${WRKDIR}/nethack-${NETHACK_BASEVER}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 
diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index a659aa17e2f..f9310d621a4 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:49:58 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
-WRKSRC=			${WRKDIR}/netmaj
 CATEGORIES=		games
 MASTER_SITES=		http://www.sfc.wide.ad.jp/~kusune/netmaj/files/
 
@@ -10,6 +9,7 @@ MAINTAINER=		kei@NetBSD.org
 HOMEPAGE=		http://www.sfc.wide.ad.jp/~kusune/netmaj/
 COMMENT=		Mahjongg game with network and 1-4 player(s) support
 
+WRKSRC=			${WRKDIR}/netmaj
 USE_BUILDLINK2=		# defined
 
 INSTALL_TARGET=		install install-pf
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 73668efcfef..fa4a7edf8a9 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2003/12/19 07:14:03 jdc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		netmaze0.81
 PKGNAME=		netmaze-0.81
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/netmaze
 CATEGORIES=		games
 MASTER_SITES=  		${MASTER_SITE_XCONTRIB:=games/multiplayer/}
 
 MAINTAINER=		jdc@NetBSD.org
 COMMENT=		X windows-based multiplayer combat game (like Midi Maze)
 
+WRKSRC=			${WRKDIR}/netmaze
 USE_IMAKE=		yes
 
 post-patch:
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index e5152def680..8d5c209161c 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:39:10 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		nighthawk-2.1
-WRKSRC=			${WRKDIR}/nighthawk
 CATEGORIES=		x11 games
 MASTER_SITES=		http://jsno.downunder.net.au/proj_linux/nighthawk.html
 EXTRACT_SUFX=		.tgz
@@ -15,6 +14,7 @@ MAINTAINER=		hubertf@NetBSD.org
 HOMEPAGE=		http://jsno.arafuraconnect.com.au/proj_linux/nighthawk.html
 COMMENT=		C=64 Paradroid clone
 
+WRKSRC=			${WRKDIR}/nighthawk
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 5a591370cb1..78000003009 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/12/31 17:38:23 ben Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	omega-0.90.4-src
 PKGNAME=	omega-0.90.4
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/omega
 CATEGORIES=	games
 MASTER_SITES=	http://www.alcyone.com/binaries/omega/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.alcyone.com/max/projects/omega/
 COMMENT=	Complex rogue-like game of exploration with a sense of humor
 
+WRKSRC=			${WRKDIR}/omega
 USE_BUILDLINK2=		# defined
 ALL_TARGET=		# empty
 
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 4676fd1042c..486b3ce3ae3 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/ \
 		ftp://ftp.idsoftware.com/idstuff/source/
@@ -17,6 +16,7 @@ DEPENDS+=	quakedata-[0-9]*:../../games/quakedata
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	MAINDIR=${WRKSRC}
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 585b2384c02..172e33f4129 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/01/04 18:53:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	1
 PKGNAME=	quake3arena-demo-1.11.6
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
 		ftp://mirrors.xmission.com/idsoftware/quake3/linux/
@@ -35,6 +34,7 @@ ONLY_FOR_PLATFORM=*-*-i386
 DISTBINNAME=	q3demo
 BINNAME=	quake3arena-demo
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 253c6729806..c33d1f55b26 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/01/04 18:53:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	1
 PKGNAME=	quake3arena-1.32b
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
 		ftp://mirrors.xmission.com/idsoftware/quake3/linux/
@@ -39,6 +38,7 @@ ONLY_FOR_PLATFORM=*-*-i386
 DISTBINNAME=	quake3.x86
 BINNAME=	quake3arena
 
+WRKSRC=		${WRKDIR}
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
 
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index aa29baa28b4..49535eda137 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/quakeforge
 CATEGORIES=	games
 MASTER_SITES=	http://www.viagenie.qc.ca/quake/
 
@@ -13,6 +12,7 @@ COMMENT=	Quake over IPv6
 
 DEPENDS=	quakedata-[0-9]*:../../games/quakedata
 
+WRKSRC=		${WRKDIR}/quakeforge
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index 45dcfa4d8de..10703649c8a 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	quake106
 PKGNAME=	quakedata-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake/ \
 		ftp://ftp.idsoftware.com/idstuff/quake/
@@ -19,6 +18,7 @@ RESTRICTED=		"This software is shareware"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	unzip -q -o ${DOWNLOADED_DISTFILE} -d ${WRKDIR} resource.*
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
diff --git a/games/svb/Makefile b/games/svb/Makefile
index f55fe5cd639..45acf29139d 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		svb
 PKGNAME=		svb-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games x11
 MASTER_SITES=		http://src.doc.ic.ac.uk/public/computing/graphics/systems/X11/R5contrib/
 EXTRACT_SUFX=		.shar.Z
@@ -10,6 +9,7 @@ EXTRACT_SUFX=		.shar.Z
 MAINTAINER=		root@garbled.net
 COMMENT=		Spy Vs. Bob, the timeless classic
 
+WRKSRC=			${WRKDIR}
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/games/tads/Makefile b/games/tads/Makefile
index ad3c7469867..f670f7a5a7a 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	tads23-unix
 PKGNAME=	tads-3.0.5
-WRKSRC=		${WRKDIR}/tads
 CATEGORIES=	games
 MASTER_SITES=	http://www.ifarchive.org/if-archive/programming/tads2/source/
 
@@ -14,6 +13,7 @@ COMMENT=	TADS compiler and interpreter
 # for other OSs, enable appropriate Makefile sections
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
+WRKSRC=		${WRKDIR}/tads
 USE_BUILDLINK2=	yes
 NO_CONFIGURE=	yes
 BUILD_DIRS=	${WRKSRC}/tads2 ${WRKSRC}/tads3
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 78789791381..75a04acb5bf 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/07/26 21:41:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	tworld-1.0
 PKGNAME=	${DISTNAME:S/^t/tile/}
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/tworld-1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.muppetlabs.com/~breadbox/software/tworld/
 COMMENT=	"Game based on Chip's Challenge"
 
+WRKSRC=		${WRKDIR}/tworld-1.0
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11=	YES
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 7e2bf463d6c..cdfff84ea31 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:41 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	tuxmath-2001.09.07-0102
 PKGNAME=	tuxmath-20010907
 PKGREVISION=			3
-WRKSRC=		${WRKDIR}/tuxmath
 CATEGORIES=	games math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxmath/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.newbreedsoftware.com/tuxmath/
 COMMENT=	Educational math arcade game
 
+WRKSRC=		${WRKDIR}/tuxmath
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 NO_CONFIGURE=	# defined
diff --git a/games/ularn/Makefile b/games/ularn/Makefile
index 5f5e8a2667c..1de940b092d 100644
--- a/games/ularn/Makefile
+++ b/games/ularn/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		ularn
 PKGNAME=		ularn-6.12.92
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		http://www.cordier.com/ularn/
 
@@ -11,6 +10,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.cordier.com/ularn/
 COMMENT=		Fantasy roguelike game based on vintage larn
 
+WRKSRC=			${WRKDIR}
 HAS_CONFIGURE=          # defined
 CONFIGURE_ENV+=         PREFIX=${LOCALBASE}
 CONFIGURE_SCRIPT=       ./Configure
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 652181d2d60..8744a0a9a57 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		Wormz-1.0b5
 PKGNAME=		wormz-1.0b5
-WRKSRC=			${WRKDIR}/Wormz
 CATEGORIES=		games x11
 MASTER_SITES=		http://lide.punknet.cz/miri/
 
@@ -11,6 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://lide.punknet.cz/miri/wormz.html
 COMMENT=		Networked game for X11
 
+WRKSRC=			${WRKDIR}/Wormz
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_GMAKE=		yes
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index a208cffd942..38e44256653 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:39:28 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:41 agc Exp $
 # FreeBSD Id: ports/games/xbat/Makefile,v 1.5 1999/08/25 06:04:41 obrien Exp
 
 DISTNAME=	xev111
 PKGNAME=	xbat-1.11
-WRKSRC=		${WRKDIR}/Xev111
 CATEGORIES=	games
 MASTER_SITES=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 
@@ -17,6 +16,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/Xev111
 USE_IMAKE=	yes
 ALL_TARGET=	xbat
 
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 78cf0fe1467..5873239b23b 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/03/29 12:41:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		xblast-2.6.beta-sound
 PKGNAME=		xblast-2.6b
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/XBlast-2.6.beta
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.ikp.uni-koeln.de/~vogel/archive/
 
@@ -14,6 +13,7 @@ COMMENT=		2-6 player kill the other guy with bombs game. A real blast!
 
 DEPENDS+=		tk>=8.3.2:../../x11/tk
 
+WRKSRC=			${WRKDIR}/XBlast-2.6.beta
 USE_IMAKE=		yes
 
 post-patch:
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 02197a5dd6b..b922c1e6885 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=		xboing2.4
 PKGNAME=		xboing-2.4
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/xboing
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 
@@ -12,6 +11,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.techrescue.org/xboing/
 COMMENT=		Breakout style game for X11
 
+WRKSRC=			${WRKDIR}/xboing
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index 657e95d82d0..f446cf5542f 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/11/18 14:43:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:41 agc Exp $
 #
 
 DISTNAME=	xbomber.0.8
 PKGNAME=	xbomber-0.8
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xbomber
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/xbomber/
 
@@ -12,6 +11,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.newbreedsoftware.com/xbomber/
 COMMENT=	Colorful game where you blow other people/robots up
 
+WRKSRC=		${WRKDIR}/xbomber
 MAKEFILE=	makefile
 USE_X11=	yes
 
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 4137f3c5758..6419d3f872d 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/08/19 15:02:50 mycroft Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/
 MASTER_SITES+=	ftp://ftp.idsoftware.com/idstuff/doom/
@@ -17,6 +16,7 @@ BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 
 LICENSE=	shareware
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	doomsrc.zip
 EXTRACT_CMD=	unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
 USE_X11BASE=	yes
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 66dce61e520..674ab82d6b4 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:50:02 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
 
 DISTNAME=		xevil1.5.1e
 PKGNAME=		xevil-1.5.1e
-WRKSRC=			${WRKDIR}
 CATEGORIES=		games x11
 MASTER_SITES=		ftp://ftp.xevil.com/xevil1.5.1e/
 EXTRACT_SUFX=		.tar.Z
@@ -15,6 +14,7 @@ MAKE_ENV=		HOSTTYPE="netbsd" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			INSTALL_MAN="${INSTALL_MAN}"
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 77cca3171e9..aa827361369 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:42 agc Exp $
 
 DISTNAME=	xfreecell-1.0.5b
-WRKSRC=		${WRKDIR}/xfreecell
 CATEGORIES=	games
 MASTER_SITES=   http://www2.giganet.net/~nakayama/
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 
+WRKSRC=		${WRKDIR}/xfreecell
 NO_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index a77a8083e63..3322014cd15 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/09/30 08:26:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xfrisk-1.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/XFrisk
 CATEGORIES=	games
 MASTER_SITES=	http://morphy.iki.fi/xfrisk/files/
 
@@ -11,6 +10,7 @@ MAINTAINER=	sketch@rd.bbc.co.uk
 HOMEPAGE=	http://morphy.iki.fi/xfrisk/
 COMMENT=	X11 version of the classic Risk board game
 
+WRKSRC=		${WRKDIR}/XFrisk
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index bac9c3602c2..455cd77965e 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/11/18 14:20:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=		incoming		# yes, really!
 PKGNAME=		xgalaga-2.0.34
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/${PKGNAME:C,nb${PKGREVISION},,}
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xgalaga/}
 EXTRACT_SUFX=		# empty
@@ -13,6 +12,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://sourceforge.net/projects/xgalaga/
 COMMENT=		Very fast true-to-the-original port of galaga for X11
 
+WRKSRC=			${WRKDIR}/${PKGNAME:C,nb${PKGREVISION},,}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 624313a5e87..808a4401712 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/11/18 14:34:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=		xnibbles-1.0BETA4
 PKGNAME=		xnibbles-1.0b4
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/xnibbles
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.tjhsst.edu/xnibbles/
 
@@ -12,6 +11,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.tjhsst.edu/xnibbles/
 COMMENT=		Winding snakes game for X11
 
+WRKSRC=			${WRKDIR}/xnibbles
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 967b78ca51d..ea70516293b 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:50:03 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xpipeman-1.5
-WRKSRC=		${WRKDIR}/xpipeman
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.spinne.com/x/games/xpipeman/
 
@@ -10,6 +9,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.spinne.com/x/games/xpipeman/
 COMMENT=	Connect the pipes to contain the water flow game for X11
 
+WRKSRC=		${WRKDIR}/xpipeman
 USE_IMAKE=	yes
 
 do-install:
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index 4f1fe2ef79d..91c0589139a 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:39:43 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xroads-v0.5
 PKGNAME=	xroads-0.5
-WRKSRC=		${WRKDIR}/xroads-v0.5
 CATEGORIES=	games
 MASTER_SITES=	http://www.autobahn.mb.ca/~foxtrot/
 
@@ -11,6 +10,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://apps.freshmeat.net/homepage/898367442/
 COMMENT=	Overhead view maze-based shoot 'em up game
 
+WRKSRC=		${WRKDIR}/xroads-v0.5
 USE_X11=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 71b91077831..e5d0eac25a9 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/09/03 17:42:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.xdr.com/dash/scavenger.html
 COMMENT=	Loderunner clone with sound for X11
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 6f4c29e0a54..ccf61a14aad 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:39:46 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xscrabble
 PKGNAME=	xscrabble-1.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xscrabble
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.belgarath.demon.co.uk/programs/
 
@@ -12,6 +11,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.belgarath.demon.co.uk/programs/
 COMMENT=	X version of the popular board game, for 1 to 4 players
 
+WRKSRC=		${WRKDIR}/xscrabble
 DIST_SUBDIR=	${PKGNAME}
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 2ee3be6fc32..ba6607f1113 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/11/02 21:41:03 salo Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:42 agc Exp $
 #
 
 DISTNAME=	xtris-1.15
-WRKSRC=		${WRKDIR}/xtris
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.iagora.com/~espel/xtris/xtris.html
 
@@ -10,6 +9,7 @@ MAINTAINER=	opp@MuFFiN.Org
 HOMEPAGE=	http://www.iagora.com/~espel/xtris/
 COMMENT=	Multi-player version of a popular game for the X Window system
 
+WRKSRC=		${WRKDIR}/xtris
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 4e306da3dfc..26b7e040528 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:39:48 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:42 agc Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
-WRKSRC=		${WRKDIR}/xtux
 CATEGORIES=	games
 MASTER_SITES=	http://www.adelaide.net.au/~philaw/ \
 		${MASTER_SITE_SOURCEFORGE:=xtux/}
@@ -11,6 +10,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://xtux.sourceforge.net/
 COMMENT=	2D multi-player shootout using images from the Open Software scene
 
+WRKSRC=		${WRKDIR}/xtux
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11=	YES
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index ccd2320e970..379ea07dde5 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:42 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/08/05 09:31:04 asami Exp
 #
 
 DISTNAME=	xworm102
 PKGNAME=	xworm-1.02
-WRKSRC=		${WRKDIR}/XWorm
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.ekran.no/archive/x/
 
 MAINTAINER=	root@garbled.net
 COMMENT=	Classic game with apples and hungry worm
 
+WRKSRC=		${WRKDIR}/XWorm
 ALL_TARGET=	bsd
 USE_X11=	yes
 
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 09f7084558f..6c97768e996 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:42 agc Exp $
 
 DISTNAME=		xzip180
 PKGNAME=		xzip-1.8
-WRKSRC=			${WRKDIR}/xzip
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.eblong.com/zarf/ftp/
 EXTRACT_SUFX=		.tar.Z
@@ -11,6 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.eblong.com/zarf/xzip.html
 COMMENT=		Z-code interpreter for X11 (Infocom game format)
 
+WRKSRC=			${WRKDIR}/xzip
 USE_X11BASE=		yes
 ALL_TARGET=		xzip