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

65 files changed, 129 insertions, 145 deletions

diff --git a/games/adom/Makefile b/games/adom/Makefile
index c0a64489ef8..0e6403f5ccb 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:59 jmmv Exp $
 #
 
 DISTNAME=	adom-100-elf
 PKGNAME=	adom-1.00
+WRKSRC=		${WRKDIR}/adom
 CATEGORIES=	games
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 
@@ -12,7 +13,6 @@ 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 d003c338afd..c3370c430ee 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/06 01:29:20 jonb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:59 jmmv 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 2ee8a229557..0c55f1519b6 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/01/26 10:30:50 agc Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:00 jmmv 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/
@@ -16,7 +17,6 @@ CONFLICTS=		angband-x11-[0-9]*
 
 USE_BUILDLINK2=		# defined
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 MAKEFILE=		Makefile.std
 ALL_TARGET=		angband
 
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 23ea5eda23d..02af3c02e31 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/03/09 19:46:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:00 jmmv 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/
 
@@ -12,7 +13,6 @@ COMMENT=	3d game of soccer, with tanks
 
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-WRKSRC=		${WRKDIR}/battleball-2.1-src
 
 SED_CMDS=	-e '/^INCS/s|$$|${CPPFLAGS}|' -e '/^LIBS/s|$$|${LDFLAGS}|'
 
diff --git a/games/bridge-hands/Makefile b/games/bridge-hands/Makefile
index a0e64a95bef..25d21838aa2 100644
--- a/games/bridge-hands/Makefile
+++ b/games/bridge-hands/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/11/15 00:17:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:00 jmmv Exp $
 
 DISTNAME=	hands-2.0.bsd386
 PKGNAME=	bridge-hands-2.0
+WRKSRC=		${WRKDIR}/hands/source
 CATEGORIES=	games
 MASTER_SITES=	http://www.whiteoaks.com/hands/
 
@@ -10,7 +11,6 @@ HOMEPAGE=	http://www.whiteoaks.com/hands/
 COMMENT=	generate hands for duplicate bridge
 
 EXTRACT_ELEMENTS=	hands/source
-WRKSRC=			${WRKDIR}/hands/source
 
 USE_BUILDLINK2=		# defined
 
diff --git a/games/cbzone/Makefile b/games/cbzone/Makefile
index 9493c062a5c..999d83a39e6 100644
--- a/games/cbzone/Makefile
+++ b/games/cbzone/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:00 jmmv 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/civctp-demo/Makefile b/games/civctp-demo/Makefile
index 9876e023170..30184996f7a 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:00 jmmv 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/ \
@@ -35,7 +36,6 @@ BINNAME=	civctp-demo
 DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
-WRKSRC=		${WRKDIR}/${WRKNAME}
 
 do-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index f7043ea3b51..b5e166a27e0 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:01 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 8109e7948ec..c4d48b610e9 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:35 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:01 jmmv 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
@@ -12,7 +13,6 @@ COMMENT=	Warcraft-like game for X11
 
 USE_GMAKE=	yes
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}
 
 post-extract:
 	@${FIND} ${WRKSRC} -type f -name '*~' | ${XARGS} ${RM} -f
diff --git a/games/crafty-book-enormous/Makefile b/games/crafty-book-enormous/Makefile
index 5eb38776cbd..c6732191b65 100644
--- a/games/crafty-book-enormous/Makefile
+++ b/games/crafty-book-enormous/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:04 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:01 jmmv 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
@@ -24,7 +25,6 @@ NO_SRC_ON_FTP=		${REASON}
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-large/Makefile b/games/crafty-book-large/Makefile
index e9184ba2f4c..0651f4fed77 100644
--- a/games/crafty-book-large/Makefile
+++ b/games/crafty-book-large/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:01 jmmv 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
@@ -23,7 +24,6 @@ NO_SRC_ON_FTP=		${REASON}
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index cf8715b3ba1..1bded5796c0 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:05 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:01 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index b8a582cd4d8..2b1eb7c6e92 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:05 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:02 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 224032b35b0..66b3d17b758 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2002/09/25 12:32:00 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:41:02 jmmv 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,7 +15,6 @@ COMMENT=		chess engine
 USE_BUILDLINK2=		YES
 
 DIST_SUBDIR=		${DISTNAME}
