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

author: agc <agc@pkgsrc.org> 2004-01-20 12:07:06 +0000
committer: agc <agc@pkgsrc.org> 2004-01-20 12:07:06 +0000
commit: dc52048e014fdad9bb69ef9db159835a61c8dd4d (patch)
tree: 28fc431efa48feea798736cefee933a6529a5c91
parent: 46eceba7253d40f1643bc06f73cc7fd2148c2e8e (diff)
download: pkgsrc-dc52048e014fdad9bb69ef9db159835a61c8dd4d.tar.gz
462 files changed, 973 insertions, 925 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 5d9be083499..657ec408f18 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:05 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp
 #
 
 DISTNAME=       arc521e.pl8
 PKGNAME=        arc-5.21e
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=   .tar.Z
@@ -16,6 +15,8 @@ RESTRICTED=	"Do not modify. Do not charge for redistribution"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
+
 USE_BUILDLINK2=	yes
 
 do-install:
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 4e16230b270..ac4eeb3e8fc 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=		bicom101
 PKGNAME=		bicom-1.01
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		http://www3.sympatico.ca/mt0000/bicom/
 EXTRACT_SUFX=		.zip
@@ -13,6 +12,8 @@ HOMEPAGE=		http://www3.sympatico.ca/mt0000/bicom/bicom.html
 COMMENT=		Data compressor in the PPM family
 
 LICENSE=		no-commercial-use
+
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		# defined
 USE_GCC_SHLIB=		yes
 
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index a73bda2e148..0e4174da5a3 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:21:07 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.gz
@@ -11,7 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
-USE_BUILDLINK2=		# defined
+WRKSRC=		${WRKDIR}
+USE_BUILDLINK2=	# defined
 
 do-build:
 	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 75eda6103ee..10d6123fc32 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:21:20 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp
 #
 
 DISTNAME=       ha0999
 PKGNAME=        ha-0.999b
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=   .tgz
@@ -12,6 +11,7 @@ EXTRACT_SUFX=   .tgz
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	The HA archiver using the HSC compression method
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 MAKEFILE=       makefile.nix
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index af0e1a7e04d..62950161811 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:21 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
 
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 CRYPTO=		yes
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index 140b5677e27..b3b189a6e39 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:21:22 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	jamjar-0.6
-WRKSRC=		${WRKDIR}/jamjar
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://wonka.acunia.com/pub/wonka/
 
@@ -12,6 +11,7 @@ COMMENT=	Acunia version of the jar archiver
 
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
+WRKSRC=		${WRKDIR}/jamjar
 USE_BUILDLINK2=	YES
 
 JAM_COMMAND=	\
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index f8f1a4d2eff..6637edf9deb 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
-WRKSRC=			${WRKDIR}/macutil
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://ftp.cwi.nl/pub/dik/
 EXTRACT_SUFX=		.shar.Z
@@ -13,6 +12,7 @@ COMMENT=		Create & extract Mac archive files
 MAKEFILE=		makefile
 MAKE_ENV+=		CF="${CFLAGS}"
 
+WRKSRC=			${WRKDIR}/macutil
 USE_BUILDLINK2=		# defined
 
 do-install:
diff --git a/archivers/mousetar/Makefile b/archivers/mousetar/Makefile
index 4af3e0fe343..15c043c5deb 100644
--- a/archivers/mousetar/Makefile
+++ b/archivers/mousetar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/18 14:00:58 yyamano Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	mousetar-20021217
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/mouse/tar/
 DISTFILES=	tar.c tar.man
@@ -11,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	none
 COMMENT=	der Mouse's version of tar program
 
+WRKSRC=		${WRKDIR}
+
 do-extract:
 	for f in ${DISTFILES}; do					\
 		${CP} ${DISTDIR}/$$f ${WRKDIR};				\
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 9c68fb3f08c..5ab8c50b9bb 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/15 09:36:45 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	nulibdist
 PKGNAME=	nulib2-2.0.0
-WRKSRC=		${WRKDIR}/nulib2-200
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.nulib.com/downloads/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tv@poxbox.com
 HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
+WRKSRC=		${WRKDIR}/nulib2-200
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cache-file=${WRKDIR}/config.cache
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index b17671d4ac0..864d77dfd0b 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:21:34 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
-WRKSRC=		${WRKDIR}/PPUnpack
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Decompresses Amiga PowerPacker files
 
+WRKSRC=		${WRKDIR}/PPUnpack
 USE_BUILDLINK2=	# defined
 
 MAKE_FLAGS=	CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 8a8556f580e..da6307b0c1d 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 21:21:35 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/20 12:07:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
 #
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://rarsoft.ti.sk/pub/rar/ \
 			ftp://ftp.elf.stuba.sk/pub/pc/pack/
@@ -20,6 +19,7 @@ RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
 USE_BUILDLINK2=		# defined
 
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index 7b44bb68217..f71d13b32d8 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:21:38 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
-WRKSRC=		${WRKDIR}/t20-squsq
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -11,6 +10,7 @@ COMMENT=	Compressor/decompressor for CP/M Squeeze compressed files
 
 MAKEFILE=	${FILESDIR}/Makefile
 
+WRKSRC=		${WRKDIR}/t20-squsq
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index edb553e1524..123d06c0a5c 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=		stuffit520.611linux-i386
 PKGNAME=		stuffit-5.2.0.611
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://ftp.aladdinsys.com/pub/linux/StuffIt/ \
 			ftp://ftp2.aladdinsys.com/pub/linux/StuffIt/
@@ -22,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=			${WRKDIR}
 CHECK_SHLIBS=		NO
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile
index 94c914dd046..dd3d8cb99f0 100644
--- a/archivers/unace22/Makefile
+++ b/archivers/unace22/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/25 18:29:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	linunace22
 PKGNAME=	unace22-2.20
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.servidas.net/winace/ \
 		http://www.maxeline.com/winace/ \
