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

50 files changed, 107 insertions, 100 deletions

diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index 6d1d53d9a52..ce19572d88b 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:25 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	adjustkernel-1.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,6 +8,7 @@ DISTFILES=	# empty
 MAINTAINER=	mjl@NetBSD.org
 COMMENT=	Generate a kernel config
 
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=    yes
 NO_BUILD=	yes
 NO_MTREE=	yes
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index 486572face8..4c4ff2fc688 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2003/11/11 13:00:24 wennmach Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	apNetBSD
 PKGNAME=	aperture-2.0
 PKGREVISION=	5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils x11
 EXTRACT_SUFX=	.shar
 # Not sure why ${MASTER_SITE_LOCAL:=${PKGNAME}} doesn't work, but the
@@ -25,6 +24,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
+WRKSRC=			${WRKDIR}
 ALL_TARGET=		cleandir depend all
 DIST_SUBDIR=		${PKGNAME}
 INSTALL_TARGET=		dirs includes install
diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile
index 5a81802c894..da756889b62 100644
--- a/sysutils/atitvout/Makefile
+++ b/sysutils/atitvout/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2003/08/30 16:17:45 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=       atitvout-0.4
-WRKSRC=		${WRKDIR}/atitvout
 CATEGORIES=	sysutils graphics
 MASTER_SITES=	http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/
 
@@ -11,6 +10,7 @@ COMMENT=	Allows TV-Out connector support under Linux/NetBSD
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 # Linux-*-i386 [gnumakefile needs work]
 
+WRKSRC=			${WRKDIR}/atitvout
 USE_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 175e5793208..01abfd208e4 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/06/18 09:22:24 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		${PKGNAME}.src
 PKGNAME=		cdrdao-1.1.7
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -11,6 +10,7 @@ MAINTAINER=		david@maxwell.net
 HOMEPAGE=		http://cdrdao.sourceforge.net/
 COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 CONFIGURE_ARGS+=	--with-pcctsbin=${PREFIX}/bin
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index 92ad70115a4..b19f550d9cf 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/12/28 19:22:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	cdrtools-2.01a21
 PKGNAME=	cdrecord-xcdroast-0.98a15.2.01a21
-WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +15,7 @@ CONFLICTS+=	cdrecord-xcdroast098a13-*
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/a.*//}
 USE_BUILDLINK2=		# defined
 USE_GMAKE=		# defined
 
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index 1776796bb44..ccce6953485 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	cdrtools-2.01a18
 PKGNAME=	cdrtools-ossdvd-2.01.1.18
-WRKSRC=		${WRKDIR}/cdrtools-2.01
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 
@@ -18,6 +17,7 @@ CONFLICTS=	mkisofs-[0-9]* cdrecord-* cdrtools-*
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=			${WRKDIR}/cdrtools-2.01
 USE_BUILDLINK2=		# defined
 USE_GMAKE=		# defined
 TBL?=			tbl
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
index af6031c9323..1a29fcb955f 100644
--- a/sysutils/cpuburn/Makefile
+++ b/sysutils/cpuburn/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:30 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	cpuburn_1_4
 PKGNAME=	cpuburn-1.4
 PKGREVISION=	2
-WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://users.ev1.net/~redelm/
 EXTRACT_SUFX=	_tar.gz
@@ -16,6 +15,8 @@ COMMENT=	CPU load testing utilities for Pentium pro and later
 ONLY_FOR_PLATFORM= *-*-i[3456]86
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${GTAR} -xf -
 
+WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/burnBX ${PREFIX}/bin/burnBX
 	${INSTALL_PROGRAM} ${WRKSRC}/burnK6 ${PREFIX}/bin/burnK6
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 278fe2940cb..705cb3c5143 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:53:30 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=       	crashme-2.4
-WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=   	http://ochimizu-www.jaist.ac.jp:8000/linux/vger/crashme/
 EXTRACT_SUFX=		-shar
@@ -13,5 +12,6 @@ COMMENT=		Try to crash machine with random arguments to random system calls
 
 EXTRACT_CMD=		${EXTRACT_CMD.shar}
 MAKEFILE=		makefile