-WRKSRC=			${WRKDIR}
 CRAFTY_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CRAFTY_STARTPGN=	start.pgn
 CRAFTY_DOCFILES=	read.me crafty.faq
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index ba3153c0627..28aeecdf574 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:02 jmmv 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/ \
@@ -35,7 +36,6 @@ BINNAME=	eus-demo
 DIST_SUBDIR=	lokigames
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
-WRKSRC=		${WRKDIR}/${WRKNAME}
 
 do-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index 2c600349cbb..b4551807d0f 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:02 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index 67b916e46f7..2bba8b967ab 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:02 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/exchess/Makefile b/games/exchess/Makefile
index 3782c80701b..89cf3cf043e 100644
--- a/games/exchess/Makefile
+++ b/games/exchess/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:26 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:03 jmmv Exp $
 
 DISTNAME=		EXCH314S
 PKGNAME=		exchess-3.14
+WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		http://pc.astro.brandeis.edu/BRAG/people/dch/
 EXTRACT_SUFX=		.zip
@@ -10,7 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://pc.astro.brandeis.edu/BRAG/people/dch/chess.html
 COMMENT=		experimental chess engine
 
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 LIBDIR=			${PREFIX}/lib/exchess
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index b15bc9275fd..ad2f2c86a25 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:03 jmmv 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,7 +12,6 @@ HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/finalbattle/
 COMMENT=	Multiplayer space battle simulation for X
 
 MAKEFILE=	makefile
-WRKSRC=		${WRKDIR}/final
 
 USE_X11BASE=	yes
 
diff --git a/games/fortune-strfile/Makefile b/games/fortune-strfile/Makefile
index d490cc818a9..bc7c1c2c3ec 100644
--- a/games/fortune-strfile/Makefile
+++ b/games/fortune-strfile/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 10:31:51 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:03 jmmv Exp $
 
 DISTNAME=	fortune-strfile-0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	games
 DISTFILES=	# empty
 
 MAINTAINER=	packages@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 11dc89ff702..3f26c3b0bab 100644
--- a/games/fortunes-de/Makefile
+++ b/games/fortunes-de/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 10:33:17 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:03 jmmv Exp $
 #
 
 DISTNAME=	fortunes-de_0.6.orig
 PKGNAME=	fortunes-de-0.6
+WRKSRC=		${WRKDIR}/fortunes-de-0.6
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/f/fortunes-de/
 
@@ -10,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://packages.debian.org/unstable/games/fortunes-de.html
 COMMENT=	German data files for fortune
 
-WRKSRC=		${WRKDIR}/fortunes-de-0.6
-
 BUILD_DEPENDS+=	fortune-strfile-*:../../games/fortune-strfile
 STRFILE=	${LOCALBASE}/bin/strfile
 
diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile
index 2396fbc014e..7c985ac3825 100644
--- a/games/freeciv-manual/Makefile
+++ b/games/freeciv-manual/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/09/23 10:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:03 jmmv 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/
 
@@ -12,7 +13,6 @@ COMMENT=	manuals for freeciv (game, client, and server)
 
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
-WRKSRC=		${WRKDIR}/manual
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/freeciv/img
diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile
index 54551f6228e..400c7109e50 100644
--- a/games/galaxa/Makefile
+++ b/games/galaxa/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:04 jmmv Exp $
 #
 
 DISTNAME=	galaxa.0.1
 PKGNAME=	galaxa-0.1
+WRKSRC=		${WRKDIR}/galaxa
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/galaxa/
 
@@ -10,7 +11,6 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.newbreedsoftware.com/galaxa/
 COMMENT=	Space game based loosely on "Galaga"
 
-WRKSRC=		${WRKDIR}/galaxa
 MAKEFILE=	makefile
 USE_X11BASE=	yes
 
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 924fb3481f1..1b6c28b6574 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:04 jmmv 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,7 +12,6 @@ HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/gemdropx/
 COMMENT=	Color puzzle game for X11 similar to Gem Drop
 
 MAKEFILE=	makefile
-WRKSRC=		${WRKDIR}/gemdropx
 
 USE_X11BASE=	yes
 
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index e8f986433c9..c034fe44280 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/08 06:10:47 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:04 jmmv 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
@@ -16,7 +17,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 USE_PERL5=		build
 USE_BUILDLINK2=		YES
diff --git a/games/gnuchess-book-small/Makefile b/games/gnuchess-book-small/Makefile
index 2be7214227d..776a793188a 100644
--- a/games/gnuchess-book-small/Makefile
+++ b/games/gnuchess-book-small/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:07 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:04 jmmv 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
@@ -15,7 +16,6 @@ CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 5ac4c084740..c8cd9ff34e7 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2003/03/08 06:00:03 jmc Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:41:04 jmmv 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/}
 
@@ -19,7 +20,6 @@ COMMENT=	GNU chess engine
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 ALL_TARGET=	gnuchess
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 BOOKDIR=	${PREFIX}/lib/gnuchess
 DOCDIR=		${PREFIX}/share/doc/gnuchess
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 709c21c840b..d634d0314d6 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/02/07 11:39:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:05 jmmv 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/ \
@@ -14,7 +15,6 @@ HOMEPAGE=	http://www.lokigames.com/products/heretic2/demo.php3
 COMMENT=	Heretic2 - first person Quake 3D engine based (linux demo)
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
 
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 634d80f3c24..b308209e7e4 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:05 jmmv Exp $
 #
 
 DISTNAME=	icbm3d.0.3
 PKGNAME=	icbm3d-0.3
+WRKSRC=		${WRKDIR}/icbm3d
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/
 
@@ -10,7 +11,6 @@ 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_X11BASE=	yes
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 1c90f0dd6fc..7b163d2e4ad 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/09/23 09:56:42 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:41:05 jmmv 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
@@ -11,7 +12,6 @@ HOMEPAGE=		http://home.tu-clausthal.de/student/iMaze/
 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/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index a693a9bf9e6..4bb1182c472 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:27 agc Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:05 jmmv Exp $
 
 DISTNAME=		new_brain
 PKGNAME=		knightcap-brain-19980616
+WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://samba.anu.edu.au/pub/KnightCap/
 EXTRACT_SUFX=		.dat
@@ -15,7 +16,6 @@ ONLY_FOR_PLATFORMS=	*-*-i386
 DIST_SUBDIR=		${PKGNAME}
 
 EXTRACT_ONLY=		# empty
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 
 EGDIR=			${PREFIX}/share/examples/knightcap
diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile
index 3ce1b6d655a..133c01b05ee 100644
--- a/games/knightcap/Makefile
+++ b/games/knightcap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/09 19:46:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:05 jmmv 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/
 
@@ -10,7 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://anu.samba.org/KnightCap/
 COMMENT=		chess engine with 3D OpenGL-rendered chessboard
 
-WRKSRC=			${WRKDIR}/Export
 ALL_TARGET=		KnightCap
 
 USE_BUILDLINK2=		# defined
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index 1f87c11e1ed..0eab97688bb 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/09/20 21:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:06 jmmv Exp $
 #
 
 DISTNAME=	kulki-1.01
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/kulki
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.put.poznan.pl/adanilecki/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ 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/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index b937f5178e5..eb893669c5d 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/21 12:00:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:06 jmmv 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/
@@ -19,7 +20,6 @@ SWARS=			Star_Wars.tar.gz
 CONFLICTS=		maelstrom-[0-9]* maelstrom-sdl-[0-9]*
 
 EXTRACT_ONLY=		${DISTNAME}
-WRKSRC=			${WRKDIR}/Maelstrom
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
diff --git a/games/moria/Makefile b/games/moria/Makefile
index 953dc9fbdbc..8ae2a9a41a8 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 15:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:06 jmmv 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/
@@ -12,8 +13,6 @@ 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 768fa29fc92..8834fc24e99 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/03/01 21:12:49 pooka Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/03/29 12:41:06 jmmv Exp $
 #
 
 NETHACK_BASEVER=	3.4.1
@@ -7,6 +7,7 @@ NETHACK_DISTVER=	341
 NETHACK_DIR=		nethackdir340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}
+WRKSRC=			${WRKDIR}/nethack-${NETHACK_BASEVER}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.nethack.org/pub/nethack/nh${NETHACK_DISTVER}/src/
 EXTRACT_SUFX=		.tgz
@@ -14,8 +15,6 @@ 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 daa6c13f9bf..852247ef59b 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/11/15 00:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:07 jmmv Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.sfc.wide.ad.jp/~kusune/netmaj/
 COMMENT=		mahjongg game with network and 1-4 player(s) support
 
 USE_BUILDLINK2=		# defined
-WRKSRC=			${WRKDIR}/netmaj
 
 INSTALL_TARGET=		install install-pf
 HTMLDIR=		${PREFIX}/share/doc/html/netmaj
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 0746ca6f767..204493e64c6 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/14 19:37:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:07 jmmv Exp $
 
 DISTNAME=		netmaze0.81
 PKGNAME=		netmaze-0.81
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/netmaze
 CATEGORIES=		games
 MASTER_SITES=  		${MASTER_SITE_XCONTRIB:=games/multiplayer/}
 
@@ -11,8 +12,6 @@ COMMENT=		X windows-based multiplayer combat game (like Midi Maze)
 
 USE_IMAKE=		yes
 
-WRKSRC=			${WRKDIR}/netmaze
-
 post-patch:
 	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
 	${SED} -e 's|@X11LIBS@|${X11_LDFLAGS}|g' \
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 298fd8042b0..20779124515 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2003/03/24 17:56:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:41:07 jmmv Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/ \
 		ftp://ftp.idsoftware.com/idstuff/source/
@@ -20,7 +21,6 @@ USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	MAINDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 
 MAKE_ENV+=	MESA_DIR=${BUILDLINK_PREFIX.Mesa}
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 14a0dbe6f60..cb037b71ee7 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/03/26 04:05:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:07 jmmv Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGNAME=	quake3arena-demo-1.11.6
+WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	http://download1.activision.com/activision/quake3/demo/ \
 		http://download2.activision.com/activision/quake3/demo/
@@ -17,7 +18,6 @@ DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
 CONFLICTS=	quake3arena-[0-9]*
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
 
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index a9840f9aea2..36a15102b88 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/26 04:05:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:08 jmmv Exp $
 
 DISTNAME=	linuxq3apoint-1.17.x86
 PKGNAME=	quake3arena-1.17
+WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/old/ \
 		ftp://ftp.uni-klu.ac.at/pub/linux/games/quake3/ \
@@ -22,7 +23,6 @@ NO_SRC_ON_FTP=	no
 NO_BIN_ON_FTP=	no
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
 
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index fd30914ca40..fb6f430d9d3 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/03/24 17:56:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/29 12:41:08 jmmv Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
+WRKSRC=		${WRKDIR}/quakeforge
 CATEGORIES=	games
 MASTER_SITES=	http://www.viagenie.qc.ca/quake/
 
@@ -11,8 +12,6 @@ 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 563b0329a6c..45dcfa4d8de 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/09/23 10:20:41 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:08 jmmv 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,7 +20,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 EXTRACT_CMD=	unzip -q -o ${DOWNLOADED_DISTFILE} -d ${WRKDIR} resource.*
-WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
 
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 20da2ae6aa0..9005b0e5873 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/10 12:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:08 jmmv Exp $
 
 DISTNAME=	scummvm_0.3.0b-src
 PKGNAME=	scummvm-0.3.0
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +14,6 @@ COMMENT=	LucasArts Script Creation Utility for Maniac Mansion
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=	yes
 
 do-install:
diff --git a/games/svb/Makefile b/games/svb/Makefile
index add0b5cd553..f55fe5cd639 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/01/27 18:32:33 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:09 jmmv 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,7 +11,6 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Spy Vs. Bob, the timeless classic
 
 USE_IMAKE=		yes
-WRKSRC=			${WRKDIR}
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index d1293f9b17d..4299988b48e 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:09 jmmv Exp $
 #
 
 DISTNAME=	tworld-1.0
 PKGNAME=	${DISTNAME:S/^t/tile/}
+WRKSRC=		${WRKDIR}/tworld-1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 
@@ -15,7 +16,6 @@ USE_GMAKE=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
-WRKSRC=		${WRKDIR}/tworld-1.0
 ALL_TARGET=	tworld
 
 MAKE_ENV+=	ECHO="${ECHO}" DATE="${DATE}"
diff --git a/games/ularn/Makefile b/games/ularn/Makefile
index 0cfd4faa52a..f7116ffd971 100644
--- a/games/ularn/Makefile
+++ b/games/ularn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 18:55:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:09 jmmv Exp $
 
 DISTNAME=		ularn
 PKGNAME=		ularn-6.12.92
+WRKSRC=			${WRKDIR}
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.win.tue.nl/pub/games/larn/
 
@@ -9,7 +10,6 @@ MAINTAINER=		collver1@attbi.com
 HOMEPAGE=		http://www.win.tue.nl/games/roguelike/larn/
 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 ed834948aaf..652181d2d60 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/09/23 10:20:06 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:09 jmmv Exp $
 #
 
 DISTNAME=		Wormz-1.0b5
 PKGNAME=		wormz-1.0b5
+WRKSRC=			${WRKDIR}/Wormz
 CATEGORIES=		games x11
 MASTER_SITES=		http://lide.punknet.cz/miri/
 
@@ -10,8 +11,6 @@ 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 d0a81d783f7..1239ecdd964 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:09 jmmv 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,7 +18,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/Xev111
 ALL_TARGET=	xbat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 0e6c725a1cd..78cf0fe1467 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2003/02/26 04:07:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:41:10 jmmv Exp $
 #
 
 DISTNAME=		xblast-2.6.beta-sound
 PKGNAME=		xblast-2.6b
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/XBlast-2.2
+WRKSRC=			${WRKDIR}/XBlast-2.6.beta
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.ikp.uni-koeln.de/~vogel/archive/
 
@@ -16,8 +16,6 @@ DEPENDS+=		tk>=8.3.2:../../x11/tk
 
 USE_IMAKE=		yes
 
-WRKSRC=			${WRKDIR}/XBlast-2.6.beta
-
 post-patch:
 	cd ${WRKSRC} ; ${SED} '/file_appl_def/s@/usr/lib/X11@'${PREFIX}'/lib/X11@' defaults.h >xx ; ${MV} xx defaults.h
 	${TOUCH} ${WRKSRC}/xbsndsrv.man
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 2223665ba34..02197a5dd6b 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2002/09/23 10:21:19 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:10 jmmv Exp $
 #
 
 DISTNAME=		xboing2.4
 PKGNAME=		xboing-2.4
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/xboing
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 
@@ -15,7 +16,6 @@ USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 
 NO_INSTALL_MANPAGES=	YES
-WRKSRC=			${WRKDIR}/xboing
 
 post-install:
 	${CHOWN} bin:games ${X11PREFIX}/bin/xboing
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index 5a276dc3c63..a533723a6e5 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:10 jmmv Exp $
 #
 
 DISTNAME=	xbomber.0.8
 PKGNAME=	xbomber-0.8
+WRKSRC=		${WRKDIR}/xbomber
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/xbomber/
 
@@ -10,7 +11,6 @@ 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_X11BASE=	yes
 
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 1894b35d353..a0985f235c8 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:29 agc Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:10 jmmv 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
@@ -10,7 +11,6 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.xevil.com/
 COMMENT=		violent game of killing, contains profanity
 
-WRKSRC=			${WRKDIR}
 MAKE_ENV=		HOSTTYPE="netbsd" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			INSTALL_MAN="${INSTALL_MAN}"
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index c9e003d28ce..77cca3171e9 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/12/30 23:03:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:10 jmmv Exp $
 
 DISTNAME=	xfreecell-1.0.5b
+WRKSRC=		${WRKDIR}/xfreecell
 CATEGORIES=	games
 MASTER_SITES=   http://www2.giganet.net/~nakayama/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +12,6 @@ COMMENT=	Popular freecell card game for X
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/xfreecell
 MAKEFILE=	makefile
 
 NO_CONFIGURE=	YES
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 24bb34d60d7..200edec7f3e 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/02/28 17:23:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:11 jmmv Exp $
 #
 
 DISTNAME=	xfrisk-1.2
+WRKSRC=		${WRKDIR}/XFrisk
 CATEGORIES=	games
 MASTER_SITES=	http://morphy.iki.fi/xfrisk/files/
 
@@ -9,8 +10,6 @@ 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_GMAKE=	yes
 USE_X11=	yes
 
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index f80bed456a7..b21e98d4c76 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/02/26 04:07:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:41:11 jmmv Exp $
 
 DISTNAME=	xmahjongg
 PKGNAME=	xmahjongg-1.0
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/xmahjongg
 CATEGORIES=	games
 # Most Usenet archive sites don't store it as a .tar.gz, but Slackware
 # and its mirrors do.
@@ -11,7 +12,6 @@ MASTER_SITES=	ftp://wcarchive.cdrom.com/pub/linux/slackware/source/xap/xgames/
 MAINTAINER=	packages@netbsd.org
 COMMENT=	The Chinese game of Mahjongg for X11
 
-WRKSRC=		${WRKDIR}/xmahjongg
 USE_IMAKE=	yes
 
 RESTRICTED=	"Restrictive copyright"
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index cb118e157be..fdf9a710ce5 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/09/24 08:33:07 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:11 jmmv Exp $
 #
 
 DISTNAME=		xnibbles-1.0BETA4
 PKGNAME=		xnibbles-1.0b4
+WRKSRC=			${WRKDIR}/xnibbles
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.tjhsst.edu/xnibbles/
 
@@ -14,7 +15,6 @@ USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 
-WRKSRC=			${WRKDIR}/xnibbles
 ALL_TARGET=		netbsd
 
 CC=			${CXX}
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 499e336e125..6626263fc65 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:11:04 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:11 jmmv Exp $
 #
 
 DISTNAME=	xpipeman-1.5
+WRKSRC=		${WRKDIR}/xpipeman
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.spinne.com/x/games/xpipeman/
 
@@ -9,8 +10,6 @@ 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 2fe91d1b79c..d65e6a85d36 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:11:05 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:11 jmmv Exp $
 #
 
 DISTNAME=	xroads-v0.5
 PKGNAME=	xroads-0.5
+WRKSRC=		${WRKDIR}/xroads-v0.5
 CATEGORIES=	games
 MASTER_SITES=	http://www.autobahn.mb.ca/~foxtrot/
 
@@ -10,7 +11,6 @@ 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/xscrabble/Makefile b/games/xscrabble/Makefile
index 1c99bd7455e..69f5ffb355b 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/10/21 12:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:12 jmmv Exp $
 #
 
 DISTNAME=	xscrabble
 PKGNAME=	xscrabble-1.0
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xscrabble
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.belgarath.demon.co.uk/programs/
 
@@ -11,7 +12,6 @@ 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 47df95f8ecb..8452a003d26 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/23 10:31:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:12 jmmv Exp $
 #
 
 DISTNAME=	xtris-1.15
+WRKSRC=		${WRKDIR}/xtris
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.iagora.com/~espel/xtris/
 
@@ -9,7 +10,6 @@ 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 f33b5b0dda0..f6d02b2a983 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/12/04 13:02:07 tron Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:12 jmmv 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/}
@@ -14,8 +15,6 @@ USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11=	YES
 
-WRKSRC=		${WRKDIR}/xtux
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xtux
 	cd ${WRKSRC} && ${PAX} -rw data ${PREFIX}/share/xtux
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index ea8be76e1fe..578d1514224 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/03/01 21:43:48 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:12 jmmv Exp $
 
 DISTNAME=	xvier
 PKGNAME_MASTER=	xvier-1.0
 PKGNAME=	${PKGNAME_MASTER}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${PKGNAME_MASTER}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=games/strategy/}
 EXTRACT_SUFX=	.tar.Z
@@ -13,6 +14,5 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	four-in-a-row game
 
 USE_IMAKE=	YES
-WRKSRC=		${WRKDIR}/${PKGNAME_MASTER}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index a844eb6ccf2..ccd2320e970 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:12 jmmv 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/
 
@@ -12,7 +13,6 @@ COMMENT=	Classic game with apples and hungry worm
 
 ALL_TARGET=	bsd
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/XWorm
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 3be7767b734..09f7084558f 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:11:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:13 jmmv 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
@@ -10,8 +11,6 @@ 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