@@ -18,6 +17,8 @@ COMMENT=	Extract, list and test files in ACE archives (2.2 linux binary)
 
 ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 Linux-*-i[3-6]86
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index ac7925b985d..29c7069ba85 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:21:42 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 1ad8b61529c..0bbf2f08446 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:21:43 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 649c0b3a05a..e948263e639 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/01/19 20:18:02 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	unrarsrc-3.3.4
 PKGNAME=	${DISTNAME:S/src//}
-WRKSRC=		${WRKDIR}/unrar
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
 
@@ -20,6 +19,8 @@ RESTRICTED=	"Do not modify. Do not charge a fee for redistribution."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/unrar
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unrar
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} unrar ${PREFIX}/bin
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index c2c98729bf6..19015747e00 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2004/01/05 11:42:20 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	unzip550
 PKGNAME=	unzip-5.50
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/ \
@@ -20,6 +19,7 @@ COMMENT=	List, test and extract compressed files in a ZIP archive
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 086638dd4bc..c3f796811ef 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:21:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	unzoo.c
 PKGNAME=	unzoo-4.4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/util/
 EXTRACT_SUFX=	# defined
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	# defined
 MAINTAINER=	cjep@NetBSD.org
 COMMENT=	Extract zoo archives
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 do-extract:
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 673e61a5c27..55e8f5d3b1a 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/07 15:12:59 ben Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	upx-1.24-src
 PKGNAME=	${DISTNAME:S/-src//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	misc archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=upx/}
 
@@ -12,6 +11,8 @@ COMMENT=	Ultimate packer for executables
 
 DEPENDS+=	ucl>=1.01:../../devel/ucl
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 USE_GMAKE=	yes
 USE_PERL5=	build
 
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index b15fe9da5f3..f5c46edd5aa 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:24:41 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
 PKGNAME=	${PRGNAME}-2.3
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/packages/TeX/tools/xbin/
 DISTFILES=	${DISTNAME}.c ${PRGNAME}.man
@@ -15,6 +14,7 @@ RESTRICTED=	"May not be sold without permission"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 PRGNAME=	xbin
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 02655181865..55a9102067e 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=		xmill-0-7
 PKGNAME=		xmill-0.7
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,7 @@ BUILD_DEPENDS=		unzip-[0-9]*:../../archivers/unzip
 
 EXTRACT_CMD=		${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE}
 
+WRKSRC=			${WRKDIR}
 USE_GMAKE=		#defined
 MAKEFILE=		makefile
 
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 9b48975c986..829962c3ca9 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:21:49 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	zip1-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/
@@ -16,6 +15,7 @@ RESTRICTED=	"Do not modify.  Do not sell for profit."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 416b1fa2037..451a487af0b 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:21:50 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:07:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp
 #
 
 DISTNAME=       zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
@@ -13,6 +12,7 @@ COMMENT=	Manipulate archives of files in compressed form
 
 LICENSE=	zoo-license
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 ALL_TARGET=     bsdansi
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index a2737457691..9deeee99f72 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/01/10 14:25:42 recht Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	audacity-src-1.0.0-2
 PKGNAME=	audacity-1.0.0.2
 PKGREVISION=	8
-WRKSRC=		${WRKDIR}/audacity-src-1.0.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	Audio editor
 
 BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
+WRKSRC=		${WRKDIR}/audacity-src-1.0.0
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_GMAKE=		# defined
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 1ceb2f430d0..d49a09c6819 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/12/22 10:57:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=		bladeenc-0.94.2-src-stable
 PKGNAME=		bladeenc-0.94.2
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		audio
 MASTER_SITES=		http://bladeenc.mp3.no/source/
 
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://bladeenc.mp3.no/
 COMMENT=		Free MPEG Audio Layer 3 encoder (not decoder)
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		yes
 
 post-install:
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
index d5d610cb710..80e0c2ded01 100644
--- a/audio/cd-discid/Makefile
+++ b/audio/cd-discid/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:21:59 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	cd-discid_0.7.orig
 PKGNAME=	cd-discid-0.7
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/cd-discid/
 
 MAINTAINER=	lukem@NetBSD.org
 COMMENT=	Read CD to obtain CDDB discid information
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 do-build:
 	cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
 
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 875f8e18a9a..2f148d87bd8 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=	cmp3-2.0pre5
 PKGNAME=	cmp3-2.0.p5
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/cmp3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
 
@@ -14,6 +13,7 @@ COMMENT=	Curses based frontend to mpg123
 
 DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 
+WRKSRC=		${WRKDIR}/cmp3
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_NCURSES=		# MAX_FORM_COMMAND
diff --git a/audio/cs4235/Makefile b/audio/cs4235/Makefile
index d51ca229ccd..acaf3c6fd1a 100644
--- a/audio/cs4235/Makefile
+++ b/audio/cs4235/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:22:02 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=	cs4235-20001009
-WRKSRC=		${WRKDIR}/cs4235
 CATEGORIES=	audio sysutils
 MASTER_SITES=	http://invisible.yi.org/~jmcneill/
 
@@ -12,6 +11,8 @@ COMMENT=	Modifies the 3D mode on Crystal CS4235 sound cards
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386
 
+WRKSRC=		${WRKDIR}/cs4235
+
 MAKE_ENV+=	BINDIR=${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index 96fa44b9587..88907e0107d 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=		Csound4.23
 PKGNAME=		csound-bath-4.23
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.cs.bath.ac.uk/pub/dream/newest/
 
@@ -16,6 +15,7 @@ RESTRICTED=		"no for-fee-redistribution"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		csound
 CONFLICTS=		csound-dev-4*
 USE_GMAKE=		yes
diff --git a/audio/csound-manual/Makefile b/audio/csound-manual/Makefile
index 39e20c1dc22..512d911f883 100644
--- a/audio/csound-manual/Makefile
+++ b/audio/csound-manual/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=		manual-html-4.23
 PKGNAME=		csound-manual-4.23
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.cs.bath.ac.uk/pub/dream/documentation/manuals/ \
 			http://www.kevindumpscore.com/download/
@@ -13,6 +12,7 @@ HOMEPAGE=		http://www.csounds.com/
 COMMENT=		Csound Reference Manual
 
 NO_BUILD=		yes
+WRKSRC=			${WRKDIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/csound
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 832d85c1c9c..3fb2b93b151 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/11/06 20:00:12 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:41 agc Exp $
 #
 
 DISTNAME=	faad2-1.1
-WRKSRC=		${WRKDIR}/faad2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
@@ -14,6 +13,7 @@ RESTRICTED=	Dolby doesn't allow binary distributions
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/faad2
 USE_BUILDLINK2=		YES
 USE_GCC_SHLIB=		YES
 USE_GMAKE=		YES
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 118f96db981..0a1c480d81a 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/12/23 10:35:30 sketch Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	festival-1.4.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
@@ -18,6 +17,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	Festival is an advanced multi-lingual speech synthesis system
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 8afea1f61d9..38af9171664 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,6 +12,7 @@ COMMENT=	CMU American English pronounciation dictionary for Festival
 
 DEPENDS+=	festival>=1.4.0:../festival
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index bd6fe3d1b9c..25cf285b33c 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -15,6 +14,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 942b095ec42..b88e2dceac1 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:04 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -15,6 +14,7 @@ DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 7f81aea5f4c..e0effee10be 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:41 agc Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,6 +12,7 @@ COMMENT=	English lexicon suitable for use with Festival
 
 DEPENDS+=	festival>=1.4.0:../festival
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index da1088990ab..a08b08b9e7a 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	OGIspanish-2.0.1
 PKGNAME=	festogi-spanish-2.0.1
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -14,6 +13,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 6723d1c969e..22db989a6cd 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:05 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -16,6 +15,7 @@ DEPENDS+=	festogi-spanish>=2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 631ddb06b05..12a8edec89a 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/04/10 01:28:05 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
 LICENSE=	no-commercial-use
 
 DIST_SUBDIR=	${PKGNAME}
+WRKSRC=		${WRKDIR}/festival
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index da3f24b118e..2254af463b4 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:05 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -15,6 +14,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 4bd6678876f..37b2e26e620 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:05 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -15,6 +14,7 @@ DEPENDS+=	festival>=1.4.1:../festival
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index abcd267cb0a..83ca9dbea7a 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -19,6 +18,7 @@ DEPENDS+=	mbrolavox-en1-980910:../mbrolavox-en1
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 4af430efb9a..417a76b1b85 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -16,6 +15,7 @@ DEPENDS+=	festogi-spanish>=2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 31d83eb3572..5ef363632bd 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -15,6 +14,7 @@ DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 3e7db97fa5a..c084374fec9 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/06/07 14:47:16 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-kal8-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 60cb22f9ba2..e381aa65cc0 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/06/07 14:47:17 cjep Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-kal16-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 8d37afd97e4..f820bae9e88 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/06/07 14:47:17 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-ked8-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 35d33b534a6..baa88700868 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/06/07 14:47:17 cjep Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
 CONFLICTS=	festvox-ked16-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index e61340ad630..90bb0c3f7b8 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:09 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -15,6 +14,7 @@ DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 97da8dd1776..fae1e62d0f3 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:09 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -15,6 +14,7 @@ DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index b0801ca92c2..fe08e2cf91c 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/06/07 14:47:18 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 
 CONFLICTS=	festvox-rab8-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 0f3f203f429..219971bb6fb 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/04/10 01:28:10 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -17,6 +16,7 @@ DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 
 CONFLICTS=	festvox-rab16-[0-9]*
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index fed00c709ed..b00148a71ff 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:10 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
@@ -15,6 +14,7 @@ DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index 8e8bf38b1da..943b65c1d51 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -19,6 +18,7 @@ DEPENDS+=	mbrolavox-us1-980512:../mbrolavox-us1
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index f12263c36d2..fc5c846b208 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:11 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -19,6 +18,7 @@ DEPENDS+=	mbrolavox-us2-980812:../mbrolavox-us2
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 93bd4a80b6f..9602b406846 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:11 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
-WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -19,6 +18,7 @@ DEPENDS+=	mbrolavox-us3-990208:../mbrolavox-us3
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/festival
 NO_BUILD=	yes
 
 FHOME=		${PREFIX}/share/festival
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index d0a61fc0005..033e79d0f5e 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:42 agc Exp $
 #
 
 DISTNAME=		flac-1.1.0
 PKGREVISION=				1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		audio archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
 
@@ -17,6 +16,7 @@ COMMENT=		Free lossless audio codec
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 .endif
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 0ef29b0d0dc..397c5739822 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:33 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	volume-0.8
 PKGNAME=	gkrellm-${DISTNAME}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/volume
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
@@ -11,6 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
 COMMENT=	gkrellm volume mixer plugin
 
+WRKSRC=		${WRKDIR}/volume
 PTHREAD_OPTS=		require
 USE_BUILDLINK2=		yes
 
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index ce739b96e2e..7fe02cf44ec 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/12 10:35:57 cjep Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	gkrellmms-0.5.6
 PKGNAME=	gkrellm-xmms-0.5.6
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/gkrellmms
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
@@ -11,6 +10,7 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
 COMMENT=	gkrellm xmms plugin
 
+WRKSRC=		${WRKDIR}/gkrellmms
 USE_BUILDLINK2=	YES
 
 pre-install:
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 15526d1d0ed..48d22746c2f 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:22:10 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:07:42 agc Exp $
 #
 
 DISTNAME=       gsm-1.0.10
-WRKSRC=         ${WRKDIR}/gsm-1.0-pl10
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://kbs.cs.tu-berlin.de/~jutta/toast.html
 COMMENT=	Audio converter and library for converting u-law to gsm encoding
 
+WRKSRC=         ${WRKDIR}/gsm-1.0-pl10
 USE_BUILDLINK2=	# defined
 USE_LIBTOOL=	# defined
 
diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile
index 394da65e596..16b566ec481 100644
--- a/audio/gtkmserv/Makefile
+++ b/audio/gtkmserv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:30:39 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:07:42 agc Exp $
 #
 
 DISTNAME=	gtkmserv-0.5.2
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.ubertechnique.com/downloads/
 
@@ -11,6 +10,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://projects.ubertechnique.com/index.html
 COMMENT=	Gtk-based GUI client for the audio/mserv package
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 
diff --git a/audio/id3/Makefile b/audio/id3/Makefile
index c0c6f4f182d..c08de1eb8a2 100644
--- a/audio/id3/Makefile
+++ b/audio/id3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:22:25 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	id3_0.12.orig
 PKGNAME=	id3-0.12
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/id3/
 
@@ -10,4 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://frantica.lly.org/~rcw/abcde/page/
 COMMENT=	ID3 v1.1 tag editor
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 2c667ed3343..1bc9171e745 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/01/17 19:59:07 kristerw Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=		libmikmod_3.1.10
 PKGNAME=		libmikmod-3.1.10
-WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		audio
 MASTER_SITES=		http://mikmod.raphnet.net/files/
 
@@ -17,6 +16,7 @@ USE_BUILDLINK2=		# defined
 USE_MAKEINFO=		YES
 INFO_FILES=		mikmod.info
 
+WRKSRC=			${WRKDIR}/${PKGNAME}
 CONFIGURE_ARGS+=	--disable-threads
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index 41db6131f86..ee69db72588 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2004/01/18 13:59:25 mrauch Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:42 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp
 #
 
 DISTNAME=       maplay1_2
 PKGNAME=	maplay-1.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/misc/maplay1.2/
 EXTRACT_SUFX=	.tar
@@ -14,6 +13,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	MPEG audio player/decoder for layer I and II MPEG audio streams
 
 PATCH_STRIP=	-p2
+WRKSRC=		${WRKDIR}
 
 pre-configure:
 	@(cd ${WRKSRC}; ${MAKE} pre-install)
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index a680be08ebe..2d7a87ab5c6 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		http://www.festvox.org/mbrola/bin/netbsd/
 EXTRACT_SUFX=		.zip
@@ -13,6 +12,7 @@ COMMENT=		MBROLA diphone synthesizer executable
 
 LICENSE=		no-commercial-use
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		mbrola-20010717
 NO_BUILD=
 
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index 2219624e2d8..ed68e8c4108 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/04/10 01:28:11 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:42 agc Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/ \
 		http://www.festvox.org/mbrola/dba/en1/
@@ -16,6 +15,7 @@ DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index f20691fed28..cd06fe4fa6d 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/04/10 01:28:12 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/ \
 		http://www.festvox.org/mbrola/dba/us1/
@@ -16,6 +15,7 @@ DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index 65aceea9c5a..bd1a38d9f1e 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:12 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/ \
 		http://www.festvox.org/mbrola/dba/us2/
@@ -16,6 +15,7 @@ DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index c1c3562b76a..e01199e03aa 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:12 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/ \
 		http://www.festvox.org/mbrola/dba/us3/
@@ -16,6 +15,7 @@ DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index cd2874e6ec4..20bc28c2f97 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:22:51 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	mp32ogg-0.11
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	# empty
@@ -17,6 +16,7 @@ DEPENDS+=	p5-String-ShellQuote>=1.00:../../textproc/p5-String-ShellQuote
 
 USE_PERL5=	yes
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index 27bb538259a..4d5b9625bb0 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:22:52 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	mp3asm-0.1.3
-WRKSRC=		${WRKDIR}/mp3asm-0.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3asm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://mp3asm.sourceforge.net/
 COMMENT=	mpeg 1/2/2.5 audio layer 1,2,3 frame level editor
 
+WRKSRC=		${WRKDIR}/mp3asm-0.1
 GNU_CONFIGURE=	yes
 
 post-patch:
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 920878c26c2..395be907c2b 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=		mp3splt-1.9-src
 PKGNAME=		${DISTNAME:S/-src//}
 PKGREVISION=				1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mp3splt/}
 
@@ -12,6 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://mp3splt.sourceforge.net/
 COMMENT=		Command line utility to split MP3 (VBR supported) and OGG files
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 0cf3fb3c1ca..57938511036 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2004/01/02 11:12:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	musicbox-1.01p2
-WRKSRC=		${WRKDIR}/musicbox-1.01
 CATEGORIES=	audio
 MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/Upload/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ COMMENT=	X11 front-interface for mpg123
 DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
 DEPENDS+=	qt1-1.44:../../x11/qt1
 
+WRKSRC=		${WRKDIR}/musicbox-1.01
 USE_X11=	yes
 CFLAGS+=	-D${OPSYS}
 EVAL_PREFIX+=	QT1DIR=qt1
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 3d16e297f34..e96abfc4e2c 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2003/12/30 16:58:14 cjep Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	nas-1.6.src
 PKGNAME=	${DISTNAME:S/.src//}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://radscan.com/nas/ \
 		ftp://ftp.uni-duisburg.de/Sound/NAS/ \
@@ -14,6 +13,7 @@ COMMENT=	Network Audio System
 
 DEPENDS+=	p5-perl-headers-${OS_VERSION}:../../devel/p5-perl-headers
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_IMAKE=		yes
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index 492a2e77cd6..851be845f5b 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:30:43 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://oggasm.sourceforge.net/
 
@@ -15,6 +14,7 @@ DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
 DEPENDS+=	vorbis-tools>=1.0.0.7:../../audio/vorbis-tools
 DEPENDS+=	p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_PERL5=	yes
 REPLACE_PERL=	oggasm
 
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index fa077a25fcb..ec7e882b7c2 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/16 12:16:50 adam Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	openal-20030724
-WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 CATEGORIES=	audio
 MASTER_SITES=	http://math.smsu.edu/~erik/files/fbsd/ \
 		http://www.smluc.org/~erik/ \
@@ -12,6 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.openal.org/
 COMMENT=	3D positional spatialized sound library
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 5af9b9c45d8..616c5efb1d7 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/01/05 20:50:01 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	oss-${OSS_VERSION}	# Overridden below
 PKGNAME=	oss-${OSS_VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio sysutils
 MASTER_SITES=	ftp://ftp.opensound.com/pub/oss/netbsd/
 
@@ -25,6 +24,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile
index 327395cb28c..f15b02ca87b 100644
--- a/audio/realplayer/Makefile
+++ b/audio/realplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2003/11/15 00:20:28 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:07:43 agc Exp $
 
 PKGNAME=		realplayer-8.0.1
-WRKSRC=			${WRKDIR}/RealPlayer8
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.bin
@@ -39,6 +38,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
 
 CONFLICTS=		realplayer-codecs<8nb2
 
+WRKSRC=			${WRKDIR}/RealPlayer8
 CRYPTO=			# defined
 INTERACTIVE_STAGE=	fetch extract
 CHECK_SHLIBS=		NO
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index c2d3999c965..9940499a9da 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:30:44 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	rio007
 PKGNAME=	rio-1.07
-WRKSRC=		${WRKDIR}/rio107
 CATEGORIES=	audio
 MASTER_SITES=	http://www.world.co.uk/sba/
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	Utility to display and manage files on the Diamond Rio PMP300
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=		${WRKDIR}/rio107
 MAKEFILE=	makefile
 
 do-install:
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index c41b2db3c6d..182c6b2e63b 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2003/07/17 21:23:21 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=		snd
 PKGNAME=		snd-19980212
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -13,6 +12,7 @@ COMMENT=		X based sound editor
 
 NO_SRC_ON_FTP=		Already on MASTER_SITE_LOCAL
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index 06c82baddc1..9f5165c4375 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:23:28 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	snack2.2
 PKGNAME=	tcl-snack-2.2
-WRKSRC=         ${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.kth.se/~kare/
 EXTRACT_SUFX=	.tar.Z
@@ -11,6 +10,7 @@ MAINTAINER=	gson@NetBSD.org
 HOMEPAGE=	http://www.speech.kth.se/snack/
 COMMENT=	The Snack Sound Toolkit
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}/unix
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index aec62b101f9..e7e80c846f9 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2003/08/09 10:29:56 seb Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/20 12:07:43 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
 #
 
 DISTNAME=		tracker-5.3
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/tracker
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.tgz
@@ -18,6 +17,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/tracker
 MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
 		INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
 		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index e8d2de730f5..0636148598f 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:23:35 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	tremor_snapshot_030406
 PKGNAME=	tremor-1.0.2
 PKGREVISION=	3
-WRKSRC=         ${WRKDIR}/Tremor
 CATEGORIES=	devel audio
 MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	chris@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
 COMMENT=	Fixed point decoding library for the Ogg Vorbis audio encoding format
 
+WRKSRC=         ${WRKDIR}/Tremor
 AUTOMAKE_REQD=		1.4
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
diff --git a/audio/trplayer/Makefile b/audio/trplayer/Makefile
index f1d71764bca..ec5d1fae938 100644
--- a/audio/trplayer/Makefile
+++ b/audio/trplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/08/09 10:29:56 seb Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	trplayer-1.2.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://linux-speakup.org/pub/linux/goodies/trplayer/
 EXTRACT_SUFX=	-1.i386.rpm
@@ -29,6 +28,7 @@ INTERACTIVE_STAGE=	fetch		# XXX Not really!
 LICENSE=		trplayer-license
 ONLY_FOR_PLATFORM=	NetBSD-1.6*-i386
 
+WRKSRC=		${WRKDIR}
 CHECK_SHLIBS=	NO
 NO_BUILD=	YES
 
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index b91f6d68064..224c9084310 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:30:48 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
 PKGNAME=	wmmixer-1.0
-WRKSRC=		${WRKDIR}/wmmixer
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	pr@alles.prima.de
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Vista/2471/
 COMMENT=	Mixer designed for WindowMaker (dockapp)
 
+WRKSRC=			${WRKDIR}/wmmixer
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 136a2841816..482c923d550 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/08/16 03:12:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:43 agc Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
 DISTNAME=	xamp-0.8-10
 PKGNAME=	xamp-0.8.10
-WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
 CATEGORIES=	audio
 MASTER_SITES=	http://andrej.co.ru/~andrej/programs/xamp/ \
 		http://andrej.co.ru/~andrej/programs/xamp/backs/
@@ -17,6 +16,7 @@ COMMENT=	Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
 
 DEPENDS+=	qt1-1.44:../../x11/qt1
 
+WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
 DIST_SUBDIR=	xamp
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 7212e2a80be..7a7134e8126 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/20 12:07:43 agc Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    3
-WRKSRC=		${WRKDIR}/xmcd-3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
@@ -14,6 +13,7 @@ PATCH_SITES=		${HOMEPAGE}
 PATCHFILES=		xmcd-3.0.2-proxyauth-patch
 PATCH_DIST_STRIP=	-p1
 
+WRKSRC=		${WRKDIR}/xmcd-3.0
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 79c4dd5f856..dc67c4bae69 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:23:51 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:43 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp
 #
 
 DISTNAME=		xmix-2.1
-WRKSRC=			${WRKDIR}/xmix
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 
@@ -13,6 +12,7 @@ PATCHFILES=		xmix-2.1.mixers.patch
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Mixer for X Window System
 
+WRKSRC=			${WRKDIR}/xmix
 USE_IMAKE=		yes
 
 pre-configure:
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 1b925e4435f..dea478f3c64 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	xmmsarts-0.4
 PKGNAME=	${DISTNAME:S/xmms/xmms-/}
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio kde
 MASTER_SITES=	http://stukach.com/hosted/m.i.a/xmmsarts/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.xmms.org/plugins.php?category=output
 COMMENT=	XMMS plugin to output sound through the aRts sound daemon
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 0933f7b1271..417c299d6b5 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:24:10 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	liveice-xmms
 PKGNAME=	xmms-liveice-1.0.0
 PKGREVISION=	         1
-WRKSRC=         ${WRKDIR}/LiveIce-1.0.0
 CATEGORIES=	audio
 MASTER_SITES=	http://star.arm.ac.uk/~spm/software/
 
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://star.arm.ac.uk/~spm/software/
 COMMENT=	Audio streaming plugin for XMMS
 
+WRKSRC=         	${WRKDIR}/LiveIce-1.0.0
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
diff --git a/audio/xmms-meta-csound/Makefile b/audio/xmms-meta-csound/Makefile
index c8340773b05..ddb30dc267d 100644
--- a/audio/xmms-meta-csound/Makefile
+++ b/audio/xmms-meta-csound/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/01/01 14:03:08 ben Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=		xmms-meta-csound-0.2
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,6 +13,7 @@ COMMENT=		XMMS meta input script for csound
 DEPENDS+=		csound-[bd]*-[0-9]*:../../audio/csound-dev
 DEPENDS+=		sox-[0-9]*:../../audio/sox
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		yes
 
 do-build:
diff --git a/audio/xmms-meta-timidity/Makefile b/audio/xmms-meta-timidity/Makefile
index ba6104c683f..f4efd68917e 100644
--- a/audio/xmms-meta-timidity/Makefile
+++ b/audio/xmms-meta-timidity/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=		xmms-meta-timidity-0.1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,6 +13,7 @@ COMMENT=		XMMS meta input script for timidity
 DEPENDS+=		timidity-[0-9]*:../../audio/timidity
 DEPENDS+=		eawpatches-[0-9]*:../../audio/eawpatches
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		yes
 
 do-build:
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index af702aa2323..b461592786f 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:24:22 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:43 agc Exp $
 #
 
 DISTNAME=	xsidplay-1_5_4
 PKGNAME=	xsidplay-1.5.4
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xsidplay-1.5.4
 CATEGORIES=	audio x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ MAINTAINER=	pooka@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
 COMMENT=	Commodore 64 music player and SID chip emulator for X11
 
+WRKSRC=			${WRKDIR}/xsidplay-1.5.4
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 84fe8eb7e0a..684806559c5 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:08:12 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
 #
 
 DISTNAME=       bonnie
 PKGNAME=	bonnie-2.06
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=   http://www.textuality.com/bonnie/
 
@@ -13,6 +12,7 @@ HOMEPAGE=	http://www.textuality.com/bonnie/index.html
 COMMENT=	Performance Test of Filesystem I/O
 
 NO_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}
 
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 94305fcc5c5..203e8e40ccb 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/09/19 18:08:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:08:12 agc Exp $
 #
 
 DISTNAME=	dbench-1.3
-WRKSRC=		${WRKDIR}/dbench
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://dnuc.polyn.kiae.su/pub/dbench/
 
@@ -10,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://samba.org/ftp/tridge/dbench/README
 COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 
+WRKSRC=		${WRKDIR}/dbench
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index 06088d17bbe..34e1910be21 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		dhry2.1
 PKGNAME=		dhrystone-2.1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://gatekeeper.dec.com/pub/misc/
 EXTRACT_SUFX=		.tar.Z
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		root@garbled.net
 COMMENT=		Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
 	${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${PREFIX}/bin/dry2reg
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index d6aff006ca4..85e561e9965 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/fib/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Mathematical benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/fib.c ${WRKSRC}/fib.c
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 9a3ec83505b..a706ff22b02 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/flops/
 DISTFILES=		${DISTNAME}.c ${DISTNAME}.doc
@@ -11,6 +10,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://performance.netlib.org/performance/html/flops.html
 COMMENT=		Floating point benchmark to give your MFLOPS rating
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/flops.c ${WRKSRC}/flops.c
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 40c17dbd82e..0293e64c148 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/hbench-OS
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.eecs.harvard.edu/pub/hbench-OS/
 
@@ -13,6 +12,7 @@ COMMENT=		Suite of portable benchmarks to measure the OS and the hardware
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 
+WRKSRC=			${WRKDIR}/hbench-OS
 USE_BUILDLINK2=		YES
 OSVERSION_SPECIFIC=	YES
 ALL_TARGET=		build
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 80e8afe7d83..03141ce4951 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:31:03 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/heapsort/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Benchmark program for variable sized arrays
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/heapsort.c ${WRKSRC}/heapsort.c
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index f39ba1c3289..0055c7acd4e 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:24:27 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:08:12 agc Exp $
 # FreeBSD: Makefile,v 1.1.1.1 1998/06/15 18:09:43 ghelmer Exp
 #
 
 DISTNAME=	hint_unix_serial
 PKGNAME=	hint.serial-98.06.12
-WRKSRC=		${WRKDIR}/unix
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/HINT/source/tar/
 EXTRACT_SUFX=	.tar
@@ -15,6 +14,8 @@ COMMENT=	Scalable benchmark for testing CPU and memory performance
 
 ALL_TARGET=	DOUBLE INT
 
+WRKSRC=		${WRKDIR}/unix
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double
 	${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 9d2c472002d..e69fa98d7ab 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/12/13 10:48:33 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		iozone3_211
 PKGNAME=		iozone-3.211
-WRKSRC=			${WRKDIR}/src/current
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.iozone.org/src/current/
 EXTRACT_SUFX=		.tar
@@ -13,6 +12,7 @@ COMMENT=		Benchmark for file read and write speed
 
 RESTRICTED=		"Publication of derivative works not allowed"
 
+WRKSRC=			${WRKDIR}/src/current
 MAKEFILE=		makefile
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile
index 1c27678e37e..1719de35f90 100644
--- a/benchmarks/kttcp/Makefile
+++ b/benchmarks/kttcp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	kttcp-${VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,6 +15,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.6[B-Z]-* NetBSD-1.[7-9]* NetBSD-[2-9]*
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	# defined
 
+WRKSRC=		${WRKDIR}
 MAKE_ENV+=	BINDIR=${LOCALBASE}/bin MANDIR=${LOCALBASE}/man
 
 post-extract:
diff --git a/benchmarks/linpack-bench/Makefile b/benchmarks/linpack-bench/Makefile
index 3d2fd846e98..1e69d2d7967 100644
--- a/benchmarks/linpack-bench/Makefile
+++ b/benchmarks/linpack-bench/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-bench-940225
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/benchmark/
 EXTRACT_SUFX=		# empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		# empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Collection of benchmarks for floating point
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/linpackc ${WRKSRC}/linpack.c
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index c43abfa2cbf..fcb08be9583 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/28 14:40:06 tron Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	netio114
 PKGNAME=	netio-1.14
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/os2/leo/systools/
 EXTRACT_SUFX=	.zip
@@ -13,6 +12,7 @@ COMMENT=	Network benchmark for DOS, OS/2 2.x, Windows NT/2000 and Unix
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}
 MAKE_FLAGS+=	CC="${CC}" CFLAGS="-DUNIX ${CFLAGS}" LFLAGS="${LDFLAGS}" \
 		LIBS="${LIBS}" O=.o OUT=-o X=
 
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index cd4b018600e..29afe2823a0 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		ftp://ftp.nosc.mil/pub/aburto/nsieve/
 EXTRACT_SUFX=		#empty
@@ -10,6 +9,8 @@ EXTRACT_SUFX=		#empty
 MAINTAINER=		root@garbled.net
 COMMENT=		Sieve of Eratosthenes benchmark
 
+WRKSRC=			${WRKDIR}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/nsieve.c ${WRKSRC}/nsieve.c
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index d84d456c728..fc6be0abeb5 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/paranoia/
 EXTRACT_SUFX=		.c
@@ -12,6 +11,8 @@ COMMENT=		Highly paranoid test of IEEE 754 conformancy
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=			${WRKDIR}
+
 do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -ffloat-store -o paranoia paranoia.c -lm)
 
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index db5028cb393..de176e67e80 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:08:12 agc Exp $
 # FreeBSD ID: ports/benchmarks/postmark/Makefile,v 1.2 1999/09/19 05:13:20 obrien Exp
 #
 
 DISTNAME=       postmark-1_5.c
 PKGNAME=	postmark-1.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=   http://www.netapp.com/ftp/
 EXTRACT_SUFX=	#
@@ -15,6 +14,7 @@ COMMENT=	NetApps file system benchmark
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} postmark.c
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
 do-build:
diff --git a/benchmarks/randread/Makefile b/benchmarks/randread/Makefile
index c2db6fb9fce..4d59771eb00 100644
--- a/benchmarks/randread/Makefile
+++ b/benchmarks/randread/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:31:04 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:08:12 agc Exp $
 #
 
 DISTNAME=	randread-0.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=randread/}
 
@@ -11,6 +10,7 @@ HOMEPAGE=	http://randread.sourceforge.net/
 COMMENT=	Program to help benchmark random disk read performance
 
 ALL_TARGET=	randread
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/randread ${PREFIX}/sbin
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index bb7bc3161a6..aa17b3efa16 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:36 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=	ttcp
 PKGNAME=	${DISTNAME}-1.12
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks net
 MASTER_SITES=	http://www.ccci.com/tools/ttcp/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,8 @@ MAINTAINER=	thorpej@NetBSD.org
 HOMEPAGE=	http://www.ccci.com/tools/ttcp/
 COMMENT=	TCP testing and performance measuring tool
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 MANCOMPRESSED_IF_MANZ=	YES
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 61ca6c167ad..7676d814d3d 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:08:12 agc Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
-WRKSRC=			${WRKDIR}
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.netlib.org/benchmark/
 EXTRACT_SUFX=		.c
@@ -11,6 +10,7 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Benchmark for processors that gives you a MIPS rating
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
+WRKSRC=			${WRKDIR}
 
 do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o whetstone whetstone.c -lm)
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 5829fd5637d..503524006e0 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/20 09:54:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:08:12 agc Exp $
 # FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp
 
 DISTNAME=	xengine-1.0.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/comp.sources.x/volume09/xengine/
 DISTFILES=	part01.z patch1.z
@@ -15,6 +14,7 @@ COMMENT=	Reciprocating engine for X
 
 BUILD_DEPENDS=	gsharutils>=4.2.1:../../archivers/gsharutils
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	xengine
 USE_IMAKE=	yes
 
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index e8edcb33d37..f225d91d010 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:41:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:08:40 agc Exp $
 
 DISTNAME=	clustalw1.8.UNIX
 PKGNAME=	clustalw-1.8
-WRKSRC=		${WRKDIR}/clustalw1.8
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp-igbmc.u-strasbg.fr/pub/ClustalW/ \
 		ftp://ftp.ebi.ac.uk/pub/software/unix/clustalw/
@@ -13,6 +12,7 @@ COMMENT=	General purpose multiple alignment program for DNA or proteins
 
 MAKEFILE=	makefile
 ALL_TARGET=	clustalw
+WRKSRC=		${WRKDIR}/clustalw1.8
 
 post-patch:
 	@${SED} -e 's:@PREFIX@:${PREFIX}:' < ${WRKSRC}/clustalw.c \
diff --git a/biology/coalesce/Makefile b/biology/coalesce/Makefile
index 1c46cde2dd1..e8835d1618a 100644
--- a/biology/coalesce/Makefile
+++ b/biology/coalesce/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/30 01:03:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=	coalesce1.5b
 PKGNAME=	coalesce-1.5.0.2
-WRKSRC=		${WRKDIR}/coalesce1.5beta
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/lamarc/coalesce/
 
@@ -11,6 +10,7 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://evolution.genetics.washington.edu/lamarc/coalesce.html
 COMMENT=	Estimates effective population size and mutation rate
 
+WRKSRC=		${WRKDIR}/coalesce1.5beta
 USE_BUILDLINK2=	YES
 ALL_TARGET=	coalesce
 
diff --git a/biology/fastDNAml/Makefile b/biology/fastDNAml/Makefile
index 90ff1fabc62..8503dc2dc1e 100644
--- a/biology/fastDNAml/Makefile
+++ b/biology/fastDNAml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:41:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:08:40 agc Exp $
 
 DISTNAME=	fastDNAml_1.2.1
 PKGNAME=	fastDNAml-1.2.1
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	biology
 MASTER_SITES=	http://geta.life.uiuc.edu/~gary/programs/fastDNAml/
 
@@ -14,6 +13,8 @@ RESTRICTED=	"No commercial distribution without a royalty agreement with the aut
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 do-build :
 	@ cd ${WRKSRC}/source && ${MAKE} LDFLAGS=-lm fastDNAml
 
diff --git a/biology/fluctuate/Makefile b/biology/fluctuate/Makefile
index 99c8a1cd405..5fcdfbfc7b4 100644
--- a/biology/fluctuate/Makefile
+++ b/biology/fluctuate/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/30 01:19:31 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=	fluctuate1.4.src.doc
 PKGNAME=	fluctuate-1.4
-WRKSRC=		${WRKDIR}/fluctuate1.4
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/lamarc/fluctuate/
 
@@ -11,6 +10,7 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://evolution.genetics.washington.edu/lamarc/fluctuate.html
 COMMENT=	Estimation of population growth rate
 
+WRKSRC=		${WRKDIR}/fluctuate1.4
 USE_BUILDLINK2=	YES
 ALL_TARGET=	fluctuate
 
diff --git a/biology/genesplicer/Makefile b/biology/genesplicer/Makefile
index 04175e10d3e..cb98cb2f814 100644
--- a/biology/genesplicer/Makefile
+++ b/biology/genesplicer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/30 01:57:08 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		GeneSplicer
 PKGNAME=		genesplicer-20030403
-WRKSRC=			${WRKDIR}/GeneSplicer/sources
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.tigr.org/pub/software/GeneSplicer/
 
@@ -16,6 +15,7 @@ EXAMPLES=		arabidopsis drosophila malaria pyoelii human rice \
 			training_data_sets/Arabidopsis			  \
 			training_data_sets/Human
 MAKEFILE=		makefile
+WRKSRC=			${WRKDIR}/GeneSplicer/sources
 USE_BUILDLINK2=		yes
 
 do-install:
diff --git a/biology/glimmer/Makefile b/biology/glimmer/Makefile
index 4483ae0da18..d53ffdfecc9 100644
--- a/biology/glimmer/Makefile
+++ b/biology/glimmer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/10/07 18:20:15 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		glimmer212
 PKGNAME=		glimmer-2.12
-WRKSRC=                 ${WRKDIR}/glimmer2.12
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.tigr.org/pub/software/Glimmer/
 
@@ -12,6 +11,7 @@ HOMEPAGE=		ftp://ftp.tigr.org/pub/software/Glimmer/
 COMMENT=		System for finding genes in microbial DNA
 
 USE_BUILDLINK2=		yes
+WRKSRC=                 ${WRKDIR}/glimmer2.12
 
 do-install:
 .for PROGRAM in adjust anomaly build-icm check codon-usage compare-lists \
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index f13cb9ab0d8..f626eb4de5e 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/09/26 05:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		hmmer-2.3.1
-WRKSRC=			${WRKDIR}/hmmer-2.3.1
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/2.3.1/
 
@@ -10,6 +9,7 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://hmmer.wustl.edu/
 COMMENT=		Implementation of profile HMM software for protein sequence analysis
 
+WRKSRC=			${WRKDIR}/hmmer-2.3.1
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index af83ff789c7..9655eb6a6f5 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/27 22:24:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		MUMmer3.04
 PKGNAME=		mummer-3.04
-WRKSRC=			${WRKDIR}/${DISTNAME}
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.tigr.org/pub/software/MUMmer/
 
@@ -11,6 +10,7 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://www.tigr.org/software/mummer/
 COMMENT=		System for aligning whole genome sequences
 
+WRKSRC=			${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 
diff --git a/biology/pdbalign/Makefile b/biology/pdbalign/Makefile
index 0cba27571cd..e91b270d53c 100644
--- a/biology/pdbalign/Makefile
+++ b/biology/pdbalign/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 03:15:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		pdbalign
 PKGNAME=		pdbalign-20030812
-WRKSRC=			${WRKDIR}
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.ebi.ac.uk/pub/software/unix/pdbalign/
 
@@ -11,6 +10,8 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=               #empty
 COMMENT=		Prediction of Protein Secondary Structure and Active Sites
 
+WRKSRC=			${WRKDIR}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pdbalign ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/distalign ${PREFIX}/bin
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index 1418f923908..912ba1e7415 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:08:40 agc Exp $
 
 DISTNAME=	phylip
 PKGNAME=	phylip-3.573c
-WRKSRC=		${WRKDIR}
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/phylip/ \
 		ftp://ftp.bioss.sari.ac.uk/pub/phylogeny/phylip/
@@ -16,6 +15,8 @@ RESTRICTED=		"No commercial distribution without a royalty agreement with the au
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phylip
 .for DOC in main.doc	\
diff --git a/biology/profit/Makefile b/biology/profit/Makefile
index 08ac873321a..7e76d0f7140 100644
--- a/biology/profit/Makefile
+++ b/biology/profit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/27 23:18:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		profit
 PKGNAME=		profit-2.2
-WRKSRC=			${WRKDIR}/ProFitV2.2/src
 CATEGORIES=		biology
 MASTER_SITES=		http://www.rubic.rdg.ac.uk/~andrew/bioinf.org/software/profit/235216/
 
@@ -13,6 +12,7 @@ COMMENT=		Performs least squares fits of two protein structures
 
 ALL_TARGET=		${DISTNAME}
 USE_BUILDLINK2=		YES
+WRKSRC=			${WRKDIR}/ProFitV2.2/src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/profit ${PREFIX}/bin
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index b888c5bc8d7..64f05f8e095 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:00 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:08:40 agc Exp $
 
 DISTNAME=	RasMol_2.7.1
 PKGNAME=	rasmol-2.7.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.bernstein-plus-sons.com/software/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.bernstein-plus-sons.com/software/rasmol/
 COMMENT=	Molecular Graphics Visualisation Tool
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/biology/sewer/Makefile b/biology/sewer/Makefile
index fc3b97736bc..e5a05c1dbcc 100644
--- a/biology/sewer/Makefile
+++ b/biology/sewer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/27 23:36:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 
 DISTNAME=		sewer
 PKGNAME=		sewer-2.6
-WRKSRC=			${WRKDIR}
 CATEGORIES=		biology
 MASTER_SITES=		ftp://iubio.bio.indiana.edu/molbio/analyze/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ COMMENT=		SEquence Analysis using WEb Resources
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 
 pre-install:
diff --git a/biology/stride/Makefile b/biology/stride/Makefile
index 9a9b15275b2..946fb093705 100644
--- a/biology/stride/Makefile
+++ b/biology/stride/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/27 23:46:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		stride
 PKGNAME=		stride-20030804
-WRKSRC=			${WRKDIR}
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/
 
@@ -11,6 +10,7 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://www-db.embl-heidelberg.de/jss/servlet/de.embl.bk.wwwTools.GroupLeftEMBL/argos/stride/stride_info.html
 COMMENT=		Protein secondary structure assignment from atomic coordinates
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 
 do-install:
diff --git a/biology/xylem/Makefile b/biology/xylem/Makefile
index 81560ebe373..c3d096ffa86 100644
--- a/biology/xylem/Makefile
+++ b/biology/xylem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/10/04 19:13:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:08:40 agc Exp $
 #
 
 DISTNAME=		xylem.1.8.7
 PKGNAME=		xylem-1.8.7
-WRKSRC=                 ${WRKDIR}/xylem/src.c
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.cc.umanitoba.ca/psgendb/
 EXTRACT_SUFX=		.tar.Z
@@ -12,6 +11,7 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://home.cc.umanitoba.ca/~psgendb/XYLEM.html
 COMMENT=		Tools for manipulation of genetic databases
 
+WRKSRC=                 ${WRKDIR}/xylem/src.c
 USE_BUILDLINK2=		YES
 
 do-configure:
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 26e7deabe71..71a7e50238f 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:32:10 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=		eagle-4.09r2e
 PKGNAME=		eagle-4.09r2
-WRKSRC=			${WRKDIR}/${DISTNAME:C/.$//}
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.cadsoft.de/pub/program/4.09r2/
 EXTRACT_SUFX=		.tgz
@@ -24,6 +23,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/.$//}
 NO_BUILD=		YES
 
 do-configure:
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index a3d4891e2eb..5a0106a7d18 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:02 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	fastcap-2.0-15Jul92
 PKGNAME=	fastcap-2.0.19920715
-WRKSRC=		${WRKDIR}/fastcap
 CATEGORIES=	cad
 MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fastcap/ \
 		ftp://rle-vlsi.mit.edu/pub/fastcap/postscript/
@@ -19,6 +18,7 @@ COMMENT=	Fast 3-D capacitance solver
 DIST_SUBDIR=	fastcap
 EXTRACT_ONLY=	fastcap-2.0-15Jul92.tar.Z
 
+WRKSRC=		${WRKDIR}/fastcap
 USE_BUILDLINK2=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 65d36b31776..483e11b4478 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/09/17 19:40:03 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
 PKGNAME=	fasthenry-3.0.19961112
-WRKSRC=		${WRKDIR}/fasthenry-3.0
 CATEGORIES=	cad
 MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fasthenry/
 EXTRACT_SUFX=	.tar.Z
@@ -19,6 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/fasthenry-3.0
 USE_BUILDLINK2=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index d2bdfe1d67e..44cda734171 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:24:54 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:09:09 agc Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
-WRKSRC=			${WRKDIR}/FElt-3.05
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/felt/
 DISTFILES=		felt-3.05.src.tar.gz felt-3.05.ps.gz
@@ -13,6 +12,7 @@ COMMENT=		Free system for introductory level finite element analysis
 
 EXTRACT_ONLY=		felt-3.05.src.tar.gz
 
+WRKSRC=			${WRKDIR}/FElt-3.05
 USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
 XAW_TYPE?=		3d
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 039f7fb5412..49970e3d343 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/02 18:11:06 reinoud Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:09:09 agc Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=qcad/}
 
@@ -11,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 4c9f037fd27..374141371fa 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:21 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	simian_man_12_98
 PKGNAME=	simian-docs-2.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_mnl_ps_pdf/
 EXTRACT_SUFX=	.pdf
@@ -18,6 +17,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 6659ab3aa9f..fd71085cb98 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:25:21 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	simian_12_98
 PKGNAME=	simian-2.1
-WRKSRC=		${WRKDIR}/Simian/src
 CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/CODE_RQST/
 
@@ -18,6 +17,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/Simian/src
+
 ALL_TARGET=	simian
 
 INTERACTIVE_STAGE=	fetch
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 338fa63e844..d45d88ac393 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 21:25:22 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:09:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
 #
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
 EXTRACT_SUFX=   .tar.Z
@@ -17,6 +16,7 @@ CONFLICTS=	ng-spice-[0-9]*
 
 BUILDLINK_DEPENDS.readline=	readline>=4.0
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_GNU_READLINE=	uses rl_* interface
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile
index 03b15efe185..72679c56c5f 100644
--- a/cad/spiceprm/Makefile
+++ b/cad/spiceprm/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:25:23 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:09:09 agc Exp $
 #
 
 DISTNAME=	spiceprm-0.11
-WRKSRC=		${WRKDIR}/spiceprm
 CATEGORIES=	cad
 MASTER_SITES=	http://metalab.unc.edu/pub/Linux/apps/circuits/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Spice preprocessor for parameterized subcircuits
 
+WRKSRC=			${WRKDIR}/spiceprm
 USE_BUILDLINK2=		YES
 NO_BUILD=		YES
 REPLACE_PERL=		spiceprm
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index 2f988a34b42..be1588d93f6 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:28 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:10 agc Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
-WRKSRC=			${WRKDIR}
 CATEGORIES=		cad editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from
@@ -12,6 +11,8 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.verilog.com/verilog-mode.html
 COMMENT=		Verilog mode for Emacs
 
+WRKSRC=			${WRKDIR}
+
 .include "../../mk/emacs.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 0df318c1c3c..2051ac5e958 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2003/08/31 02:02:30 jtb Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:09:10 agc Exp $
 
 DISTNAME=	xcircuit-3.1.19
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/
 COMMENT=	Drawing program for X11 (especially for circuits)
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcl
diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index 586c3c12d79..bdbfe622ac2 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:25:32 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=	aim-1.5.277
-WRKSRC=		${WRKDIR}
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.newaol.com/aimgen/73010/
 EXTRACT_SUFX=	-1.i386.rpm
@@ -18,6 +17,7 @@ DEPENDS+=	suse_gtk>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_gtk
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386
 
+WRKSRC=		${WRKDIR}
 CHECK_SHLIBS=	NO
 NO_BUILD=	YES
 
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 1fa077a2308..29489162cd9 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/01/03 18:49:35 reed Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	ircii-pana-1.0c19
 PKGNAME=	bitchx-1.0.3.19
 PKGREVISION=	5
-WRKSRC=		${WRKDIR}/BitchX
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.bitchx.org/pub/BitchX/source/ \
 		ftp://ftp.bitchx.org/pub/BitchX/source/old/
@@ -13,6 +12,7 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.bitchx.org/
 COMMENT=	IRC client based on ircII
 
+WRKSRC=		${WRKDIR}/BitchX
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
diff --git a/chat/fisg/Makefile b/chat/fisg/Makefile
index e77bae10cee..0ff93eca451 100644
--- a/chat/fisg/Makefile
+++ b/chat/fisg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:13:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=		fisg-0.2.0
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		chat textproc
 MASTER_SITES=		http://www.tnsp.org/files/
 
@@ -9,6 +8,7 @@ MAINTAINER=		snj@pobox.com
 HOMEPAGE=		http://www.tnsp.org/fisg.php
 COMMENT=		Fast IRC statistics generator
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 
diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile
index cc17823214b..856c29af03d 100644
--- a/chat/i2cb/Makefile
+++ b/chat/i2cb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:25:48 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	i2cb-6.0_ALPHA
-WRKSRC=		${WRKDIR}/icb
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -10,6 +9,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.draga.com/~jwise/i2cb/
 COMMENT=	Next generation Internet Citicen's Band chat client
 
+WRKSRC=		${WRKDIR}/icb
 USE_BUILDLINK2=		yes
 USE_GNU_READLINE=	yes
 
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 23ac408b525..24d7d88e5dc 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/01/05 11:16:31 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
-WRKSRC=			${WRKDIR}/ircii-${VERS}
 CATEGORIES=		chat
 MASTER_SITES=		ftp://ircii.warped.com/pub/ircII/ \
 			ftp://ircftp.au.eterna.com.au/pub/ircII/ \
@@ -21,6 +20,7 @@ PLIST_SUBST+= 		VERS=${VERS}
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=			${WRKDIR}/ircii-${VERS}
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 .if defined(DEFAULT_IRC_SERVER)
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 5c80fdcd240..f7d7afdfb4a 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:25:54 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	ircu2.10.11.04
 PKGNAME=	ircu-2.10.11.04
-WRKSRC=		${WRKDIR}/ircu2.10
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://coder-com.undernet.org/
 COMMENT=	Internet Relay Chat server customized for Undernet
 
+WRKSRC=		${WRKDIR}/ircu2.10
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index 2b26f2bfcdf..eeb61816cde 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 20:20:54 veego Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	irssi-icb-0.14
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	http://www.irssi.org/files/plugins/icb/
 DISTFILES=	${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
@@ -12,6 +11,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.irssi.org/
 COMMENT=	Irssi plugin to access ICB networks
 
+WRKSRC=		${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
+
 .include "${.CURDIR}/../../chat/irssi/Makefile.common"
 
 DEPENDS+=	irssi>=${IRSSI_VERSION}:../../chat/irssi
diff --git a/chat/p5-Net-AOLIM/Makefile b/chat/p5-Net-AOLIM/Makefile
index cf513ab811b..a3fb3172825 100644
--- a/chat/p5-Net-AOLIM/Makefile
+++ b/chat/p5-Net-AOLIM/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:34:33 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	Net-AOLIM-1.4
 PKGNAME=	p5-${DISTNAME}
-WRKSRC=		${WRKDIR}/Net-AOLIM
 CATEGORIES=	chat perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://www.phonon.net/pub/Net-AOLIM/
 COMMENT=	Perl5 module for connecting to AOL IM (TOC protocol)
 
+WRKSRC=		${WRKDIR}/Net-AOLIM
 USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/AOLIM/.packlist
 
diff --git a/chat/tik/Makefile b/chat/tik/Makefile
index 11c5a608f4a..b3673c5da99 100644
--- a/chat/tik/Makefile
+++ b/chat/tik/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:26:19 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=		tik-0.90
-WRKSRC=			${WRKDIR}/tik
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tik/}
 
@@ -12,6 +11,7 @@ COMMENT=		Tcl/Tk AOL Instant Messenger client
 
 DEPENDS+=		tk>=8.1:../../x11/tk
 
+WRKSRC=			${WRKDIR}/tik
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/chat/tkicb/Makefile b/chat/tkicb/Makefile
index 78f07d53c3e..3ddd10a1c71 100644
--- a/chat/tkicb/Makefile
+++ b/chat/tkicb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:26:21 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	icb.2.1.4
 PKGNAME=	tkicb-2.1.4
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	chat x11
 MASTER_SITES=	ftp://shoshin.armory.com/pub/
 EXTRACT_SUFX=	.tar.Z
@@ -19,6 +18,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/chat/tkirc/Makefile b/chat/tkirc/Makefile
index edf05b8a72f..10ac831b47f 100644
--- a/chat/tkirc/Makefile
+++ b/chat/tkirc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:26:22 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
-WRKSRC=		${WRKDIR}/tkirc
 CATEGORIES=	chat x11
 MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 
@@ -13,6 +12,7 @@ COMMENT=	GUI for the ircII Internet Relay Chat client
 DEPENDS+=	ircII-[0-9]*:../../chat/ircII
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
+WRKSRC=		${WRKDIR}/tkirc
 USE_X11=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/chat/tkirc2/Makefile b/chat/tkirc2/Makefile
index 242af9723e1..fd314ed84f2 100644
--- a/chat/tkirc2/Makefile
+++ b/chat/tkirc2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:26:24 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=	tkirc2.46
 PKGNAME=	tkirc2-2.46
-WRKSRC=		${WRKDIR}/tkirc2
 CATEGORIES=	chat x11
 MASTER_SITES=	ftp://ftp.netsplit.de/pub/tcltk/
 
@@ -13,6 +12,7 @@ COMMENT=	GUI for the ircII Internet Relay Chat client
 DEPENDS+=	ircII-[0-9]*:../../chat/ircII
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
+WRKSRC=		${WRKDIR}/tkirc2
 USE_X11=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/chat/vicq/Makefile b/chat/vicq/Makefile
index 01c1a256b25..e19a7bf2472 100644
--- a/chat/vicq/Makefile
+++ b/chat/vicq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:34:34 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:09:35 agc Exp $
 
 DISTNAME=	vicq-0.4.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/vicq
 CATEGORIES=	chat
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ COMMENT=	Simple icq client written in perl
 
 DEPEND+=	p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine
 
+WRKSRC=			${WRKDIR}/vicq
 USE_BUILDLINK2=		YES
 NO_BUILD=		YES
 
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index 01e2b7dbe38..9a7a194176d 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:09:35 agc Exp $
 #
 
 DISTNAME=	zephyr-20010518
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/zephyr
 CATEGORIES=	chat net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/
 
@@ -11,6 +10,7 @@ MAINTAINER=	sommerfeld@NetBSD.org
 HOMEPAGE=	http://web.mit.edu/olh/Zephyr/index.html
 COMMENT=	Project Athena's original Instant Messaging system
 
+WRKSRC=		${WRKDIR}/zephyr
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 92b7222c1d1..68db3fdc9a1 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2002/12/24 18:53:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=		binkd094
 PKGNAME=		binkd-0.9.4
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		comms
 MASTER_SITES=		http://www.corbina.net/~maloff/binkd/ \
 			ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
@@ -14,6 +13,7 @@ MAINTAINER=		tv@pobox.com
 HOMEPAGE=		http://www.corbina.net/~maloff/binkd/
 COMMENT=		FidoNet-over-IP transport program utilizing BINKP protocol
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index 3a339b94d47..5d1d67cfe31 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:35:12 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	dl-ezkit-0.8.1-bsd
 PKGNAME=        dl-ezkit-0.8.1
-WRKSRC=		${WRKDIR}/dl-ezkit
 CATEGORIES=	comms
 MASTER_SITES=	http://www.ww.tu-freiberg.de/~pberg/download/Unix-sources/
 
@@ -12,6 +11,7 @@ COMMENT=	Coff file downloader for the EZ-KIT Lite using the RS232
 
 MAKEFILE=	Makefile.bsd
 
+WRKSRC=		${WRKDIR}/dl-ezkit
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 24f15ec7ee9..3e9c4b18451 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:26:39 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=		efax-gtk-1.0.1b.src
 PKGNAME=		efax-gtk-1.0.1b
 PKGREVISION=		5
-WRKSRC=			${WRKDIR}/efax-gtk
 CATEGORIES=		comms
 MASTER_SITES=		http://www.cvine.freeserve.co.uk/efax-gtk/
 EXTRACT_SUFX=		.tgz
@@ -14,6 +13,7 @@ COMMENT=		GTK frontend for efax
 
 DEPENDS+=		efax>=0.9:../../comms/efax
 
+WRKSRC=			${WRKDIR}/efax-gtk
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2= 	YES
 USE_PKGINSTALL=		YES
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 7215c2974d5..4db7facf0d2 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/12/28 21:54:31 tron Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	estic-1.61
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/misc/isdn/linux/estic/
 EXTRACT_SUFX=	.zip
@@ -17,6 +16,7 @@ RESTRICTED=	"Only free distribution permitted"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 62746f91caf..95cad797ec6 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/26 12:54:55 cjep Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=	gkermit
 PKGNAME=	gkermit-1.00
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -14,6 +13,7 @@ COMMENT=	Minimal implementation of the ``kermit'' protocol (GPL'd)
 
 DIST_SUBDIR=	gkermit-1.00
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 ALL_TARGET=	posix
 MAKEFILE=	makefile
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 8a46cb3edce..6641efbc646 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2003/11/16 12:21:33 agc Exp $
+# $NetBSD: Makefile,v 1.50 2004/01/20 12:10:01 agc Exp $
 # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
 #
 
 DISTNAME=	cku209
 PKGNAME=	kermit-8.0.209
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -17,6 +16,7 @@ LICENSE=	kermit-license
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 BUILD_DEFS+=	KERMIT_SUID_UUCP KFLAGS LIBS MANINSTALL
 MAKE_ENV+=	KFLAGS="${KFLAGS}" LIBS="${LIBS}"
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 84907330e58..fd34f7850d8 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:35:14 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S/-/_/}.src
 PKGNAME=	malsync-2.1.1
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/malsync
 CATEGORIES=	comms
 MASTER_SITES=	http://www.tomw.org/malsync/
 
@@ -12,6 +11,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.tomw.org/malsync/
 COMMENT=	Utility to synchronize Palm Pilots to the AvantGo.com service
 
+WRKSRC=		${WRKDIR}/malsync
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index d4c850299fe..4cf893211a4 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
 DISTNAME=	mgetty1.1.30-Dec16
 PKGNAME=	mgetty-1.1.30
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
 		ftp://alpha.greenie.net/pub/mgetty/source/1.1/
@@ -18,6 +17,7 @@ BUILD_DEPENDS+=	texi2roff-[0-9]*:../../textproc/texi2roff
 
 CONFLICTS=	hylafax-[0-9]*
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 
 USE_PKGINSTALL=		yes
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9629caab14f..97a21356f6d 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 21:26:52 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	minicom-1.83.1.src
 PKGNAME=	${DISTNAME:S/.src//}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 #MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} \
@@ -17,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS+=	gkermit-[0-9]*:../../comms/gkermit
 DEPENDS+=	lrzsz-[0-9]*:../../comms/lrzsz
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 28eac235c6f..b183714ed87 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/07/21 16:35:16 martti Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 PKGNAME=	pilotmgr-1.107.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +16,7 @@ DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 DEPENDS+=	p5-pilot-link-[0-9]*:../p5-pilot-link
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 HAS_CONFIGURE=		YES
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index 5bc37999ce9..6cb0bcca03a 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 16:35:16 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $
 
 DISTNAME=	snooper-19991202
-WRKSRC=		${WRKDIR}/snooper/build
 CATEGORIES=	comms
 MASTER_SITES=   ftp://ftp.foretune.co.jp/pub/tools/snooper/
 
 MAINTAINER=	itojun@itojun.org
 COMMENT=	Serial line protocol analyzer (need two serial interfaces)
 
+WRKSRC=		${WRKDIR}/snooper/build
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 0399e3dee51..ecdb5bc3958 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:27:02 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/08/07 23:56:12 asami Exp
 #
 
 DISTNAME=	tkhylafax-3.1
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/tkhylafax
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.sgi.com/sgi/fax/contrib/tkhylafax/ \
 		ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/ \
@@ -18,4 +17,6 @@ DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	hylafax>=4.1:../../comms/hylafax
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
+WRKSRC=		${WRKDIR}/tkhylafax
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/bbcim/Makefile b/converters/bbcim/Makefile
index f0a3f3ba290..43436c881ff 100644
--- a/converters/bbcim/Makefile
+++ b/converters/bbcim/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:36:11 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:10:28 agc Exp $
 #
 
 DISTNAME=       bbcim095-5
 PKGNAME=        bbcim-0.95b5
-WRKSRC=		${WRKDIR}/bbcim
 CATEGORIES=	converters
 MASTER_SITES=	http://www.nvg.ntnu.no/bbc/util/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	skrll@NetBSD.org
 COMMENT=	File and diskimage conversion utility for BBC Micro software
 
+WRKSRC=		${WRKDIR}/bbcim
 MAN_PAGE=	${FILESDIR}/bbcim.1
 
 do-build:
diff --git a/converters/bib2xml/Makefile b/converters/bib2xml/Makefile
index d4d634a1e8f..80f5b5e87d7 100644
--- a/converters/bib2xml/Makefile
+++ b/converters/bib2xml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:09 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=	bib2xml-10062002
 PKGNAME=	${DISTNAME:C/-(....)(....)/-\2\1/}
-WRKSRC=		${WRKDIR}/bib2xml
 CATEGORIES=	converters textproc
 MASTER_SITES=	http://www.cs.colorado.edu/~henkel/stuff/bib2xml/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.colorado.edu/~henkel/stuff/bib2xml/
 COMMENT=	BibTeX to XML converter
 
+WRKSRC=		${WRKDIR}/bib2xml
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 BUILD_DIRS=	${WRKSRC}/progs
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index cbc2b16d79e..f6b28528333 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:36:12 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	cn2jp1.4b
 PKGNAME=	cn2jp-1.4b
-WRKSRC=		${WRKDIR}/cn2jp
 CATEGORIES=	converters
 MASTER_SITES=	http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
 
@@ -10,6 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
 COMMENT=	Library for code translation between Chinese and Japanese
 
+WRKSRC=		${WRKDIR}/cn2jp
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index 1682b6de69a..7c61ac74c3e 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:27:19 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	macfork-1.0
-WRKSRC=		${WRKDIR}/macfork
 CATEGORIES=	converters
 MASTER_SITES=	http://www.cs.cmu.edu/~ajw/public/dist/
 
@@ -9,6 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
+WRKSRC=		${WRKDIR}/macfork
 USE_BUILDLINK2=	# defined
 USE_GCC_SHLIB=	# defined
 USE_GMAKE=	# defined
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 9438a626b21..fb8081911f0 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:27:20 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
 #
 
 DISTNAME=	mpack-1.5-src
 PKGNAME=	mpack-1.5
-WRKSRC=		${WRKDIR}/mpack
 CATEGORIES=	converters mail news
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	External MIME packer/unpacker
 
+WRKSRC=		${WRKDIR}/mpack
 USE_BUILDLINK2=	# defined
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/converters/p5-jcode/Makefile b/converters/p5-jcode/Makefile
index 02e4bfca78d..3219901d1aa 100644
--- a/converters/p5-jcode/Makefile
+++ b/converters/p5-jcode/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:27:26 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1999/01/17 10:56:40 vanilla Exp $
 
 DISTNAME=	jcode.pl-2.13
 PKGNAME=	p5-jcode-2.13
 SVR4_PKGNAME=	p5jc2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese converters
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
@@ -14,6 +13,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	Perl library for Japanese character code conversion
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 
 NO_BUILD=		# defined
diff --git a/converters/p5-nkf/Makefile b/converters/p5-nkf/Makefile
index d64d81cc535..a45529cefc9 100644
--- a/converters/p5-nkf/Makefile
+++ b/converters/p5-nkf/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:27:28 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=	nkf-1.7
 PKGNAME=	p5-nkf-1.7
 SVR4_PKGNAME=	p5nkf
-WRKSRC=		${WRKDIR}/${DISTNAME}/NKF
 CATEGORIES=	japanese converters
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/nkf/
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Perl library for Network Kanji code conversion Filter
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/NKF
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/NKF/.packlist
 
diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile
index 5d40c325be5..2693941b779 100644
--- a/converters/py-zhCodecs/Makefile
+++ b/converters/py-zhCodecs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/21 09:41:53 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	ChineseCodecs1.2.0
 PKGNAME=	${PYPKGPREFIX}-zhCodecs-1.2.0
-WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 CATEGORIES=	converters devel
 MASTER_SITES=	ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/ \
 		ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/
@@ -11,6 +10,7 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/python-codecs/
 COMMENT=	Python Unicode codecs for Chinese charsets
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
 USE_BUILDLINK2=	yes
diff --git a/converters/qkc/Makefile b/converters/qkc/Makefile
index b0f5e2e6663..983d50711b4 100644
--- a/converters/qkc/Makefile
+++ b/converters/qkc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:10:29 agc Exp $
 # FreeBSD: ports/japanese/qkc/Makefile,v 1.15 2001/05/10 11:42:23 max Exp
 
 DISTNAME=	qkcc100
 PKGNAME=	qkc-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese converters
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA000501/
 EXTRACT_SUFX=	.zip
@@ -12,6 +11,7 @@ MAINTAINER=	hiramatu@boreas.dti.ne.jp
 HOMEPAGE=	http://hp.vector.co.jp/authors/VA000501/
 COMMENT=	Quick Kanji code Converter
 
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	qkc
 
 do-install:
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index 3f8b8cd09b3..5ee6f961756 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:27:33 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp
 
 DISTNAME=	rpm2cpio
 PKGNAME=	rpm2cpio-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc
 MASTER_SITES=	http://www.iagora.com/~espel/
 EXTRACT_SUFX=	# none
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.iagora.com/~espel/index.html
 COMMENT=	Convert .rpm files for extraction with cpio, needs just perl
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 DIST_SUBDIR=	${PKGNAME}
diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index f50c8d7a4a5..94cdb0f3ac1 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:37 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 # FreeBSD: ports/japanese/ruby-uconv/Makefile,v 1.8 2001/01/30 19:26:22 knu Exp
 
 DISTNAME=	uconv-0.4.9
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC=		${WRKDIR}/uconv
 CATEGORIES=	japanese converters
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -11,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.yoshidam.net/Ruby.html#uconv
 COMMENT=	Unicode conversion library with Japanese codesets support
 
+WRKSRC=		${WRKDIR}/uconv
 DIST_SUBDIR=	ruby
 USE_RUBY=	yes
 USE_RUBY_EXTCONF= yes
diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile
index e67b27f60f1..417d909a58f 100644
--- a/converters/tex2rtf/Makefile
+++ b/converters/tex2rtf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=		tex2rtf164_source
 PKGNAME=		tex2rtf-164
-WRKSRC=			${WRKDIR}/src
 CATEGORIES=		converters textproc
 MASTER_SITES=		ftp://www.remstar.com/pub/wxwin/tex2rtf/	\
 			ftp://ftp.sunet.se/pub7/lang/wxwin/tex2rtf/
@@ -12,6 +11,8 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://web.ukonline.co.uk/julian.smart/tex2rtf/
 COMMENT=		LaTex-to-RTF translator
 
+WRKSRC=			${WRKDIR}/src
+
 do-build:
 	cd ${WRKSRC} && make -f makefile.unx nogui
 
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 733cba4df5a..7da0ee10bc6 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:27:40 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: ports/converters/unix2dos/Makefile,v 1.5 2000/07/04 10:31:42 sobomax Exp
 
 DISTNAME=	unix2dos-1.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	converters
 MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/		\
 		ftp://ftp.guug.org/pub/
@@ -10,6 +9,7 @@ MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/		\
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 0428b167fa1..8c4d1256a9e 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/07/17 21:27:42 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=       uudeview-0.5.18
 PKGNAME=        uulib-0.5.18
-WRKSRC=		${WRKDIR}/${DISTNAME}/uulib
 CATEGORIES=	converters
 MASTER_SITES=	http://www.fpx.de/fp/Software/UUDeview/download/
 
@@ -14,6 +13,7 @@ COMMENT=	Library for uu/xx/Base64/BinHex de-/encoding
 # "kdesupport-2.1b" included "uu" library.
 CONFLICTS=	kdesupport-2.1b
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/uulib
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 USE_LIBTOOL=	# defined
diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile
index 9f0b62c8f11..67f796036e2 100644
--- a/converters/xlhtml/Makefile
+++ b/converters/xlhtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=		xlhtml.0.5.1
 PKGNAME=		${DISTNAME:S/./-/}
-WRKSRC=			${WRKDIR}/xlhtml
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chicago/}
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://chicago.sourceforge.net/xlhtml/
 COMMENT=		Microsoft xls/ppt to HTML converter
 
+WRKSRC=			${WRKDIR}/xlhtml
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=      	YES
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index b56bd6ae7d7..ee791c1989a 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:27:49 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:55 agc Exp $
 
 DISTNAME=	bfd-crunchide-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cross
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,6 +10,7 @@ COMMENT=	crunchide using libbfd. Used for cross-building distributions
 
 DEPENDS=	cross-binutils>=2.9.1.1:../binutils
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index cab930d5f52..9a1e9dd1481 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:27:50 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:55 agc Exp $
 
 DISTNAME=	bfd-mdsetimage-1.15.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	cross
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,6 +10,7 @@ COMMENT=	mdsetimage using libbfd. Used for cross-building distributions
 
 DEPENDS=	cross-binutils>=2.9.1.1:../binutils
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 1f5c9007cc8..1efb9e72962 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/11/05 23:32:11 seb Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:10:55 agc Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
-WRKSRC=			${WRKDIR}/objdir
 CATEGORIES=		cross
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/binutils/
 EXTRACT_SUFX=		.tar.bz2
@@ -13,6 +12,7 @@ COMMENT=		h8300-hms cross utility
 
 H8300_PREFIX=		${PREFIX}/libexec/cross-h8300-hms
 
+WRKSRC=			${WRKDIR}/objdir
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_MAKEINFO=		yes
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index ef0deb3732f..c42d5e01002 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/12/26 13:16:31 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:10:55 agc Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
-WRKSRC=			${WRKDIR}/objdir
 CATEGORIES=		cross
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/gcc/gcc-3.1/ \
 			ftp://sources.redhat.com/pub/newlib/
@@ -20,6 +19,7 @@ DEPENDS+=	cross-h8300-hms-binutils-[0-9]*:../../cross/h8300-hms-binutils
 
 H8300_PREFIX=		${LOCALBASE}/libexec/cross-h8300-hms
 
+WRKSRC=			${WRKDIR}/objdir
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
diff --git a/cross/i386-cygwin32/Makefile b/cross/i386-cygwin32/Makefile
index 6692d0c82d2..5565362675a 100644
--- a/cross/i386-cygwin32/Makefile
+++ b/cross/i386-cygwin32/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:27:52 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:55 agc Exp $
 #
 
 DISTVERSION=		1.0.0.0
 DISTFILES=		# none
-WRKSRC=			${WRKDIR}/${EGCS_DISTNAME}
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/
 COMMENT=		Cross-compile environment for Cywin32/i386
 
+WRKSRC=			${WRKDIR}/${EGCS_DISTNAME}
 USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	pe-i386
 BINUTILS_LDEMULATION=	i386pe
diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile
index c701b1e934a..e3a73dd0641 100644
--- a/cross/i386-linux/Makefile
+++ b/cross/i386-linux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:27:53 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:10:55 agc Exp $
 #
 
-WRKSRC=			${WRKDIR}
 DISTVERSION=		2.0.7.1
 DISTFILES=		${LINUXDEVEL_FILES}
 EXTRACT_ONLY=		# none of the RPM files
@@ -14,6 +13,7 @@ BUILD_DEPENDS+=		rpm-[0-9]*:../../misc/rpm
 
 CHECK_SHLIBS=		no
 
+WRKSRC=			${WRKDIR}
 USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	elf32-i386
 BINUTILS_LDEMULATION=	elf_i386
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index 2a6a4bd2c52..8f693e32057 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:10:55 agc Exp $
 
 DISTNAME=		cross-${TARGET_ARCH}-1.2
 PKGREVISION=		3
-WRKSRC=			${WRKDIR} # for the patch target
 CROSS_DISTFILES=
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.mingw.org/
@@ -28,6 +27,7 @@ W32_WRKSRC=		${WRKDIR}/w32api-1.2
 USE_GMAKE=		yes
 USE_PERL5=		build
 
+WRKSRC=			${WRKDIR} # for the patch target
 AS_FOR_TARGET=		${BINUTILS_WRKSRC}/gas/as-new
 AR_FOR_TARGET=		${BINUTILS_WRKSRC}/binutils/ar
 NM_FOR_TARGET=		${BINUTILS_WRKSRC}/binutils/nm-new
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index 705f644674f..54c0820a7be 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2003/08/04 21:07:49 jmc Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:10:55 agc Exp $
 #
 
-WRKSRC=			${WRKDIR}/djgpp
 DISTVERSION=		2.02.0
 DISTFILES=		${DJGPP_FILES}
 EXTRACT_ONLY=		# none of the djgpp files
@@ -14,6 +13,7 @@ COMMENT=		Cross-compile environment for MS-DOS on 386 and higher
 
 BUILD_DEPENDS=		unzip-[0-9]*:../../archivers/unzip
 
+WRKSRC=			${WRKDIR}/djgpp
 USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	coff-go32
 BINUTILS_LDEMULATION=	i386go32
diff --git a/cross/icdprog/Makefile b/cross/icdprog/Makefile
index 67a02fb503a..08d41190f87 100644
--- a/cross/icdprog/Makefile
+++ b/cross/icdprog/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:27:56 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:10:56 agc Exp $
 
 DISTNAME=	icdprog-0.3
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icdprog/}
 
@@ -10,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://icdprog.sourceforge.net/
 COMMENT=	Microchip PIC programer using ICD hardware
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icdprog ${PREFIX}/bin
 
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 3220051ccef..b621a857cbc 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/01/05 20:48:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	db-2.7.7
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/misc/ \
@@ -16,6 +15,7 @@ NO_PKGTOOLS_REQD_CHECK=	# defined (needed for pkgtools/pkg_install)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index db6a028f428..bf8234218e9 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/01/05 20:48:01 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
@@ -17,6 +16,7 @@ PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -p0
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index ae2afb5ec04..c1d600c1d81 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/01/05 20:48:01 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=		db-4.2.52
 PKGNAME=		${DISTNAME:S/db/db4/}
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=		databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
@@ -12,6 +11,7 @@ COMMENT=		Berkeley DB version 4 from Sleepycat Software
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK3=		YES
 USE_GCC_SHLIB=		YES
 USE_LIBTOOL=		YES
diff --git a/databases/gdbm_primitive/Makefile b/databases/gdbm_primitive/Makefile
index 13ed7cd730d..4b686b76431 100644
--- a/databases/gdbm_primitive/Makefile
+++ b/databases/gdbm_primitive/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:28:06 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	gdbm-prim-1.15
 PKGNAME=	${DISTNAME:S/-prim/_primitive/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	databases
 MASTER_SITES=	http://homepage.mac.com/leffert/.cv/leffert/Public/
 EXTRACT_SUFX=	.tar.gz-link.gz
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://homepage.mac.com/leffert/FileSharing.html
 COMMENT=	Shell primitives for working with GDBMs
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 EXTRACT_CMD=		${_DFLT_EXTRACT_CMD}
 USE_BUILDLINK2=		YES
 
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index cab8648d1db..304ce3a20a2 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/08/23 15:16:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	java-db3-3.11.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases java
 MASTER_SITES=	http://www.sleepycat.com/update/3.3.11/
 
@@ -21,6 +20,7 @@ JAVAC=			${PKG_JAVA_HOME}/bin/javac
 JAR=			${PKG_JAVA_HOME}/bin/jar
 JAVACABS=		${JAVAC}
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index ddb9d78f1ce..5597c9bb29a 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2003/08/23 15:16:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=		postgresql-${DIST_VERS}
 PKGNAME=		jdbc-${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
 CATEGORIES=		databases java
 MASTER_SITES?=		http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
 			ftp://ftp.postgresql.org/pub/source/v${DIST_VERS}/ \
@@ -24,6 +23,7 @@ BUILD_DEPENDS+=		apache-ant-[0-9]*:../../devel/apache-ant
 
 EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
 USE_GMAKE=		YES
 
 EXAMPLEDIR=		${PREFIX}/share/examples/java/jdbc-postgresql
diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile
index 20aa0bd004a..8cdeb2a438c 100644
--- a/databases/metakit-lib/Makefile
+++ b/databases/metakit-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/10/06 11:35:31 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
 PKGNAME=	metakit-lib-2.4.8
-WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/older/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.equi4.com/metakit/
 COMMENT=	Embedded database library
 
+WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl=
diff --git a/databases/p5-Palm/Makefile b/databases/p5-Palm/Makefile
index a3a3490e610..6a2eb960dab 100644
--- a/databases/p5-Palm/Makefile
+++ b/databases/p5-Palm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/18 22:22:29 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	p5-Palm-1.3.0
 SVR4_PKGNAME=	p5plm
-WRKSRC=		${WRKDIR}/p5-Palm-1.003_000
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AR/ARENSB/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ooblick.com/software/coldsync/
 COMMENT=	Access Palm .pdb and .prc database files
 
+WRKSRC=		${WRKDIR}/p5-Palm-1.003_000
 USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Palm/.packlist
 
diff --git a/databases/p5-gdbm/Makefile b/databases/p5-gdbm/Makefile
index fc1e83a37ba..417ac9f1532 100644
--- a/databases/p5-gdbm/Makefile
+++ b/databases/p5-gdbm/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2003/07/21 16:39:12 martti Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:12:49 agc Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
 PKGNAME=		p5-gdbm-1.05
 PKGREVISION=		1
 SVR4_PKGNAME=		p5gdm
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 CATEGORIES+=		perl5
 
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Perl interface to gdbm - GNU database manager
 
+WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GDBM_File/.packlist
 
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 58a1b5d3315..fea0f4b41a4 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/09/01 14:00:30 tron Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-php
 PKGNAME=	phpmyadmin-2.5.3rc3
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,6 +17,7 @@ PLIST_SUBST+=	CP="${CP}" DIST_VERSION=${DIST_VERSION} \
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
 		PMDIR=${PMDIR} EXDIR=${EXDIR}
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
 DIST_VERSION=	2.5.3-rc3
 DOC_FILES=	ANNOUNCE.txt CREDITS ChangeLog \
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 3e148a648db..39e37b2d1d5 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/09/01 12:58:34 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	phpPgAdmin_2-4-2
 PKGNAME=	phppgadmin-2.4.2
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_2-4-2//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phppgadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ COMMENT=	Set of PHP-scripts to adminster PostgreSQL over the WWW
 
 DEPENDS+=	php-pgsql>=4.1.2:../../databases/php4-pgsql
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_2-4-2//}
 NO_BUILD=	YES
 
 DOC_FILES=	BUGS ChangeLog Documentation.html \
diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile
index 63a2c679003..0d2624ca3b6 100644
--- a/databases/py-PgSQL/Makefile
+++ b/databases/py-PgSQL/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/09/14 16:43:47 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	pyPgSQL-2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-WRKSRC=		${WRKDIR}/pypgsql
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pypgsql/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://pypgsql.sourceforge.net/
 COMMENT=	Python DB-API 2.0 compliant interface to PostgreSQL
 
+WRKSRC=		${WRKDIR}/pypgsql
 USE_BUILDLINK2=	YES
 PYDISTUTILSPKG=	YES
 PYBINMODULE=	YES
diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile
index 1fc823207bf..3df6d5e0b48 100644
--- a/databases/py-metakit/Makefile
+++ b/databases/py-metakit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:39:13 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
 PKGNAME=	${PYPKGPREFIX}-metakit-2.4.8
-WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.equi4.com/metakit/
 COMMENT=	Embedded database library
 
+WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl= --enable-python
diff --git a/databases/rdb/Makefile b/databases/rdb/Makefile
index 700a0fa0a0d..a46163028fa 100644
--- a/databases/rdb/Makefile
+++ b/databases/rdb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:39:13 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	RDB-2.6d
 PKGNAME=	rdb-2.6.4
-WRKSRC=		${WRKDIR}/rdb
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.rand.org/pub/RDB-hobbs/
 
@@ -10,6 +9,7 @@ MAINTAINER=	njohnston@globaltetrahedron.com
 HOMEPAGE=	ftp://ftp.rand.org/pub/RDB-hobbs/
 COMMENT=	Relational database system that uses standard filters via pipes
 
+WRKSRC=		${WRKDIR}/rdb
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index 9d511dae758..971eee62bcc 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/12/19 12:04:20 sketch Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}gdbm-${RUBY_VERSION}
 PKGREVISION=	1
-WRKSRC=		${RUBY_WRKSRC}/ext/gdbm
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -14,6 +13,7 @@ COMMENT=	Ruby extension to GDBM library
 
 DEPENDS+=	gdbm>=1.8.3:../../databases/gdbm
 
+WRKSRC=		${RUBY_WRKSRC}/ext/gdbm
 DIST_SUBDIR=	ruby
 DISTINFO_FILE=	${RUBY_DISTINFO}
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/gdbm
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index 52b1b4d6db5..ca9c140c59a 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/16 16:29:11 taca Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=		vapor-0.7.0
 PKGNAME=		${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC=			${WRKDIR}/vapor-0.70
 CATEGORIES=		databases
 MASTER_SITES=		http://rubyforge.org/download.php/7/
 
@@ -14,6 +13,7 @@ DEPENDS+=		ruby-DBD-postgresql>=0.0.20:../ruby-DBD-postgresql
 DEPENDS+=		ruby-rexml>=2.4.0:../../textproc/ruby-rexml
 DEPENDS+=		ruby-racc>=1.4.3:../../devel/ruby-racc
 
+WRKSRC=			${WRKDIR}/vapor-0.70
 USE_RUBY_SETUP= 	yes
 RUBY_SETUP= 	install.rb
 
diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile
index 90913d58283..6ecd4842db5 100644
--- a/databases/sdbm/Makefile
+++ b/databases/sdbm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:29:03 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=		sdbm
 # this is the Dec. 1990 release with some race condition fixes from an
 # unknown outside source:
 PKGNAME=		sdbm-90.12.1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://tsx-11.mit.edu/pub/linux/sources/libs/
 EXTRACT_SUFX=		.tar.Z
@@ -13,6 +12,7 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Substitute DBM, an implementation of the `real' ndbm library
 
+WRKSRC=			${WRKDIR}
 MAKE_ENV+=		LIBDIR=${PREFIX}/lib NOLINT=1
 
 post-extract:
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 680cc783283..bc9b3e2a8ed 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/08/01 14:22:18 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=		sqlite-2.8.5
-WRKSRC=			${WRKDIR}/sqlite-build
 CATEGORIES=		databases
 MASTER_SITES=		http://www.hwaci.com/sw/sqlite/ \
 			http://www.sqlite.org/
@@ -10,6 +9,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.hwaci.com/sw/sqlite/
 COMMENT=		SQL Database Engine In A C Library
 
+WRKSRC=			${WRKDIR}/sqlite-build
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index ecd0569fbd3..259f23bd067 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/09/29 03:29:55 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	databases
 MASTER_SITES=	${HOMEPAGE}
 
@@ -14,6 +13,7 @@ COMMENT=	Sybase SQL shell
 ALL_TARGET=		sqsh
 INSTALL_TARGET=		install install.man
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-readline
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index 7af623cd9e0..6ff3a613bdf 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/11/05 16:53:49 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:12:49 agc Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.05
-WRKSRC=			${WRKDIR}/src
 CATEGORIES=		database
 MASTER_SITES=		http://www.fastbase.co.nz/fbsql/
 EXTRACT_SUFX=
@@ -11,6 +10,7 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=               http://www.fastbase.co.nz/fbsql/index.html
 COMMENT=		Tcl interface to MySQL
 
+WRKSRC=			${WRKDIR}/src
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 DIST_SUBDIR=		${PKGNAME_NOREV}
diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index e426c7e24a8..20ac8d0ad51 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:29:13 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:12:49 agc Exp $
 #
 
 DISTNAME=	ZMySQLDA-1.1.3-nonbin
 PKGNAME=	zope-mysql-1.1.3
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/lib
 CATEGORIES=	databases www
 MASTER_SITES=   http://www.zope.org/Members/MikeP/ZMySQLDA/
 
@@ -14,6 +13,7 @@ COMMENT=	Zope Database Adaptor for MySQL
 
 DEPENDS+=	zope-2.*:../../www/zope
 
+WRKSRC=		${WRKDIR}/lib
 USE_BUILDLINK2=	YES
 
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index cfcde53c6d0..ef6a37bf47b 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=	ProjectCenter-0.3.6
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/ProjectCenter
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=dev-apps/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/experience/ProjectCenter.html
 COMMENT=	GNUstep Integrated Developement Environment
 
+WRKSRC=			${WRKDIR}/ProjectCenter
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 4f9414356e2..07f6eca3664 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:29:20 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:13:27 agc Exp $
 
 DISTNAME=	exec-0.107
 PKGNAME=	aap-0.107
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=a-a-p/}
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.a-a-p.org/
 COMMENT=	make(1) replacement
 
+WRKSRC=		${WRKDIR}
 AAP_DIR=	${PREFIX}/lib/aap
 AAP_DOC=	${PREFIX}/share/doc/aap
 AAP_START=	${PREFIX}/bin/aap
diff --git a/devel/acme/Makefile b/devel/acme/Makefile
index 90d48b59810..adae67bec1e 100644
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:29:21 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=	acme085_linux
 PKGNAME=	acme-0.85
-WRKSRC=		${WRKTOP}/sources
 CATEGORIES=	devel
 MASTER_SITES=	http://www.esw-heim.tu-clausthal.de/~marco/cpf/current/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LIBDIST}
@@ -14,6 +13,7 @@ COMMENT=	Cross assembler for 6502, 65c02, and 65816
 
 BUILD_DEPENDS+=	unzip-*:../../archivers/unzip
 
+WRKSRC=		${WRKTOP}/sources
 LIBDIST=	lib002.zip
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKTOP=		${WRKDIR}/acme085
diff --git a/devel/acunia-jam/Makefile b/devel/acunia-jam/Makefile
index acfb652cc5c..a6399837419 100644
--- a/devel/acunia-jam/Makefile
+++ b/devel/acunia-jam/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:29:23 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=	acunia-jam-1.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/jam
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -13,6 +12,7 @@ COMMENT=	Acunia version of the program construction tool, like make(1)
 
 CONFLICTS=	jam-[0-9]*
 
+WRKSRC=		${WRKDIR}/jam
 USE_BUILDLINK2=	# defined
 
 DOCDIR=		share/doc/${PKGBASE}
diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 298a45e77a7..38e188a1f2e 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:29:25 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=	ald-0.0.19d
 PKGNAME=	ald-0.0.19
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	http://ellipse.mcs.drexel.edu/source/
 
@@ -13,6 +12,7 @@ COMMENT=	Very nice x86 assembly-level debugger ported to NetBSD
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5*-i386 NetBSD-1.6*-i386
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=	YES
 
 #do-build:
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 8fb33932cc8..099b8fd4537 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/11/22 23:55:15 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:27 agc Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -7,7 +7,6 @@
 
 DISTNAME=	${PKGNAME}-src
 PKGNAME=	apache-ant-1.5.4
-WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/source/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +20,7 @@ DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
 # Up to version 1.5.1 inclusive this was known as "jakarta-ant".
 CONFLICTS=	jakarta-ant*
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_BUILDLINK2=	# defined
 
 EXTRACT_CMD_OPTS.zip=	-Caq
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 69d4499ae2b..5b3209ec413 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:29:30 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:27 agc Exp $
 
 DISTNAME=	asm.8051
 PKGNAME=	as31-19900126
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.misc/volume10/ \
 		ftp://sunsite.org.uk/usenet/comp.sources.misc/volume10/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.Z
 MAINTAINER=	bjh21@NetBSD.org
 COMMENT=	8031/8051 assembler
 
+WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \
 		${SED} '1,/^.! \/bin\/sh/d' | ${SH}
 MAKEFILE=	makefile
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index ad33994a2b2..36f2d0f60b7 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/01/19 00:57:10 sjg Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=       bmake-20040118
-WRKSRC=		${WRKDIR}/bmake
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.NetBSD.org/pub/incoming/sjg/
 
@@ -14,6 +13,7 @@ DEPENDS+=	mk-files>=20030714:../../devel/mk-files
 
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
+WRKSRC=		${WRKDIR}/bmake
 makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index 384f423667a..859127082e1 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:29:47 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:13:27 agc Exp $
 #
 
 DISTNAME=	c4
 PKGNAME=	${DISTNAME}-1.6
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/utils/c4/
 
@@ -12,6 +11,7 @@ COMMENT=	CVS-like frontend to Perforce
 
 DEPENDS+=	p4-[0-9]*:../../devel/p4
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 ALL_TARGET=	c4
 
 do-install:
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index b30bb7aa050..e3ce35e5c02 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=		latestCDK
 PKGNAME=		cdk-4.9.9
 PKGREVISION=				1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vexus.ca/release/
 EXTRACT_SUFX=		.tgz
@@ -13,6 +12,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.vexus.ca/CDK.html
 COMMENT=		Curses Development Kit
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_NCURSES=		# uses ncurses internals
 USE_LIBTOOL=		yes
diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index c4034014523..5f11aa1c11c 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:29:51 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	cfitsio2037
 PKGNAME=	cfitsio-2.0.37
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://legacy.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 COMMENT=	FITS (flexible image transport system) file input and output
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index fe27dfe86c4..d0bbcad058c 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:30:03 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	cvs2cl-1.117
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	# Nothing
@@ -11,6 +10,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.red-bean.com/~kfogel/cvs2cl.shtml
 COMMENT=	CVS-log-message-to-ChangeLog conversion script
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 NO_BUILD=	YES
 EXTRACT_CMD=	${ECHO}
diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile
index 27782e8dd94..8c708dd7de6 100644
--- a/devel/cvsup-bin/Makefile
+++ b/devel/cvsup-bin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/05 23:50:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	cvsup-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://motoyuki.bsdclub.org/data/NetBSD/CVSup/i386/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~jdp/
 COMMENT=	cvsup daemon and client
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-i386
diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 373fcdd69e7..88f900e05f0 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/01/16 03:47:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	cvsup-gui-static-16.1.h
 PKGNAME=	${DISTNAME:C/-static//}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://motoyuki.bsdclub.org/data/NetBSD/CVSup/i386/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ COMMENT=	cvsup GUI client
 
 DEPENDS+=	cvsup-bin-[0-9]*:../../devel/cvsup-bin
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 DIST_SUBDIR=	cvsup-${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index b87c8554b25..76ebf2c8904 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:13:28 agc Exp $
 #
 # XXX This package needs to be installed with the same PREFIX as teTeX
 #
 
 DISTNAME=		cweb-3.64
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		devel lang
 MASTER_SITES=		${MASTER_SITE_TEX_CTAN:=web/cweb/}
 
@@ -17,6 +16,8 @@ CONFLICTS+=		teTeX-bin>=2.0
 
 DEPENDS+= 		teTeX-[0-9]*:../../print/teTeX1
 
+WRKSRC=			${WRKDIR}
+
 post-patch:
 	${MV} ${WRKSRC}/cweb.1 ${WRKSRC}/cweb.1.dist
 	${SED} -e 's:@PREFIX@:'${PREFIX}':g' ${WRKSRC}/cweb.1.dist 	\
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 9ad5e326fa2..06def469369 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	DevIL-1.6.6
 PKGNAME=	${DISTNAME:S/D/d/}
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/DevIL
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openil/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://openil.sourceforge.net/
 COMMENT=	Developer's Image Library
 
+WRKSRC=			${WRKDIR}/DevIL
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index 51342d63bb8..3333cb06538 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/09/25 18:49:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	dmake-v4.1-src-export.all-unknown-all
 PKGNAME=	dmake-4.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/dmake
 CATEGORIES=	devel
 MASTER_SITES=	http://dmake.wticorp.com/SourceDistribution/ \
 		ftp://plg.uwaterloo.ca/pub/dmake/
@@ -15,6 +14,7 @@ COMMENT=	Portable make supported by many platforms
 
 MAKEFILE=	makefile
 ALL_TARGET=	linux
+WRKSRC=		${WRKDIR}/dmake
 
 do-configure:
 	cd ${WRKSRC} && ${RM} unix/bsd43/dirent.h &&		\
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 72023b2c86d..988147800cb 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=		doxygen-1.3.5.src
 PKGNAME=		doxygen-1.3.5
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.stack.nl/pub/users/dimitri/
 
@@ -13,6 +12,7 @@ COMMENT=		Documentation system for C++, Java, IDL and C
 
 DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_GMAKE=		yes
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index b93ee6e57de..84079d4c708 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/10/19 01:34:13 heinz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=		flex-2.5.4a
-WRKSRC=			${WRKDIR}/flex-2.5.4
 CATEGORIES=		lang
 MASTER_SITES=   	${MASTER_SITE_GNU:=non-gnu/flex/}
 
@@ -9,6 +8,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/flex/
 COMMENT=		Fast clone of lex(1), the lexical scanner generator
 
+WRKSRC=			${WRKDIR}/flex-2.5.4
 GNU_CONFIGURE=		YES
 
 TEST_TARGET=		check
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index d94294d6bae..a7bd7feb774 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	fortran-utils-1.1
-WRKSRC=		${WRKDIR}/fortran-utils
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -10,4 +9,6 @@ COMMENT=	Utilities for Fortran programmers
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+WRKSRC=		${WRKDIR}/fortran-utils
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile
index 10c2ddaec54..14a2529dc8a 100644
--- a/devel/gobo-eiffel/Makefile
+++ b/devel/gobo-eiffel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:43:23 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	gobo15
 PKGNAME=	gobo-eiffel-1.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gobosoft.com/download/ \
 		http://www.eiffel-forum.org/archive/bezault/ \
@@ -16,6 +15,7 @@ COMMENT=	Portable Eiffel structure libraries and tools
 
 BUILD_DEPENDS+=	smalleiffel-0.77:../../lang/smalleiffel
 
+WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${LOCALBASE}/bin/unzip -uLa \
 			${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile
index b1c0e351b04..02b958bd06e 100644
--- a/devel/hptools/Makefile
+++ b/devel/hptools/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	hptools-src-3.0.8
 PKGNAME=	hptools-3.0.8
-WRKSRC=		${WRKDIR}/Hptools/support
 CATEGORIES=	devel
 MASTER_SITES=	http://www.epita.fr/~avenar_j/hp/product/
 
@@ -17,6 +16,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=	hptools-license
 
+WRKSRC=		${WRKDIR}/Hptools/support
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 
diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile
index 827e20d9312..590680794ec 100644
--- a/devel/ipv6socket_scrub/Makefile
+++ b/devel/ipv6socket_scrub/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:43:24 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:13:28 agc Exp $
 # KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp
 #
 
 DISTNAME=		IPv6socket_scrub
 PKGNAME=		ipv6socket_scrub-1.0
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		devel
 # need to fetch on your own
 #MASTER_SITES=		
@@ -14,6 +13,7 @@ MAINTAINER=		itojun@kame.net
 HOMEPAGE=		http://www.sun.com/solaris/ipv6/
 COMMENT=		Checks IPv6 portability in source code
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 DECOMPRESS_CMD=		${CAT}
 EXTRACT_BEFORE_ARGS=	-xf
 RESTRICTED=		"not redistributable, license agreement required"
diff --git a/devel/its4/Makefile b/devel/its4/Makefile
index eb119ca7c34..1fdd29859ee 100644
--- a/devel/its4/Makefile
+++ b/devel/its4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:43:25 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	its4-1.1.1
-WRKSRC=		${WRKDIR}/its4
 CATEGORIES=	devel
 MASTER_SITES=	# have to fetch for yourself, or from a NetBSD mirror
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ COMMENT=	Static C/C++ code scanner for potential security problems
 
 LICENSE=        no-commercial-use
 
+WRKSRC=		${WRKDIR}/its4
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/its4
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile
index f9425d10051..e82c005c353 100644
--- a/devel/javadeps/Makefile
+++ b/devel/javadeps/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/08/23 15:09:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	javadeps-1.1
-WRKSRC=		${WRKDIR}/JavaDeps-1.1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.vet.com.au/java/javadeps/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ MAINTAINER=	ben@wongs.net
 HOMEPAGE=	http://www.vet.com.au/java/javadeps/
 COMMENT=	Automatic dependency tracking for Java
 
+WRKSRC=		${WRKDIR}/JavaDeps-1.1
 USE_BUILDLINK2=	# defined
 USE_JAVA=	run
 
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index 29f99457895..3d32bb2cb6e 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:31:15 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	ldapsdk_12311998
 PKGNAME=	${DISTNAME:S/_/-/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	devel databases
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/directory/c-sdk/ldap/
 
@@ -13,6 +12,7 @@ COMMENT=	LDAP C-SDK from the Mozilla project
 
 CONFLICTS+=	openldap*
 
+WRKSRC=		${WRKDIR}/mozilla
 USE_GMAKE=	yes
 USE_PERL5=	build
 USE_BUILDLINK2=	yes
diff --git a/devel/libetm/Makefile b/devel/libetm/Makefile
index 41620087745..4feb5891459 100644
--- a/devel/libetm/Makefile
+++ b/devel/libetm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=		ETM-1.09
 PKGNAME=		libetm-1.09
-WRKSRC=			${WRKDIR}/etm
 CATEGORIES=		devel
 MASTER_SITES=		http://www.snake.net/software/ETM/
 
@@ -11,6 +10,8 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Exception and termination manager
 
+WRKSRC=			${WRKDIR}/etm
+
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
 	${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile
index 3e5aad5fad7..c9194e1dcc5 100644
--- a/devel/libgetopt/Makefile
+++ b/devel/libgetopt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:31:26 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	libgetopt-${VERS}
-WRKSRC=		${WRKDIR}/libgetopt
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-current/src/lib/libc/stdlib/ \
@@ -14,6 +13,8 @@ COMMENT=	Library for handling --long options
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+WRKSRC=		${WRKDIR}/libgetopt
+
 .if exists(/usr/include/getopt.h)
 PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
 .endif
diff --git a/devel/libmemmgr/Makefile b/devel/libmemmgr/Makefile
index 55c2e56682c..b4939599917 100644
--- a/devel/libmemmgr/Makefile
+++ b/devel/libmemmgr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=		MemMgr-1.04
 PKGNAME=		libmemmgr-1.04
-WRKSRC=			${WRKDIR}/memmgr-1.04
 CATEGORIES=		devel
 MASTER_SITES=		http://www.snake.net/software/MemMgr/
 
@@ -13,6 +12,8 @@ COMMENT=		Simple memory manager library
 
 BUILD_DEPENDS+=		libetm-1.09:../../devel/libetm
 
+WRKSRC=			${WRKDIR}/memmgr-1.04
+
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
 	${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index 7df68189ebd..a3aed2316be 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/10/29 18:39:45 cube Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	libnet-1.0.1b
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${DISTNAME:C/l/L/}
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
@@ -11,6 +10,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.packetfactory.net/libnet/
 COMMENT=	C library for portable packet creation and injection
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/l/L/}
 USE_BUILDLINK2= # defined
 
 USE_LIBTOOL=	# defined
diff --git a/devel/libportlib/Makefile b/devel/libportlib/Makefile
index e2f03009865..ad4523038c1 100644
--- a/devel/libportlib/Makefile
+++ b/devel/libportlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=		portlib-1.01
 PKGNAME=		libportlib-1.01
-WRKSRC=			${WRKDIR}/portlib-1.01
 CATEGORIES=		devel
 MASTER_SITES=		http://www.snake.net/software/portlib/
 
@@ -11,6 +10,8 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Portable file locking and directory reading
 
+WRKSRC=			${WRKDIR}/portlib-1.01
+
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
 	${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index 9ca184266d6..bacdba44570 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/31 00:05:19 kristerw Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	libtecla-1.5.0
-WRKSRC=		${WRKDIR}/${PKGBASE}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.astro.caltech.edu/~mcs/tecla/
 
@@ -10,6 +9,7 @@ MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://www.astro.caltech.edu/~mcs/tecla/
 COMMENT=	Interactive command line editing facilities
 
+WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index e32d56271e9..8313991d0db 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.39 2004/01/05 11:12:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.40 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
 PKGREVISION=	19
-WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -15,6 +14,7 @@ CONFLICTS=	glibtool-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=		${WRKDIR}/libtool-ml
 GNU_CONFIGURE=	# defined
 USE_BUILDLINK3=	# defined
 
diff --git a/devel/libts/Makefile b/devel/libts/Makefile
index 0a41d3e5040..d40e90adaec 100644
--- a/devel/libts/Makefile
+++ b/devel/libts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=		TS-1.08
 PKGNAME=		libts-1.08
-WRKSRC=			${WRKDIR}/tokenscan
 CATEGORIES=		devel
 MASTER_SITES=		http://www.snake.net/software/TS/
 
@@ -11,6 +10,8 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Library of simple token-scanning routines
 
+WRKSRC=			${WRKDIR}/tokenscan
+
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
 	${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
diff --git a/devel/mk-files/Makefile b/devel/mk-files/Makefile
index 776304dc705..1809a1126aa 100644
--- a/devel/mk-files/Makefile
+++ b/devel/mk-files/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/30 17:59:59 sjg Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:13:28 agc Exp $
 #
 
 DISTNAME=	mk-20030930
 PKGNAME=	mk-files-20030930
-WRKSRC=		${WRKDIR}/mk
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.NetBSD.org/pub/incoming/sjg/
 
@@ -14,6 +13,8 @@ COMMENT=	Portable *.mk files for the NetBSD portable bmake utility
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/mk
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_SRC=${WRKDIR}/.PLIST_SRC
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 2d1a5b9593b..66bd7c64037 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/01/11 15:58:45 cjep Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	netcdf-3.5.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	devel
 MASTER_SITES=	ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
 EXTRACT_SUFX=	.tar.Z
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.unidata.ucar.edu/packages/netcdf/index.html
 COMMENT=	Library for array-oriented data access
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		# defined
 USE_FORTRAN=		# defined
 USE_GCC_SHLIB=		# defined
diff --git a/devel/newmkdep/Makefile b/devel/newmkdep/Makefile
index 8afcadd743c..337883c149c 100644
--- a/devel/newmkdep/Makefile
+++ b/devel/newmkdep/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:43:33 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
 
 DISTNAME=	newmkdep-1.0
-WRKSRC=		${WRKDIR}/newmkdep
 CATEGORIES=	devel
 MASTER_SITES=	http://core.de/~tron/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Faster replacement for *BSD's "mkdep"
 
+WRKSRC=		${WRKDIR}/newmkdep
 NO_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 639202cfda6..1ff727eb34f 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 21:31:59 grant Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/20 12:13:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
 DISTNAME=		noweb-2.9a
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/src
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
 EXTRACT_SUFX=		.tgz
@@ -15,6 +14,8 @@ COMMENT=		Simple, extensible literate-programming tool
 
 DEPENDS=		icon>=9.3:../../lang/icon
 
+WRKSRC=			${WRKDIR}/src
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "SunOS"
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index d7f8f0c46f2..78770e08f40 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
 PKGNAME=	ogre-0.12.1
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/ogrenew
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://ogre.sourceforge.net/
 COMMENT=	Object-Oriented Graphics Rendering Engine
 
+WRKSRC=			${WRKDIR}/ogrenew
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index d281d55c65e..20060914bb4 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-1-src
 PKGNAME=	${OPENCM_VERSION:C/alpha/rc/}
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${OPENCM_VERSION}/base
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opencm.org/releases/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.opencm.org/
 COMMENT=	Secure, high-integrity replacement for CVS
 
+WRKSRC=		${WRKDIR}/${OPENCM_VERSION}/base
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
diff --git a/devel/p4/Makefile.common b/devel/p4/Makefile.common
index cd89d755999..bb57990db49 100644
--- a/devel/p4/Makefile.common
+++ b/devel/p4/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.5 2003/07/17 21:32:03 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/01/20 12:13:29 agc Exp $
 #
 
 P4_VERS=	2002.1
 PKGNAME=	${DISTNAME}-${P4_VERS}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MAINTAINER=	schmonz@NetBSD.org
 
@@ -11,6 +10,7 @@ NO_PATCH=	# defined
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	perforce
 
 .if defined(P4BINONLY)
diff --git a/devel/p4pr/Makefile b/devel/p4pr/Makefile
index 06a99cdc0c2..707c104f059 100644
--- a/devel/p4pr/Makefile
+++ b/devel/p4pr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:32:03 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	p4pr
 PKGNAME=	${DISTNAME}-20010504
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/contrib/misc/
 EXTRACT_SUFX=	.perl
@@ -13,6 +12,7 @@ COMMENT=	Perforce file annotation with change, revision, and branch
 
 DEPENDS+=	p4-[0-9]*:../../devel/p4
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# none
 NO_BUILD=	# defined
 USE_PERL5=	# defined
diff --git a/devel/p5-FileKGlob/Makefile b/devel/p5-FileKGlob/Makefile
index abf8b223435..11b835091cf 100644
--- a/devel/p5-FileKGlob/Makefile
+++ b/devel/p5-FileKGlob/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:32:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	FileKGlob
 PKGNAME=	p5-FileKGlob-1.2
 SVR4_PKGNAME=	p5fkg
-WRKSRC=		${WRKDIR}/File
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Expand a Unix file glob into a list of matching file names
 
+WRKSRC=			${WRKDIR}/File
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/KGlob/.packlist
 
diff --git a/devel/p5-LDAP/Makefile b/devel/p5-LDAP/Makefile
index 5f749a2e40e..392859e8ce1 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/01/10 19:06:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	perldap-1.2.2
 PKGNAME=	p5-LDAP-1.2.2
 SVR4_PKGNAME=	p5lda
-WRKSRC=		${WRKDIR}/perldap
 CATEGORIES=	devel perl5 databases
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/directory/perldap/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mozilla.org/directory/perldap.html
 COMMENT=	Perl5 module to build LDAP clients with perl
 
+WRKSRC=		${WRKDIR}/perldap
 USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mozilla/LDAP/API/.packlist
 
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index 4178cb490df..eff33a3e256 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/01/05 22:16:25 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
 SVR4_PKGNAME=		p5plh
-WRKSRC=			${WRKDIR}
 CATEGORIES=		devel perl5
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,6 +13,7 @@ COMMENT=		Perl header files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/.packlist.h2ph
 
diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index f85f1c09531..fb6bbfc1b62 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	pccts133mr22
 PKGNAME=	pccts-1.33.22
-WRKSRC=		${WRKDIR}/pccts
 CATEGORIES=	devel
 MASTER_SITES=	http://www.polhode.com/
 EXTRACT_SUFX=	.zip
@@ -12,6 +11,7 @@ MAINTAINER=	david@maxwell.net
 HOMEPAGE=	http://www.polhode.com/pccts.html
 COMMENT=	Purdue Compiler Construction Tool Set
 
+WRKSRC=		${WRKDIR}/pccts
 DIST_SUBDIR=	${PKGNAME}
 
 MAKEFILE=	makefile
diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile
index 4a37dbfb497..6dc198cd28a 100644
--- a/devel/pedisassem/Makefile
+++ b/devel/pedisassem/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:43:43 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=	dsasmsrc
 PKGNAME=	pedisassem-0.23
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Foothills/4078/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Foothills/4078/
 COMMENT=	Disassembler for Win32 code
 
+WRKSRC=		${WRKDIR}
+
 # LP64 problems
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64
 
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 32483d69ee3..63413b1dd3c 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/01/05 23:22:51 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	popt-1.7
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/		\
 		ftp://ftp.iks-jena.de/pub/software/unix/misc/		\
@@ -18,6 +17,7 @@ CONFLICTS=		ORBit<=0.5.3
 
 BUILD_USES_MSGFMT=	yes
 
+WRKSRC=			${WRKDIR}/${DISTNAME}
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index a31a3927e6d..6913f86210f 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/08/09 10:44:47 seb Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
-WRKSRC=			${WRKDIR}
 CATEGORIES=		devel lang
 MASTER_SITES=		ftp://pvs.csl.sri.com/pub/pvs/pvs${VERSION}/ \
 			ftp://ftp.cs.york.ac.uk/pub/pvs/pvs${VERSION}/ \
@@ -19,6 +18,7 @@ COMMENT=		The PVS Specification and Verification System
 
 DEPENDS+=		teTeX>=1.0.7:../../print/teTeX
 
+WRKSRC=			${WRKDIR}
 VERSION=		3.1
 NO_BUILD=		# defined
 CHECK_SHLIBS=		NO
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 16987d7cf78..e06ba0c384b 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2003/07/17 21:33:17 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=		pwlib_1.4.4
 PKGNAME=		pwlib-1.4.4
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/pwlib
 CATEGORIES=		devel
 MASTER_SITES=		http://www.openh323.org/bin/
 COUNTRY_MIRRORS=	at us1 us2 ru de cz
@@ -18,6 +17,7 @@ COMMENT=		Portable Windows Libary
 
 BUILD_DEPENDS=		bison-[0-9]*:../../devel/bison
 
+WRKSRC=			${WRKDIR}/pwlib
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
index 975aca8a727..bcc642164c2 100644
--- a/devel/python-mode/Makefile
+++ b/devel/python-mode/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/01/15 09:07:31 markd Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	python-mode-4.6
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.python.org/emacs/python-mode/
 DISTFILES=	python-mode.el
@@ -16,6 +15,8 @@ COMMENT=	Emacs mode for editing python files
 # package. Also, python-mode does not appear to work as is with XEmacs 21.1
 EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/emacs.mk"
 
 do-extract:
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index ac2834fe51c..60e88498c99 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:43:46 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=		rdp1_5
 PKGNAME=		rdp-1.5
-WRKSRC=			${WRKDIR}/rdp
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.dcs.rhbnc.ac.uk/pub/rdp/
 EXTRACT_SUFX=		.zip
@@ -11,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.dcs.rhbnc.ac.uk/research/languages/rdp.shtml
 COMMENT=		Compiles attributed LL(1) grammars into recursive descent compilers
 
+WRKSRC=			${WRKDIR}/rdp
 MAKEFILE=		makefile
 
 NO_CONFIGURE=		yes
diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile
index f1e94b65cc0..741d725b0ea 100644
--- a/devel/ruby-mode/Makefile
+++ b/devel/ruby-mode/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:33:41 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}mode-${RUBY_VERSION}
-WRKSRC=		${RUBY_WRKSRC}/misc
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -12,6 +11,7 @@ HOMEPAGE=	http://www2.pos.to/~tosh/ruby/rdtool/
 COMMENT=	Ruby editing mode for Emacs
 
 DIST_SUBDIR=	ruby
+WRKSRC=		${RUBY_WRKSRC}/misc
 
 .include "../../mk/bsd.prefs.mk"
 RUBY_VER=	1.6		# always use 1.6 base
diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile
index 88cc9af01b9..16c272e2377 100644
--- a/devel/ruby-rd-mode/Makefile
+++ b/devel/ruby-rd-mode/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/09/02 06:13:26 taca Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	rdtool-${RUBY_RD_VERSION}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}rd-mode-${RUBY_RD_VERSION}
-WRKSRC=		${WRKDIR}/${DISTNAME}/utils
 CATEGORIES=	devel
 MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
 
@@ -21,6 +20,7 @@ EMACS=		emacs
 SITE_LISP=	share/emacs/site-lisp
 .endif
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/utils
 EXTRACT_ELEMENTS= ${DISTNAME}/utils/rd-mode.el
 DIST_SUBDIR=	ruby
 NO_CONFIGURE=	# defined
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index f904d4e2fb8..a8aed9a469b 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/12/19 12:04:20 sketch Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
 PKGNAME=		${RUBY_PKGNAMEPREFIX}readline-${RUBY_VERSION}
 PKGREVISION=		2
-WRKSRC=			${RUBY_WRKSRC}/ext/readline
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_RUBY}
 
@@ -12,6 +11,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		http://www.ruby-lang.org/en/
 COMMENT=		Ruby extension to readline library
 
+WRKSRC=			${RUBY_WRKSRC}/ext/readline
 DIST_SUBDIR=		ruby
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 USE_BUILDLINK2=		# defined
diff --git a/devel/ruby-ri/Makefile b/devel/ruby-ri/Makefile
index fb17c401534..d81b766c495 100644
--- a/devel/ruby-ri/Makefile
+++ b/devel/ruby-ri/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:33:47 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	ri-0.8a
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC=		${WRKDIR}/ri
 CATEGORIES=	devel
 MASTER_SITES=	http://www.pragmaticprogrammer.com/ruby/downloads/files/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.pragmaticprogrammer.com/ruby/downloads/ri.html
 COMMENT=	ri -- Ruby Interactive reference
 
+WRKSRC=		${WRKDIR}/ri
 RUBY_REQD=	1.6.2
 DIST_SUBDIR=	ruby
 USE_RUBY=	yes
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 0b4c30f141b..f6bbcf22c91 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 21:33:52 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:13:29 agc Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
 PKGBASE=	sdcc-2.2.1
 PKGNAME=	${PKGBASE}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGBASE}
 CATEGORIES=	devel lang
 MASTER_SITES=	http://web.kd0yu.com/sdcc/
 
@@ -22,6 +21,7 @@ ALL_TARGET=	dep all
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 YACC=		bison
 
+WRKSRC=			${WRKDIR}/${PKGBASE}
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=      	YES
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index add5968228d..199a58dc4eb 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:33:56 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:13:29 agc Exp $
 #
 
 # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -10,7 +10,6 @@
 #
 DISTNAME=       sfio_1999.src.unix
 PKGNAME=        sfio-1999
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.cpio
@@ -19,6 +18,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://akpublic.research.att.com/sw/tools/sfio/
 COMMENT=	Safe and Fast IO library
 
+WRKSRC=		${WRKDIR}
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && ${PAX} -O -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index a63bdca874c..72373b91935 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:33:57 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=		stl
 PKGNAME=		sgi-stl-3.3
-WRKSRC=			${WRKDIR}
 CATEGORIES=		devel
 MASTER_SITES=		http://www.sgi.com/tech/stl/
 
@@ -10,6 +9,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.sgi.com/tech/stl/
 COMMENT=		SGI Standard Template Library
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME}
 
 USE_BUILDLINK2=		# defined
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index ae09ba8101c..4b995eef521 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/16 18:51:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=	slib2d6
 #
@@ -6,7 +6,6 @@ DISTNAME=	slib2d6
 # changed to a 4, representing the 4th letter.
 #
 PKGNAME=	slib-2.4.6
-WRKSRC=		${WRKDIR}/slib
 CATEGORIES=	devel
 MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/ \
 		${MASTER_SITE_GNU:=jacal/}
@@ -16,6 +15,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://swissnet.ai.mit.edu/~jaffer/SLIB.html
 COMMENT=	Portable Scheme library of compatibility and utility functions
 
+WRKSRC=		${WRKDIR}/slib
 USE_BUILDLINK2=	# defined
 NO_BUILD=	# defined
 
diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index aaf5c883e1e..52056093aeb 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:34:05 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:13:29 agc Exp $
 #
 
 VERSION=	3.0.1.6
 DISTNAME=	splint-${VERSION}.src
 PKGNAME=	splint-${VERSION}
-WRKSRC=		${WRKDIR}/splint-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.splint.org/downloads/
 EXTRACT_SUFX= .tgz
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://lclint.cs.virginia.edu/
 COMMENT=	Statically check C programs
 
+WRKSRC=		${WRKDIR}/splint-${VERSION}
 USE_GMAKE=	YES
 GNU_CONFIGURE=  YES
 
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index 20e8ce87338..9e083a434b4 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=       swig1.1p5
 PKGNAME=	swig-1.1p5
-WRKSRC=		${WRKDIR}/SWIG1.1p5
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.swig.org/pub/
 
@@ -10,6 +9,7 @@ MAINTAINER=	mellon@isc.org
 HOMEPAGE=	http://www.swig.org/
 COMMENT=	Simplified Wrapper and Interface Generator
 
+WRKSRC=		${WRKDIR}/SWIG1.1p5
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile
index c38e7bc6a48..96e70460240 100644
--- a/devel/tcl-tclcl/Makefile
+++ b/devel/tcl-tclcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/08/31 19:45:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=	tclcl-src-1.0b13
 PKGNAME=	tcl-${DISTNAME:S/b/rc/:S/-src//}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://otcl-tclcl.sourceforge.net/tclcl/
 COMMENT=	Tcl/C++ interface used by ns and nam
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_BUILDLINK2=		yes
diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile
index 515bca1d775..08b900130db 100644
--- a/devel/tet3/Makefile
+++ b/devel/tet3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/11/17 09:02:55 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=	tet3.3h-unsup.src
 PKGNAME=	tet3-3.3h
-WRKSRC=		${WRKDIR}/src
 CATEGORIES=	devel
 MASTER_SITES=	http://tetworks.opengroup.org/tet/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://tetworks.opengroup.org/
 COMMENT=	The Open Group test harness
 
+WRKSRC=		${WRKDIR}/src
 HAS_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 2d96f9198be..7ca41e1a28a 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/02 23:22:50 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	tla-1.1pre8
 PKGNAME=	tla-1.1.0.8
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/=build
 CATEGORIES=	devel
 MASTER_SITES=	http://regexps.srparish.net/src/tla/
 
@@ -13,6 +12,7 @@ COMMENT=	Revision control system ideal for widely distributed development
 
 DEPENDS+=	patch-[0-9]*:../../devel/patch
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src/=build
 USE_GMAKE=	# defined
 
 HAS_CONFIGURE=		# defined
diff --git a/devel/tpasm/Makefile b/devel/tpasm/Makefile
index 597b836a8c2..56d985a9e2d 100644
--- a/devel/tpasm/Makefile
+++ b/devel/tpasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/12/02 18:03:25 sketch Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	tpasm1.0r
 PKGNAME=	tpasm-1.0r
-WRKSRC=		${WRKDIR}/tpasm
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ct0.com/pub/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.sqt.com/
 COMMENT=	Assembler for 6805, 68HC11, 6502, Surplus, 8051, Z80, PIC, and AVR
 
+WRKSRC=		${WRKDIR}/tpasm
 USE_GMAKE=	yes
 
 do-install:
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index 3ac9e89d6e7..f6ba2110de1 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
 
 DISTNAME=	uml-1.0.3-1
 PKGNAME=	uml-1.0.3
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=uml/}
 
@@ -13,6 +12,7 @@ COMMENT=	UML Modelling tool
 
 BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
index 79e2554a4ec..36bd959382f 100644
--- a/devel/unidiff/Makefile
+++ b/devel/unidiff/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:43:48 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
 #
 
 DISTNAME=	part01
 PKGNAME=	unidiff-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.landfield.com/software/comp.sources.misc/archive-name/volume25/unidiff/
 EXTRACT_SUFX=	.gz
@@ -14,6 +13,7 @@ COMMENT=	Converts between uni-diffs and context diffs
 
 BUILD_DEPENDS=	gsharutils-4.2.1:../../archivers/gsharutils
 
+WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
 
 do-install:
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 878d5d821a6..787a4709d56 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/09/21 19:58:38 kent Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:13:30 agc Exp $
 
 DISTNAME=	w32api-2.4-src
 PKGNAME=	w32api-2.4
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mingw/}
 DISTFILES+=	${DISTNAME}.tar.gz pe-crt-1.2.1.tar.gz
@@ -14,6 +13,7 @@ COMMENT=	Free headers and libraries for the Win32 API
 
 BUILD_DEPENDS+=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 PE_CC=		${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
 PE_AR=		${CROSSBASE}/bin/i386-netbsdpe-ar
 CRTWRKSRC=	${WRKDIR}/pe-crt-1.2.1
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 0a3473d7ed6..899677e0d78 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:43:48 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:30 agc Exp $
 #
 
 DISTNAME=	xxgdb-1.12
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	devel x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
 MAINTAINER=	rh@trapdoor.vip.at
 COMMENT=	Graphical X11 interface for gdb
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 0e683ac8666..876c8d3bcff 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		abiword-${DIST_VER}
 PKGREVISION=				2
-WRKSRC=			${WRKDIR}/${DISTNAME}/abi
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=abiword/}
 
@@ -16,6 +15,7 @@ BUILD_USES_MSGFMT=	yes
 # GTK1 version and previous name of the GTK2 version
 CONFLICTS=		abiword-personal-[0-9]* abiword2-[0-9]*
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/abi
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
diff --git a/editors/abiword1/Makefile b/editors/abiword1/Makefile
index 4e7815e7494..86ab2847e84 100644
--- a/editors/abiword1/Makefile
+++ b/editors/abiword1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -8,7 +8,6 @@
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
 
@@ -23,6 +22,7 @@ ABIWORD_VERS=	1.0.5
 
 CONFLICTS=	abiword-[0-9]* abiword2-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 USE_GMAKE=	# defined
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index fbb3ebfd46b..848f10d205e 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2003/06/05 17:20:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/08/23 02:10:57 hoek Exp
 #
 
 DISTNAME=	beav_1.40-11
 PKGNAME=	beav-1.40.11
-WRKSRC=		${WRKDIR}/beav-1.40
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=hamm/hamm/source/editors/}
 
 MAINTAINER=	bad@NetBSD.ORG
 COMMENT=	Binary Editor And Viewer, a full featured binary file editor
 
+WRKSRC=		${WRKDIR}/beav-1.40
 MAKE_ENV+=	SED="${SED}"
 
 pre-patch:
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 44fe752cecd..35930ca7d5a 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	beaver-0.2.6
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	editors
 MASTER_SITES=	http://savannah.nongnu.org/download/beaver/
 
@@ -11,6 +10,7 @@ MAINTAINER=	vincent.derrien@ahoup.net
 HOMEPAGE=	http://www.nongnu.org/beaver/
 COMMENT=	Lightweight GTK+ text editor with syntax highlighting
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 159693f78ae..2e31a7b7271 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	bvi-1.3.0.src
 PKGNAME=	bvi-1.3.0
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bvi/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://bvi.sourceforge.net/
 COMMENT=	Vi-like editor for binary files
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	SHELL=${SH}
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index 3003673bb94..a74e689fa10 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:34:23 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	ee-1.4.5a.src
 PKGNAME=	easyedit-1.4.5a
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mahon.cwx.net/
 COMMENT=	Easy to use text editor
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit
 	${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/man/man1/easyedit.1
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 2ea4a21d3ec..7103b7decdd 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		gice-0.6.1
 PKGREVISION=		5
-WRKSRC=			${WRKDIR}/gice
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,7 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://gice.sourceforge.net/
 COMMENT=		Powerful C text editor with advanced features
 
+WRKSRC=			${WRKDIR}/gice
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 032e88d8007..1d8bf818353 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	hexedit-1.2.2
 PKGREVISION=			2
-WRKSRC=		${WRKDIR}/hexedit
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/
 EXTRACT_SUFX=	.src.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 COMMENT=	To view and edit files in hexadecimal or ASCII
 
+WRKSRC=		${WRKDIR}/hexedit
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 420e169cc1d..42f4c6d2020 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/08/23 15:10:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=       jde-2.3.2
-WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
 CATEGORIES=     devel editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
@@ -17,6 +16,8 @@ DEPENDS+=       eieio>=0.17:../../lang/eieio
 DEPENDS+=       semantic>=1.4rc13:../../devel/semantic
 DEPENDS+=       elib>=1.0:../../devel/elib
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}/lisp
+
 .include "../../mk/emacs.mk"
 
 # XEmacs has its own JDE package
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 8d555cea20b..56b77825a20 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:34:31 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/joe
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	explorer@NetBSD.org
 COMMENT=	Joe's own editor
 
+WRKSRC=		${WRKDIR}/joe
 ALL_TARGET=	joe
 
 CFLAGS+=	-DTERMINFO
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index 0a9b7e1186b..686d82d2b81 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:34:35 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	leim-${VERSION}
-WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
@@ -12,6 +11,7 @@ COMMENT=	Libraries of Emacs Input Methods (for emacs21)
 
 DEPENDS+=	emacs>=${VERSION}:../emacs
 
+WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 7eeec10106e..111bfa8a9b0 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:34:36 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/emacs-20.7/leim
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
@@ -13,6 +12,7 @@ COMMENT=	Libraries of Emacs Input Methods
 
 DEPENDS+=	emacs-${VERSION}nb2:../emacs20
 
+WRKSRC=		${WRKDIR}/emacs-20.7/leim
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 98eda3a8b20..3a92c60e0f1 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:34:37 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	manedit-0.5.6
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://wolfpack.twu.net/ManEdit/
 COMMENT=	UNIX Manual (man, manpage) page editor, viewer, and browser for X11
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/manedit
 USE_BUILDLINK2=	YES
 
 MAKE_ENV+=	CPP="${CXX}"
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index b4485c2971d..10672f13798 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:34:38 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=		matlab.el
 PKGNAME=		matlab-mode-2.3
-WRKSRC=			${WRKDIR}
 CATEGORIES=		editors math
 MASTER_SITES=		http://www.mathworks.com/matlabcentral/files/104/
 EXTRACT_SUFX=
@@ -12,6 +11,7 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=104&objectType=file
 COMMENT=		Matlab mode for Emacs
 
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}
 DIST_SUBDIR=		${PKGNAME}
 
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 4baf843bc8c..295e3c559d2 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/08/09 10:48:09 seb Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/mule
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/
 
@@ -21,6 +20,7 @@ CONFLICTS=	emacs-[0-9]*
 .include "../../inputmethod/canna-lib/buildlink2.mk"
 .endif
 
+WRKSRC=		${WRKDIR}/mule
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 8fd86a3c9bb..71b9c2bbadc 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:40:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ne
 PKGNAME=	ne-1.26
-WRKSRC=		${WRKDIR}/src
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/NE/
 DISTFILES=	ne.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec
@@ -11,6 +10,7 @@ MAINTAINER=	bjh@mail.dotcom.fr
 COMMENT=	Re-write of Phoenix E.  A sensible light-weight editor
 
 DIST_SUBDIR=	${PKGNAME}
+WRKSRC=		${WRKDIR}/src
 
 EXTRACT_ONLY=	ne.tar.gz
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 16224528fe4..38f4e90b736 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/12/12 10:20:53 adam Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	nedit-${VERS}-source
 PKGNAME=	nedit-${VERS}
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nedit.org/ftp/v${VERS:S/./_/g}/ \
 		http://www.au.nedit.org/ftp/v${VERS:S/./_/g}/ \
@@ -15,6 +14,7 @@ COMMENT=	Motif based standard GUI style text editor
 
 VERS=		5.3
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 ALL_TARGET=		netbsd
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 5ba50877829..6ec9f36f95b 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ng-1.4.3
-WRKSRC=         ${WRKDIR}/ng
 CATEGORIES=     editors japanese
 MASTER_SITES=   http://tt.sakura.ne.jp/~amura/archives/ng/
 
@@ -9,6 +8,7 @@ MAINTAINER=     fk200329@fsinet.or.jp
 HOMEPAGE=	http://tt.sakura.ne.jp/~amura/ng/
 COMMENT=	Very light Emacs-clone with japanese support
 
+WRKSRC=         ${WRKDIR}/ng
 USE_BUILDLINK2=	YES
 
 .include "../../mk/bsd.prefs.mk"	# for USE_CANNA
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 107062a4c4d..57223f68b4e 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/03/29 12:40:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=	nvi-1.79
 PKGNAME=	nvi-m17n-1.79.19991117
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	editors
 MASTER_SITES=	ftp://sleepy.vwh.net/pub/ \
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
@@ -17,6 +16,7 @@ COMMENT=	Clone of vi/ex, with multilingual patch
 
 CONFLICTS=	vigor-[0-9]* nvi-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index f0a5ae0ce83..9d82dc467e9 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/01/11 19:43:27 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:05 agc Exp $
 #
 
 DISTNAME=	nvi-1.81.5
-WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 CATEGORIES=	editors
 MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +18,7 @@ CONFIGURE_ENV+=		vi_cv_include_sys_select=no
 .  endif
 .endif
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS+=	--with-db3=${BUILDLINK_PREFIX.db3}
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 5c4a514a159..b7e31a5693b 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:34:47 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:14:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		editors plan9
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=		.msg.gz
@@ -15,6 +14,7 @@ COMMENT=		Unix version of Rob Pike's editor for plan9
 
 DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
 
+WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
 MANCOMPRESSED=		yes
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 34ed1001d60..a8cd467623b 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:51 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_cs_CZ
 PKGNAME=	ted-cs-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Czech spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index b3d1db46816..844ac8ad8d0 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:52 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_da_DK
 PKGNAME=	ted-da-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Danish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 5f985fdb887..7ed18777179 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:52 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	Ted_de_DE
 PKGNAME=	ted-de-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	German spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index 24ae0b200bb..af11d3b8dd1 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:54 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_en_GB
 PKGNAME=	ted-en-gb-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	UK English spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 51c83c3c8ac..96ee21b55d1 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:54 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	ted-2.14.src
 PKGNAME=	ted-en-us-2.14
-WRKSRC=		${WRKDIR}/Ted-2.14
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	US English spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}/Ted-2.14
 USE_X11BASE=	YES
 NO_BUILD=	YES
 
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index fd282bfb20e..971034a712f 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:55 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_es_ES
 PKGNAME=	ted-es-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Spanish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 40951f7634c..e8f47f0bcce 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:56 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_fr_FR
 PKGNAME=	ted-fr-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	French spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index 69eb119b644..be6d8d8763b 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_it_IT
 PKGNAME=	ted-it-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Italian spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index b3e540f26ae..75d70bac8f7 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:58 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_nl_NL
 PKGNAME=	ted-nl-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Dutch spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 4305d7cd575..0c95b8de694 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:34:59 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_no_NO
 PKGNAME=	ted-no-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Norwegian spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index a1719068ca1..13f0a3f1472 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:34:59 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_pl_PL
 PKGNAME=	ted-pl-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Polish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index afe653adbc8..05a6154cff5 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:00 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_pt_PT
 PKGNAME=	ted-pt-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Portuguese spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 57d119874d8..e718ab966e5 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:01 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	Ted_sv_SE
 PKGNAME=	ted-sv-2.14
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -13,6 +12,7 @@ COMMENT=	Swedish spelling dictionary for the Ted word processor
 
 DEPENDS+=       ted>=2.6:../../editors/ted
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.14
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 19c9a86e0f0..09ef095e874 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
 
 DISTNAME=	ted-2.14.src
 PKGNAME=	ted-2.14
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/Ted-2.14
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/	\
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nllgg.nl/Ted/
 COMMENT=	X11 based WordPad-like word processor
 
+WRKSRC=		${WRKDIR}/Ted-2.14
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 
diff --git a/editors/treetext/Makefile b/editors/treetext/Makefile
index 2ebb8bdcc9f..25490ec1ced 100644
--- a/editors/treetext/Makefile
+++ b/editors/treetext/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:14:06 agc Exp $
 #
 
 DISTNAME=	TreeText-0.3.3-src
 PKGNAME=	${DISTNAME:C/-src//}
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/treetext/treetext
 CATEGORIES=	editors
 MASTER_SITES=	http://www.ab.wakwak.com/~tino/fox/treetext/
 EXTRACT_SUFX=	.zip
@@ -15,6 +14,7 @@ COMMENT=	Multi documents editor
 
 BROKEN=		Compilation fails due to outdated code with respect to our fox package.
 
+WRKSRC=		${WRKDIR}/treetext/treetext
 USE_BUILDLINK2=	# defined
 USE_X11BASE=	# defined
 
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 6ff43b4cdde..0add812e7c4 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:35:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:14:06 agc Exp $
 # FreeBSD: ports/editors/uemacs/Makefile,v 1.14 1999/10/07 06:49:01 tg Exp
 
 DISTNAME=	ue400dev
 PKGNAME=	uemacs-4.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://aquest.com/pub/uemacs400/disk2/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	tron@NetBSD.org
 COMMENT=	"emacs" key sequences compatible full screen editor
 
+WRKSRC=		${WRKDIR}
+
 post-extract:
 	${CP} -r ${WRKSRC}/freebsd ${WRKSRC}/netbsd
 
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 983399c5997..ce139dadc46 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/09/09 18:00:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:06 agc Exp $
 #
 
 DISTNAME=	vigor-0.016
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vigor/}
 
@@ -12,6 +11,7 @@ COMMENT=	nvi with excessive online "help"
 
 CONFLICTS+=	nvi-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 USE_X11=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index b8d601f84dc..404df7d653d 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
 PKGREVISION=	6
-WRKSRC= 	${WRKDIR}/kvim-${KVIM_VERSION}/src
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.kde.org/stable/apps/KDE3.x/utils/ \
 		http://freenux.org/kvim/
@@ -18,6 +17,7 @@ KVIM_VERSION=	6.1.141
 CONFLICTS+=	vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=	vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]*
 
+WRKSRC= 		${WRKDIR}/kvim-${KVIM_VERSION}/src
 USE_BUILDLINK2=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 661a8c5dcad..ce3c9c6162c 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.34 2003/07/17 21:35:09 grant Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/01/20 12:14:06 agc Exp $
 
 VIM_VERSION=		6.2
 VIM_PATCHLEVEL=		0
 DISTNAME=		vim-${VIM_VERSION}
-WRKSRC=			${WRKDIR}/vim62/src
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
@@ -23,6 +22,7 @@ HOMEPAGE=		http://www.vim.org/
 
 CONFLICTS+=		vim-kde-[0-9]*
 
+WRKSRC=			${WRKDIR}/vim62/src
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index a85c6653ea6..2b8e2adabd4 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2003/12/22 08:14:26 uebayasi Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/20 12:14:06 agc Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.13
-WRKSRC=		${WRKDIR}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=packages/}
 DISTFILES=	\
@@ -132,6 +131,7 @@ COMMENT=	Common elisp packages for xemacs 21
 
 DEPENDS+=	xemacs>=21.1.14:../../editors/xemacs
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGBASE}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index ab3138d6888..9044f50db51 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/06/14 06:50:52 tron Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:40 agc Exp $
 
 DISTNAME=	BasiliskII_src_14032003
 PKGNAME=	BasiliskII-1.0.20030314
-WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 CATEGORIES=	emulators
 MASTER_SITES=	http://gwenole.beauchesne.online.fr/basilisk2/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://gwenole.beauchesne.online.fr/basilisk2/
 COMMENT=	Open Source 68k Macintosh emulator
 
+WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 822884f2429..1ebca93ecf9 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:35:18 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=	arcem0.50
 PKGNAME=	arcem-0.50
-WRKSRC=		${WRKDIR}/armul-arc
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arm.uk.linux.org/pub/linux/arcem/
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	ftp://ftp.arm.uk.linux.org/pub/linux/arcem/Index
 COMMENT=	Dave Gilbert's Acorn Archimedes emulator
 
+WRKSRC=		${WRKDIR}/armul-arc
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index d15a52f53f4..f38e25efe84 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/11/22 23:55:15 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=		arnsrc27012002
 PKGNAME=		arnold-20020127
-WRKSRC=			${WRKDIR}/arnold/src
 CATEGORIES=		emulators
 MASTER_SITES=		http://arnold.emuunlim.com/download/
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,7 @@ COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
 # we want case sensitive file names.
 EXTRACT_CMD_OPTS.zip=	-aqo
 
+WRKSRC=			${WRKDIR}/arnold/src
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 ALL_TARGET=		arnold
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 695c1b4aedb..385e3ffad09 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/01/08 15:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=	atari800-1.3.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
@@ -17,6 +16,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index 466a5a59ddd..405524264f4 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2003/08/02 19:52:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:14:40 agc Exp $
 
 DISTNAME=	dn9b0401
-WRKSRC=		${WRKDIR}/darcnes
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +9,7 @@ HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/darcnes
 USE_GMAKE=	yes
 USE_BUILDLINK2=	yes
 PATCHDIR=	${.CURDIR}/../../emulators/darcnes/patches
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index 39dd7896689..b5183eb710a 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:35:27 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=		doscmd-19960502-2
 PKGNAME=		doscmd-19960502.2
-WRKSRC=			${WRKDIR}/doscmd
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/arch/i386/doscmd/
 
@@ -13,6 +12,7 @@ COMMENT=		MS-DOS emulator (NetBSD/i386 only)
 # mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
 ONLY_FOR_PLATFORM=	NetBSD-1.[345]*-i386
 
+WRKSRC=			${WRKDIR}/doscmd
 MAKE_ENV=		X11BASE=${X11BASE}
 
 MANCOMPRESSED_IF_MANZ=	yes
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index c6d1835a371..4c7c98c123b 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:35:28 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:14:40 agc Exp $
 
 DISTNAME=	fMSX24.tar
 PKGNAME=	fmsx-2.4
-WRKSRC= 	${WRKDIR}/MSX
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.komkon.org/fms/fMSX/
 EXTRACT_SUFX=	.Z
@@ -17,6 +16,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+WRKSRC= 	${WRKDIR}/MSX
 USE_X11=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 0cca6488a21..40395ad40e0 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:14:40 agc Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.flame.org/NetBSD/
 
@@ -12,6 +11,7 @@ COMMENT=		Libraries necessary for FreeBSD compatibility, including XFree86
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 
 do-install:
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 9271eee926d..db69d2d5303 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/01/01 03:18:15 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	hatari-0.45
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 USE_GMAKE=	YES
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
index e1b224d9dfc..324839ac380 100644
--- a/emulators/hercules-images/Makefile
+++ b/emulators/hercules-images/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		mftr33
 PKGNAME=		hercules-images-20010222
-WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.conmicro.cx/hercules/
 COMMENT=		Images to IPL the Hercules emulator
 
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 EXTRACT_ONLY=
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 6dda02163ab..e76703ee9d6 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		linuxppc_lib-2000.4.6
-WRKSRC=			${WRKDIR}/${DISTNAME}
 CATEGORIES=		emulators
 MASTER_SITES+=		ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 MASTER_SITES+=		http://linuxppc.org/software/java/dl/motif/
@@ -38,6 +37,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-macppc NetBSD-1.5Z[A-Z]-macppc \
 			NetBSD-1.5[U-Z]-sandpoint NetBSD-1.5Z[A-Z]-sandpoint \
 			NetBSD-1.[6-9]*-sandpoint
 
+WRKSRC=			${WRKDIR}/${DISTNAME}
 SHLIB_HANDLING=		NO
 CHECK_SHLIBS=		NO
 DIST_SUBDIR=		linuxppc_lib
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index 438110daf78..21a5abc8666 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:45:56 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	minivmac-0.1.7.src
 PKGNAME=	minivmac-0.1.7
-WRKSRC=		${WRKDIR}/minivmac
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=minivmac/}
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.gryphel.com/c/minivmac/
 COMMENT=	Miniature Macintosh emulator
 
+WRKSRC=		${WRKDIR}/minivmac
 USE_X11BASE=	YES
 
 SCRIPTS_ENV+=	CC="${CC}"
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
index 3117e0578f6..29bcfe6083f 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/07/30 19:20:33 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	mmix-20030622
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators devel lang
 MASTER_SITES=	http://www-cs-faculty.stanford.edu/~knuth/programs/
 
@@ -11,6 +10,7 @@ COMMENT=	Simulators for Knuth's MMIX RISC architecture
 
 BUILD_DEPENDS+= cweb-[0-9]*:../../devel/cweb
 
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	all doc
 
 do-install:
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index ed08a0e4d22..56a66101779 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	netscape-4.7-3.alpha
 PKGNAME=	osf1_lib-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.support.compaq.com/private/alpha-tools-software/netscape/
 EXTRACT_SUFX=	.rpm
@@ -22,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+WRKSRC=			${WRKDIR}
 EMULSUBDIR=		emul/osf1
 EMULDIR=		${PREFIX}/${EMULSUBDIR}
 
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 6a854c35bf3..483aebe20c5 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:35:41 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
 PKGNAME=	palmosemulator-${POSE_VERSION}
 PKGREVISION=	2
-WRKSRC=         ${WRKDIR}/Emulator_Src_${POSE_VERSION}
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -23,6 +22,7 @@ SITES_emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
 
 #LICENSE=       GPL
 
+WRKSRC=         ${WRKDIR}/Emulator_Src_${POSE_VERSION}
 POSE_BUILD_DIR=	${WRKSRC}/BuildUnix
 POSE_SHARE_DIR=	${PREFIX}/share/palmosemulator
 POSE_SKINS_DIR=	${POSE_SHARE_DIR}/skins
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 049e671969a..b0e91941bac 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/25 09:19:28 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 PEACE_VERSION=	20030919
 DISTNAME=	peace-0.0.${PEACE_VERSION}
 SITES_peace-20030919.tar.gz=http://cvs.kshosen.ac.jp/PEACE/src/
-WRKSRC=		${WRKDIR}/peace
 CATEGORIES=	emulators
 
 MAINTAINER=	peace-sacrifice@hauN.org
@@ -21,6 +20,8 @@ DEPENDS+=	icu>=2.4nb1:../../textproc/icu
 BUILD_DEPENDS=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
 BUILD_DEPENDS+=	w32api>=2.4:../../devel/w32api
 BUILD_DEPENDS+= x11-links-*:../../pkgtools/x11-links
+
+WRKSRC=		${WRKDIR}/peace
 CPPFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include \
 		-I${WRKDIR}/cross/i386-netbsdpe/include/c++
 LDFLAGS=	-L${WRKSRC}/lib
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 9f6fb181385..f5aa7e475b3 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/09/26 21:36:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	simhv30-2
 PKGNAME=	simh-3.0.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -14,6 +13,7 @@ HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supnik's historical computer simulator
 
 EXTRACT_CMD=	unzip -aoq ${DOWNLOADED_DISTFILE}
+WRKSRC=		${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6d76dfbbb2b..489c560d09b 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/05/05 16:24:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/release
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.snes9x.com/zips/
 EXTRACT_SUFX=		.zip
@@ -14,6 +13,7 @@ COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
+WRKSRC=			${WRKDIR}/release
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index e9049c0a88e..74e342d97ec 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:35:45 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.cs.wisc.edu/~larus/SPIM/ \
 			ftp://ftp.cs.wisc.edu/pub/spim/
@@ -15,6 +14,7 @@ COMMENT=		MIPS R2000 Simulator
 
 DIST_SUBDIR=		${PKGNAME}
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 7ff1569da2c..dd4f1b56a53 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:18 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src/build
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://stella.atari.org/
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src/build
 USE_X11=	yes
 
 MAKEFILE=	makefile
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 592359ead64..e2529e98c4f 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/30 06:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
 PKGNAME=		twin-3.1.14
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/twin
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.willows.com/pub/twin/
 
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.willows.com/
 COMMENT=		Cross-platform implementation of the win32 api
 
+WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 235c61baa66..8beb019e619 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:34:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=		VisualBoyAdvance-src-1.6a
 PKGNAME=		vba-1.6.0.1
-WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vba/}
 EXTRACT_SUFX=		.zip
@@ -11,6 +10,7 @@ MAINTAINER=		snj@pobox.com
 HOMEPAGE=		http://vboy.emuhq.com/
 COMMENT=		Gameboy advance emulator
 
+WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
 USE_GMAKE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 7d0a6240c7a..2be9708f6b1 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:36:22 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	vmware-netbsd-1.2
 PKGNAME=	vmware-module-1.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=   ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ CONFLICTS=	vmware-module-3*
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	# defined
 
 NO_SRC_ON_FTP=		already there
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index ffb2f1fac87..9f9315fcf58 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/09/18 16:25:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	VMware-2.0.4-1142
 PKGNAME=	vmware-2.0.4
-WRKSRC=		${WRKDIR}/vmware-distrib
 CATEGORIES=	emulators
 MASTER_SITES=   http://www4.vmware.com/software/ \
 		http://www.vmware.com/download1/software/ \
@@ -24,6 +23,7 @@ DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
+WRKSRC=		${WRKDIR}/vmware-distrib
 CHECK_SHLIBS=	NO
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index fdb30a38ff8..2e8c77a4d51 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/10/05 07:12:21 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:14:41 agc Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
-WRKSRC=		${WRKDIR}/vmware-distrib
 CATEGORIES=	emulators
 MASTER_SITES=	http://download3.vmware.com/software/wkst/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -21,6 +20,7 @@ DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
 
 LICENSE=	vmware-license
 
+WRKSRC=		${WRKDIR}/vmware-distrib
 CHECK_SHLIBS=	NO
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0d6c67647e5..01a70ad8ed0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2004/01/17 15:22:22 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	Wine-20031212
 PKGNAME=	${DISTNAME:S/W/w/}
 PKGREVISION=	 	1
-WRKSRC= 	${WRKDIR}/${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ibiblio.org/Linux/ALPHA/wine/development/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/} \
@@ -25,6 +24,7 @@ ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386
 
 BUILDLINK_DEPENDS.freetype2=	freetype>=2.1.4
 
+WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 97ca68a43c6..13c53dfdd52 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:36:27 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	x48_041
 PKGNAME=	x48-0.4.1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	emulators
 MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://home.earthlink.net/~rmmlgetz/
 COMMENT=	HP48 emulator
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_IMAKE=	YES
 
 post-install:
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 17fc3c2cee3..ec523fa29fa 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/11/23 07:16:39 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=	xbeeb-0.3.6
-WRKSRC=		${WRKDIR}/xbeeb
 CATEGORIES=	emulators x11
 MASTER_SITES=	ftp://ftp.netcom.net.uk/pub/Micros/BBC/Emulators/Xbeeb/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html
 COMMENT=	Acorn BBC Micro emulator with an X based interface
 
+WRKSRC=		${WRKDIR}/xbeeb
 USE_IMAKE=	yes
 MAN_PAGE=	${WRKDIR}/xbeeb.1
 
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 2769a26555b..b45816d9794 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=		xm71010s
 PKGNAME=		xm7-1010s
-WRKSRC=			${WRKDIR}/vm
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/
 EXTRACT_SUFX=		.lzh
@@ -22,6 +21,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 # convert CRLF to LF
 EXTRACT_CMD=		lha xqt ${DOWNLOADED_DISTFILE}
 
+WRKSRC=			${WRKDIR}/vm
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile.x11
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 662b37901b4..951e8a661e7 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/26 21:41:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:41 agc Exp $
 #
 
 DISTNAME=		zsnes136src
 PKGNAME=		zsnes-1.360
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/zsnes-1.36/src
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
@@ -18,6 +17,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 ALL_TARGET=		zsnes
 
+WRKSRC=			${WRKDIR}/zsnes-1.36/src
 GNU_CONFIGURE=		# defined
 USE_GMAKE=		# defined
 USE_BUILDLINK2=		# defined
diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile
index 9d8e5ba5b61..10bbc3aaa7d 100644
--- a/finance/gkrellm-stock/Makefile
+++ b/finance/gkrellm-stock/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:59 agc Exp $
 
 DISTNAME=	gkrellstock-0.2
 PKGNAME=	gkrellm-stock-0.2
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/gkrellStock-0.2
 CATEGORIES=	finance
 MASTER_SITES=	http://www.geocities.com/m_muthukumar/
 
@@ -13,6 +12,7 @@ COMMENT=	gkrellm stock ticker plugin
 
 DEPENDS+=       p5-finance-quote-1.*:../../finance/p5-finance-quote
 
+WRKSRC=		${WRKDIR}/gkrellStock-0.2
 USE_BUILDLINK2=	# defined
 USE_PERL5=	# defined
 
diff --git a/finance/xfinans/Makefile b/finance/xfinans/Makefile
index 8cb17e13bce..4a0c8253170 100644
--- a/finance/xfinans/Makefile
+++ b/finance/xfinans/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/03/22 13:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:14:59 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
-WRKSRC=			${WRKDIR}/Xfinans/Src
 CATEGORIES=		finance x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/financial/accounting/}
 
@@ -12,6 +11,7 @@ COMMENT=		Xfinans is a useful financial tracking, and account balancing tool
 
 DEPENDS=		gnuplot>=3.7:../../graphics/gnuplot
 
+WRKSRC=			${WRKDIR}/Xfinans/Src
 USE_IMAKE=		yes
 
 post-patch:
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index e7fc71a1485..ca8a2a2907c 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:36:40 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
 #
 
 DISTNAME=	libXg.utf.fonts
 PKGNAME=	libXgFonts-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	These are the UNICODE fonts for use with 9term and sam
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 
diff --git a/fonts/acroread-chsfont/Makefile b/fonts/acroread-chsfont/Makefile
index 1c5a1dbfeb1..456eb9002ab 100644
--- a/fonts/acroread-chsfont/Makefile
+++ b/fonts/acroread-chsfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:41 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chsfont
-WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Chinese Simplified)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/CHSKIT
 TAR_FILE=	${WRKSRC}/LANGCHS.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-chtfont/Makefile b/fonts/acroread-chtfont/Makefile
index 1b287436f66..6cbaec1f3a5 100644
--- a/fonts/acroread-chtfont/Makefile
+++ b/fonts/acroread-chtfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:42 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chtfont
-WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Chinese Traditional)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/CHTKIT
 TAR_FILE=	${WRKSRC}/LANGCHT.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-font-share/Makefile b/fonts/acroread-font-share/Makefile
index c59be69bea2..3ebf65c90d4 100644
--- a/fonts/acroread-font-share/Makefile
+++ b/fonts/acroread-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:43 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	font-share
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 DISTFILES=	korfont${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (common base)
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGCOM.TAR
 
 PLIST_SUBST+=	MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile
index 42e5e9f5d11..c6943f7428f 100644
--- a/fonts/acroread-jpnfont/Makefile
+++ b/fonts/acroread-jpnfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:36:44 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	jpnfont
-WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts japanese
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Japanese)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/JPNKIT
 TAR_FILE=	${WRKSRC}/LANGJPN.TAR
 
 INTERACTIVE_STAGE=	fetch
diff --git a/fonts/acroread-korfont/Makefile b/fonts/acroread-korfont/Makefile
index 5eb5b5d5a52..f03528c1103 100644
--- a/fonts/acroread-korfont/Makefile
+++ b/fonts/acroread-korfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:45 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	korfont
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (Korean)
 
 DEPENDS+=	acroread-font-share-4.0:../../fonts/acroread-font-share
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGKOR.TAR
 
 .include "../acroread-font-share/Makefile.common"
diff --git a/fonts/acroread5-chsfont/Makefile b/fonts/acroread5-chsfont/Makefile
index 30aca34158a..9e49c8b6f88 100644
--- a/fonts/acroread5-chsfont/Makefile
+++ b/fonts/acroread5-chsfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chsfont
-WRKSRC=		${WRKDIR}/CHSKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Chinese Simplified)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/CHSKIT
 TAR_FILE=	${WRKSRC}/LANGCHS.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-chtfont/Makefile b/fonts/acroread5-chtfont/Makefile
index a721a114018..2adb728ac09 100644
--- a/fonts/acroread5-chtfont/Makefile
+++ b/fonts/acroread5-chtfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:47 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	chtfont
-WRKSRC=		${WRKDIR}/CHTKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Chinese Traditinal)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/CHTKIT
 TAR_FILE=	${WRKSRC}/LANGCHT.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-font-share/Makefile b/fonts/acroread5-font-share/Makefile
index 8357d56dd4f..5f5429d0822 100644
--- a/fonts/acroread5-font-share/Makefile
+++ b/fonts/acroread5-font-share/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:50 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	font-share
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 DISTFILES=	korfont${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Asian Font Packs for Acrobat Reader 5 (common base)
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGCOM.TAR
 
 PLIST_SUBST+=	MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
diff --git a/fonts/acroread5-jpnfont/Makefile b/fonts/acroread5-jpnfont/Makefile
index 909074f60f5..d09eee0f78e 100644
--- a/fonts/acroread5-jpnfont/Makefile
+++ b/fonts/acroread5-jpnfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:51 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
 #
 
 DISTNAME=	jpnfont
-WRKSRC=		${WRKDIR}/JPNKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Japanese)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/JPNKIT
 TAR_FILE=	${WRKSRC}/LANGJPN.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-korfont/Makefile b/fonts/acroread5-korfont/Makefile
index 9070c17a3aa..0c69eed6643 100644
--- a/fonts/acroread5-korfont/Makefile
+++ b/fonts/acroread5-korfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:52 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	korfont
-WRKSRC=		${WRKDIR}/KORKIT
 CATEGORIES=	fonts
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -10,6 +9,7 @@ COMMENT=	Asian Font Packs for Acrobat Reader 5 (Korean)
 
 DEPENDS+=	acroread5-font-share-5.0:../../fonts/acroread5-font-share
 
+WRKSRC=		${WRKDIR}/KORKIT
 TAR_FILE=	${WRKSRC}/LANGKOR.TAR
 
 .include "../acroread5-font-share/Makefile.common"
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index 219d41b27d3..038c35b411c 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/12/19 23:40:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	artwiz-aleczapka-1.3
 PKGNAME=        ${DISTNAME:S/aleczapka/fonts/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/artwiz-aleczapka
 CATEGORIES=	fonts
 MASTER_SITES=	http://fluxbox.org/artwiz-aleczapka/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.vastwaters.com/
 COMMENT=	Set of free fonts for X11 desktops
 
+WRKSRC=			${WRKDIR}/artwiz-aleczapka
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_PKGINSTALL=		yes
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index c114263418b..a96dcf21b32 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:57 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	bakoma-20010719
 PKGNAME=	bakoma-fonts-1.1
-WRKSRC=		${WRKDIR}/bakoma
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "on the fly" distfile creation from CTAN messes up the checksums.
@@ -17,6 +16,7 @@ LICENSE+=		no-commercial-use
 NO_SRC_ON_CDROM=	#defined
 NO_BIN_ON_CDROM=	#defined
 BAKOMA_DIR=		${PREFIX}/share/tex-contrib/BaKoMa
+WRKSRC=			${WRKDIR}/bakoma
 
 do-build:
 	${RM} -f ${WRKSRC}/fontmap.map
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index ecbd0bfd108..397dade868a 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:07 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		http://www.tea.forus.or.jp/toshi/exhibition/
 
@@ -10,6 +9,7 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		${MASTER_SITES}/elisat10.html
 COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index ff279278471..5555002ab95 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:08 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		http://www.wheel.gr.jp/~dai/software/ \
 			ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
@@ -18,6 +17,7 @@ SITES_elisau10${EXTRACT_SUFX}=	\
 			http://hp.vector.co.jp/authors/VA004814/freesoft/
 SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 1d232a27a21..d1d167d7eb8 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:09 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		${MASTER_SITE_LOCAL} # original site was closed.
 
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 
+WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 19a5d8d1cdb..400451d0b97 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:37:14 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:17 agc Exp $
 # Based on FreeBSD Id: Makefile,v 1.6 1999/02/12 17:23:40 motoyuki Exp
 #
 
 DISTNAME=	jisx0212fonts-0.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts x11 japanese
 MASTER_SITES=	ftp://ginkaku.kudpc.kyoto-u.ac.jp/fonts/ \
 		ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ \
@@ -13,6 +12,7 @@ DISTFILES=	${BDF14} ${BDF16} ${BDF24} ${BDF40}
 MAINTAINER=	itojun@itojun.org
 COMMENT=	X11 X0212-1990 font.  14, 16, 24 and 40 dots availble
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 EXTRACT_ONLY=	${DISTFILES}
 MAKE_ENV+=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile
index c8e5a944ea7..0b71ed66c11 100644
--- a/fonts/kcfonts/Makefile
+++ b/fonts/kcfonts/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=      kcfonts-1.05
-WRKSRC=        ${WRKDIR}
 CATEGORIES=    fonts
 MASTER_SITES=  ftp://freebsd.sinica.edu.tw/pub/distfiles/
 
 MAINTAINER=    kevlo@midassol.com
 COMMENT=       Kuo Chauo Chinese Fonts collection
 
+WRKSRC=        ${WRKDIR}
 USE_X11BASE=   yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile
index 35b45241925..5223f77bab3 100644
--- a/fonts/mkfontalias/Makefile
+++ b/fonts/mkfontalias/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:47:07 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	mkfontalias.py
 PKGNAME=	mkfontalias-20000521
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts
 MASTER_SITES=	http://home.c2i.net/dark/
 EXTRACT_SUFX=	# empty
@@ -12,6 +11,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://home.c2i.net/dark/linux.html#fuzzy
 COMMENT=	Creates a fonts.alias from the fonts.dir for TrueType fonts
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile
index fd8aa8d21c3..71841e433c4 100644
--- a/fonts/mkfontscale/Makefile
+++ b/fonts/mkfontscale/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/10/13 09:53:59 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	mkfontscale-20020524
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/mkfontscale
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.pps.jussieu.fr/~jch/software/files/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.pps.jussieu.fr/~jch/software/files/
 COMMENT=	Create an index of scalable font files for X
 
+WRKSRC=		${WRKDIR}/mkfontscale
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 3e2addc2301..bad44b8bdb8 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:47:09 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts graphics x11
 MASTER_SITES=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	Convert X font from PCF to BDF
 
+WRKSRC=		${WRKDIR}
 USE_GMAKE=	YES
 MAKEFILE=	Makefile.gcc
 
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index 588b1f4a826..a56039cc29e 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/05 06:49:31 junyoung Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	pfaedit_full-${VERSION}
 PKGNAME=	pfaedit-20${VERSION}
-WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
 CATEGORIES=	fonts editors
 MASTER_SITES=	http://pfaedit.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	Postscript font editor
 
 VERSION=	040102
 
+WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
 USE_GMAKE=	YES
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/fonts/ttmkfdir/Makefile b/fonts/ttmkfdir/Makefile
index c734e78d244..9854bf65794 100644
--- a/fonts/ttmkfdir/Makefile
+++ b/fonts/ttmkfdir/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:47:10 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:17 agc Exp $
 #
 
 DISTNAME=	ttmkfdir
 PKGNAME=	ttmkfdir-0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	fonts x11
 MASTER_SITES=	http://www.joerg-pommnitz.de/TrueType/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.joerg-pommnitz.de/TrueType/xfsft.html
 COMMENT=	Tool that creates a fonts.scale file
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 do-install:
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index c9d3759a4c0..59768b2f675 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:17 agc Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -12,6 +11,7 @@ COMMENT=		Configuration file for VFlib to use kochi-ttf
 DEPENDS+=		ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 DEPENDS+=		kochi-ttf-[0-9]*:../../fonts/kochi-ttf
 
+WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
 NO_BUILD=		YES
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
 
diff --git a/geography/gpsutils/Makefile b/geography/gpsutils/Makefile
index 8b1d1c84fd6..7a178fd5ee7 100644
--- a/geography/gpsutils/Makefile
+++ b/geography/gpsutils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/10/04 21:21:01 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:16:00 agc Exp $
 #
 
 DISTNAME=		gpsutils-0.4.0
-WRKSRC=			${WRKDIR}/gpsutils-0.4.0/src
 CATEGORIES=		geography
 MASTER_SITES=		http://www.wombat.ie/gps/
 
@@ -10,6 +9,7 @@ MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://www.wombat.ie/gps/
 COMMENT=		Capture and convert data from a Garmin GPS receiver
 
+WRKSRC=			${WRKDIR}/gpsutils-0.4.0/src
 USE_BUILDLINK2=		yes
 
 do-install:
author	agc <agc@pkgsrc.org>	2004-01-20 12:07:06 +0000
committer	agc <agc@pkgsrc.org>	2004-01-20 12:07:06 +0000
commit	dc52048e014fdad9bb69ef9db159835a61c8dd4d (patch)
tree	28fc431efa48feea798736cefee933a6529a5c91
parent	46eceba7253d40f1643bc06f73cc7fd2148c2e8e (diff)
download	pkgsrc-dc52048e014fdad9bb69ef9db159835a61c8dd4d.tar.gz