+WRKSRC=			${WRKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dmesg2gif/Makefile b/sysutils/dmesg2gif/Makefile
index aad5de1087f..7c379a2cba5 100644
--- a/sysutils/dmesg2gif/Makefile
+++ b/sysutils/dmesg2gif/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/11/11 16:30:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		dmesg2gif-1.3
-WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -12,6 +11,7 @@ COMMENT=		Output dmesg(8) device tree as GIF image
 
 DEPENDS+=		graphviz-[0-9]*:../../graphics/graphviz
 
+WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile
index 0dd2fcac1dc..bc78b52ab1c 100644
--- a/sysutils/easydiskpasswd/Makefile
+++ b/sysutils/easydiskpasswd/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:24:13 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	easydiskpasswd-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 DISTFILES=	# empty
 
 MAINTAINER=	drochner@NetBSD.org
 COMMENT=	Tool to unlock a password protected USB "EasyDisk"
 
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 
 # we depend on SCIOCCOMMAND and the "make" infrastructure
diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
index f4e23da078c..ebc89a94371 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/01/05 12:48:30 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	etcupdate-20031112
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -14,6 +13,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# defined
 NO_CHECKSUM=	# defined
 NO_BUILDLINK=	# defined
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index c00534d8c9b..16b4e2c40ce 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:24 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	extipl-5.04
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tsden.org/takamiti/extipl/archs/
 
@@ -12,6 +11,7 @@ COMMENT=	IPL compatible OS boot selector
 
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 USE_GMAKE=	#defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
index f12ba261f18..990ed07a88b 100644
--- a/sysutils/fakeroot/Makefile
+++ b/sysutils/fakeroot/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:33 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	fakeroot_0.5.8
 PKGNAME=	fakeroot-0.5.8
-WRKSRC=		${WRKDIR}/fakeroot-0.5.8
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/f/fakeroot/}
 
 MAINTAINER=	lonewolf@NetBSD.org
 COMMENT=	Creates a fake root environment
 
+WRKSRC=		${WRKDIR}/fakeroot-0.5.8
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile
index 515f8a02561..c67c8af3e4e 100644
--- a/sysutils/fix4SA110rev2/Makefile
+++ b/sysutils/fix4SA110rev2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/31 09:17:45 abs Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	fix4SA110rev2-1.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/arch/arm32/misc/
 DISTFILES=	fix4SA110rev2.c fix4SA110rev2.README
@@ -15,6 +14,8 @@ COMMENT=	Modify arm32 binaries to work around SA rev2 problems
 ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=		${WRKDIR}
+
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
 
diff --git a/sysutils/free/Makefile b/sysutils/free/Makefile
index 82f849f637b..de9c8b92441 100644
--- a/sysutils/free/Makefile
+++ b/sysutils/free/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/08/29 19:16:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		free-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -13,6 +12,7 @@ COMMENT=		Displays memory usage
 USE_PKGINSTALL=		YES
 
 # This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
+WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 89fb60a04bd..f36a947a539 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
 PKGNAME=		gcdmaster-1.1.7
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -14,6 +13,7 @@ COMMENT=		GUI for cdrdao with some editing capability
 
 DEPENDS+=		cdrdao-1.1.7:../../sysutils/cdrdao
 
+WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 1d33c6f15bb..ef2534f721f 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:24:15 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
 PKGNAME=	gnometoaster-1.0Beta5
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/gtoaster
 CATEGORIES=	sysutils
 MASTER_SITES=	http://gnometoaster.rulez.org/archive/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gnometoaster.rulez.org/
 COMMENT=	Cd recording frontend for X/Gtk
 
+WRKSRC=			${WRKDIR}/gtoaster
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/sysutils/gworkspace/Makefile.common b/sysutils/gworkspace/Makefile.common
index 7fedb38718c..34b42785f70 100644
--- a/sysutils/gworkspace/Makefile.common
+++ b/sysutils/gworkspace/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2003/07/17 22:53:36 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		gworkspace-0.5.3
-WRKSRC=			${WRKDIR}/${DISTNAME:S/gw/GW/}
 CATEGORIES?=		sysutils gnustep
 MASTER_SITES=		http://www.gnustep.it/enrico/gworkspace/	\
 			http://www.imago.ro/gworkspace/
@@ -10,6 +9,7 @@ MASTER_SITES=		http://www.gnustep.it/enrico/gworkspace/	\
 MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.gnustep.it/enrico/gworkspace/
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/gw/GW/}
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 4cc789d59c1..48a31c94192 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:53:40 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	lavaps-1.20
 PKGNAME=	lavaps-1.20
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
@@ -14,6 +13,7 @@ COMMENT=	Lava lamp of currently running processes
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 USE_PERL5=	build
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_X11=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS=	--with-additional-includes='-I${LOCALBASE}/include' \
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index b6da8381b43..34f33efc399 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2004/01/17 19:37:35 atatat Exp $
+# $NetBSD: Makefile,v 1.73 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		lsof_4.70
 PKGNAME=		${DISTNAME:S/_/-/}
-WRKSRC=			${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
 			ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
@@ -16,6 +15,7 @@ MAINTAINER=		atatat@NetBSD.org
 HOMEPAGE=		http://www-rcd.cc.purdue.edu/~abe/
 COMMENT=		Lists information about open files
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS=		-n ${LOWER_OPSYS}
diff --git a/sysutils/memconf/Makefile b/sysutils/memconf/Makefile
index 53dcd662c04..160c33e442a 100644
--- a/sysutils/memconf/Makefile
+++ b/sysutils/memconf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:24:20 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		memconf
 PKGNAME=		memconf-1.23.2
-WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/
 EXTRACT_SUFX=		.gz
@@ -14,6 +13,7 @@ COMMENT=		Physical memory information utility
 
 ONLY_FOR_PLATFORM=	SunOS-*-* 	# only for Solaris
 
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 
 do-install:
diff --git a/sysutils/mgm/Makefile b/sysutils/mgm/Makefile
index 699b0790565..ee40abf751f 100644
--- a/sysutils/mgm/Makefile
+++ b/sysutils/mgm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:42 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $
 
 DISTNAME=	mgm-1.1
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.xiph.org/mgm/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ COMMENT=	Moaning Goat Meter
 
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 NO_BUILD=	# defined
 USE_PERL5=	YES
 PERL_SCRIPTS=	mgm
diff --git a/sysutils/pcvt-utils/Makefile b/sysutils/pcvt-utils/Makefile
index 2be6736eaa4..657a994b777 100644
--- a/sysutils/pcvt-utils/Makefile
+++ b/sysutils/pcvt-utils/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:44 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=	netbsd-pcvt-20000611
 PKGNAME=	pcvt-utils-20000611
-WRKSRC=		${WRKDIR}/pcvt/Util
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -13,6 +12,8 @@ COMMENT=	Useful leftovers from pcvt: playvt and two font editors
 
 ONLY_FOR_PLATFORM= NetBSD-*-*
 
+WRKSRC=		${WRKDIR}/pcvt/Util
+
 do-install:
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/demo/playvt \
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
index ec69d393f2b..819f02e6d61 100644
--- a/sysutils/pflogsumm/Makefile
+++ b/sysutils/pflogsumm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $
 #
 
 DISTNAME=		pflogsumm-1.0.4
-WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://jimsun.linxnet.com/pub/postfix_contrib/
 EXTRACT_SUFX=		.pl
@@ -16,6 +15,7 @@ DEPENDS+=		p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 USE_PERL5=		# defined
 
diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
index 0abfc37d2e6..7bc0db8dfcb 100644
--- a/sysutils/pstree/Makefile
+++ b/sysutils/pstree/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:53:45 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	pstree-2.19
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 # PKGREVISION=	1
 MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/misc/
@@ -10,6 +9,8 @@ MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/misc/
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Display processes in a tree
 
+WRKSRC=		${WRKDIR}
+
 do-build:
 		cd ${WRKSRC}; ${CC} ${CFLAGS} -o pstree pstree.c
 
diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile
index d0754f5b7fa..a55e720743c 100644
--- a/sysutils/rox-archive/Makefile
+++ b/sysutils/rox-archive/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:24:26 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	Archive-0.1.2
 PKGNAME=	rox-archive-0.1.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/Archive
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -16,6 +15,7 @@ COMMENT=	Simple archiver
 # no real libraries there
 DEPENDS+=	rox-lib>=0.1.4nb1:../../sysutils/rox-lib
 
+WRKSRC=		${WRKDIR}/Archive
 DIST_SUBDIR=	rox
 
 USE_BUILDLINK2=	yes
diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile
index b7a605f6815..558972c81a1 100644
--- a/sysutils/rox-edit/Makefile
+++ b/sysutils/rox-edit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	Edit-0.1.2
 PKGNAME=	rox-edit-0.1.2
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/Edit
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ COMMENT=	Simple text editor for ROX
 
 DEPENDS+=	rox-lib>=0.1.4:../../sysutils/rox-lib
 
+WRKSRC=		${WRKDIR}/Edit
 DIST_SUBDIR=	rox
 
 NO_CONFIGURE=	yes
diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile
index 40753286251..624dc7e441c 100644
--- a/sysutils/rox-lib/Makefile
+++ b/sysutils/rox-lib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	ROX-Lib-0.1.4
 PKGNAME=	rox-lib-0.1.4
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/ROX-Lib
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ COMMENT=	Shared code for ROX applications
 
 DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
 
+WRKSRC=		${WRKDIR}/ROX-Lib
 DIST_SUBDIR=	rox
 
 NO_CONFIGURE=	yes
diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile
index 613e476a851..a452dce98ad 100644
--- a/sysutils/rox-memo/Makefile
+++ b/sysutils/rox-memo/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	Memo-1.0.0
 PKGNAME=	rox-memo-1.0.0
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/Memo
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -16,6 +15,7 @@ COMMENT=	Reminds you about things
 DEPENDS+=	rox-lib>=0.1.4:../../sysutils/rox-lib
 
 DIST_SUBDIR=	rox
+WRKSRC=		${WRKDIR}/Memo
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 68431f24188..cecbeeed64f 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
 PKGNAME=	rox-session-0.1.14
 PKGREVISION=	8
-WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ COMMENT=	Very simple session manager
 
 DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 DIST_SUBDIR=	rox
 
 USE_BUILDLINK2=	yes
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
index 8ebe43a6cf1..6a1ce6dc580 100644
--- a/sysutils/rox-system/Makefile
+++ b/sysutils/rox-system/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	System-0.1.2
 PKGNAME=	rox-system-0.1.2
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/System/src
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ COMMENT=	Simple system monitor
 
 DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
 
+WRKSRC=		${WRKDIR}/System/src
 DIST_SUBDIR=	rox
 
 USE_BUILDLINK2=		yes
diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile
index 0edcc931ff9..b3229845c1b 100644
--- a/sysutils/rox-wallpaper/Makefile
+++ b/sysutils/rox-wallpaper/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	Wallpaper-0.1.1
 PKGNAME=	rox-wallpaper-0.1.1
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/Wallpaper
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -16,6 +15,7 @@ COMMENT=	For setting the backdrop
 DEPENDS+=	rox-lib>=0.1.4:../../sysutils/rox-lib
 DEPENDS+=	ImageMagick>=5.3.9:../../graphics/ImageMagick
 
+WRKSRC=		${WRKDIR}/Wallpaper
 DIST_SUBDIR=	rox
 
 NO_CONFIGURE=	yes
diff --git a/sysutils/rox-wrappers/Makefile b/sysutils/rox-wrappers/Makefile
index 60b60c7da9d..d1f299b4d17 100644
--- a/sysutils/rox-wrappers/Makefile
+++ b/sysutils/rox-wrappers/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:24:32 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	Wrappers-1.0.2
 PKGNAME=	rox-wrappers-1.0.2
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/Wrappers
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,7 @@ COMMENT=	Some example Wrapper applications
 
 DEPENDS+=	rox>=1.2.0nb5:../../sysutils/rox
 
+WRKSRC=		${WRKDIR}/Wrappers
 DIST_SUBDIR=	rox
 
 NO_CONFIGURE=	yes
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index a362a62879d..374a12b0722 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	rox-1.2.0
 PKGREVISION=	9
-WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -14,6 +13,7 @@ COMMENT=	RISC OS-like filer for X
 
 DEPENDS+=	rox-base>=1.0.2nb1:../../sysutils/rox-base
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 DIST_SUBDIR=	rox
 
 USE_BUILDLINK2=		yes
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index c04b80bf07d..48e6836818c 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2003/07/21 17:24:32 martti Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:26:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
 #
 
 DISTNAME=	rtty-3.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.vix.com/pub/vixie/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Multiuser "tip"/"cu" replacement with logging
 
+WRKSRC=		${WRKDIR}
+
 pre-configure:
 	${CHMOD} -R u+w ${WRKDIR}
 	for f in `${FIND} ${WRKDIR}/. -type f -print | ${XARGS} ${GREP} -l '/usr/local'`; do \
diff --git a/sysutils/safetynet/Makefile b/sysutils/safetynet/Makefile
index 447ff7ffe67..df26cb8e323 100644
--- a/sysutils/safetynet/Makefile
+++ b/sysutils/safetynet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:24:33 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	safetynet-1.15
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.unixpimps.org/safetynet/
 
@@ -10,6 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.unixpimps.org/safetynet/
 COMMENT=	Safetynet is a perl script intended to monitor system services
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 USE_PERL5=	YES
 
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
index b6ec8d7205b..4d559e1c945 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:51 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	setquota-0.1
-WRKSRC=		${WRKDIR}/setquota/
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.jurai.net/users/winter/
 
@@ -13,4 +12,6 @@ COMMENT=	Command line quota tools
 # BSD oriented, haven't checked on other environment now
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
+WRKSRC=		${WRKDIR}/setquota/
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index ef70501df23..7aa4dfb5eba 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:53:52 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:26:16 agc Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
-WRKSRC=			${WRKDIR}/sm_linux_v314_install
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.rpm
@@ -23,6 +22,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=			${WRKDIR}/sm_linux_v314_install
 CHECK_SHLIBS=		NO
 _STRIPFLAG_INSTALL=	# defined
 NO_CONFIGURE=		# defined
diff --git a/sysutils/sysbuild/Makefile b/sysutils/sysbuild/Makefile
index fe47c2522ba..6f77c2a4028 100644
--- a/sysutils/sysbuild/Makefile
+++ b/sysutils/sysbuild/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:53:53 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	sysbuild-1.9
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,6 +9,7 @@ DISTFILES=	# empty
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Automate NetBSD system and kernel unprivileged builds
 
+WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
index fba71125348..b2c37274f0e 100644
--- a/sysutils/sysgen/Makefile
+++ b/sysutils/sysgen/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:24:38 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	sysgen
 PKGNAME=	sysgen-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ox.compsoc.net/~dankolb/sysgen/
 EXTRACT_SUFX=	.tar.Z
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	abs@NetBSD.org
 COMMENT=	Assign DEC Qbus or UNIBUS standard CSR and vector addresses
 
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	sysgen
 
 do-install:
diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile
index 7962440d56c..6e95102c108 100644
--- a/sysutils/tkcron/Makefile
+++ b/sysutils/tkcron/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:24:40 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	tkcron-2.12
-WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 tk
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
 EXTRACT_SUFX=	.tcl.gz
@@ -12,6 +11,7 @@ COMMENT=	Graphical frontend to crontab
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
+WRKSRC=		${WRKDIR}
 USE_X11=	yes
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
 
diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
index b2d6c2e353b..8abe3ebd656 100644
--- a/sysutils/user/Makefile
+++ b/sysutils/user/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/15 16:27:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:16 agc Exp $
 #
 
 # Note to package maintainers:
@@ -6,7 +6,6 @@
 # "tar pzvcf user-`date +%Y%m%d`.tar.gz user" and upload that
 # file to ${MASTER_SITE_LOCAL}.
 DISTNAME=		user-20000509
-WRKSRC=			${WRKDIR}/user
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -20,6 +19,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* # already in Solaris base system
 PKG_SKIP_REASON=	"${PKGNAME} is part of your ${OPSYS} distribution"
 .endif
 
+WRKSRC=			${WRKDIR}/user
 NO_CONFIGURE=		yes
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/sysutils/vidc-tools/Makefile b/sysutils/vidc-tools/Makefile
index cbfc58ecdef..7abed1b7031 100644
--- a/sysutils/vidc-tools/Makefile
+++ b/sysutils/vidc-tools/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:57 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	misc-src-riscpc
 PKGNAME=	vidc-tools-1.0
-WRKSRC=		${WRKDIR}/misc-src
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/arch/arm32/misc/
 
@@ -12,4 +11,6 @@ COMMENT=	Tools for the VIDC console used by NetBSD/arm32 on RiscPC
 
 ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32
 
+WRKSRC=		${WRKDIR}/misc-src
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 951441b4b5f..a9edbf1785f 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:53:57 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	xbatt-1.3pr1
 PKGNAME=	xbatt-1.3.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xbatt-1.3
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www2.clave.gr.jp/~eto/xbatt/
 
@@ -16,6 +15,7 @@ COMMENT=	Displays battery status of your notebook via APM
 PKG_SKIP_REASON=	"APM is not available for ${MACHINE_PLATFORM}"
 .endif
 
+WRKSRC=		${WRKDIR}/xbatt-1.3
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 ALL_TARGET=	xbatt
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 304864b1e57..f7d7aa8e74e 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/11/05 07:31:57 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:26:16 agc Exp $
 
 DISTNAME=	xbattbar_1.4.2
 PKGNAME=	${DISTNAME:S/_/-/}
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://iplab.aist-nara.ac.jp/member/suguru/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://iplab.aist-nara.ac.jp/member/suguru/xbattbar.html
 COMMENT=	X11 battery graph for laptops
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_BUILDLINK2=	# defined
 
 USE_X11BASE=	# defined
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 883696aa219..cbab76caf00 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:53:58 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	xdu-3.0
 PKGREVISION=	4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/ ftp://ftp.arl.mil/pub/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://sd.wareonearth.com/~phil/xdu/
 COMMENT=	Display the output of "du" in an X window
 
+WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile
index b434a962263..b305df015e7 100644
--- a/sysutils/xfm/Makefile
+++ b/sysutils/xfm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:16 agc Exp $
 # FreeBSD Id: ports/x11-fm/xfm/Makefile,v 1.20 2001/02/05 21:00:55 olgeni Exp
 
 DISTNAME=	xfm-1.4.3
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xfm-1.4.3
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rxg@ms25.url.com.tw
 HOMEPAGE=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 COMMENT=	The X File Manager
 
+WRKSRC=		${WRKDIR}/xfm-1.4.3
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/sysutils/xmeter/Makefile b/sysutils/xmeter/Makefile
index 6fd365c127e..831a8963ecb 100644
--- a/sysutils/xmeter/Makefile
+++ b/sysutils/xmeter/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:24:47 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	xmeter-1.15
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=misdirected/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	#
 COMMENT=	Distributed system load meter for X11
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 USE_IMAKE=	yes
 
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 928aaa2f2e4..ff62554e9c7 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:26:16 agc Exp $
 
 DISTNAME=	xnc-4.4.7.src
 PKGNAME=	xnc-4.4.7
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.xnc.dubna.su/src/
 
@@ -11,6 +10,7 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://xnc.dubna.su/
 COMMENT=	File manager for X Window
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 USE_LIBTOOL=	yes
diff --git a/sysutils/xuvmstat/Makefile b/sysutils/xuvmstat/Makefile
index 3a81b433707..5700d9abb98 100644
--- a/sysutils/xuvmstat/Makefile
+++ b/sysutils/xuvmstat/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2003/08/11 07:39:26 martin Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
 #
 
 DISTNAME=	${PKGNAME:S/-//}
 PKGNAME=	xuvmstat-20030810
-WRKSRC=		${WRKDIR}/xuvmstat
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.NetBSD.org/~chuck/gz/
 
 MAINTAINER=	wiz@NetBSD.org
 COMMENT=	Graphical display for the current UVM status
 
+WRKSRC=		${WRKDIR}/xuvmstat
 MAKE_ENV+=	X11BASE=${X11BASE}
 
 do-install: