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

40 files changed, 80 insertions, 105 deletions

diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index ed626c71879..4dfd618c537 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:26 jmmv Exp $
 
 DISTNAME=	adjustkernel-1.5
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -8,7 +9,6 @@ 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 6fee940bcd3..6845009a2a3 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2002/12/04 14:13:16 tron Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/29 12:42:26 jmmv Exp $
 
 DISTNAME=	apNetBSD
 PKGNAME=	aperture-2.0
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils x11
 EXTRACT_SUFX=	.shar
 
@@ -30,7 +31,6 @@ ALL_TARGET=		cleandir depend all
 DIST_SUBDIR=		${PKGNAME}
 INSTALL_TARGET=		dirs includes install
 MANCOMPRESSED_IF_MANZ=	YES
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		YES
 OSVERSION_SPECIFIC=	YES
 MAKE_ENV+=		BSDSRCDIR="${BSDSRCDIR}"
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
index 8e585237199..dfdf4fad012 100644
--- a/sysutils/cpuburn/Makefile
+++ b/sysutils/cpuburn/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/08 11:48:11 abs Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:26 jmmv 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
@@ -14,7 +15,6 @@ 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
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 3a2fb1be353..0ff96d8c4c2 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/02/25 04:47:22 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:27 jmmv Exp $
 #
 
 DISTNAME=       	crashme-2.4
+WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=   	http://ochimizu-www.jaist.ac.jp:8000/linux/vger/crashme/
 EXTRACT_SUFX=		-shar
@@ -10,7 +11,6 @@ MAINTAINER=		agc@netbsd.org
 HOMEPAGE=		http://people.delphi.com/gjc/crashme.html
 COMMENT=		Try to crash machine with random arguments to random system calls
 
-WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${EXTRACT_CMD.shar}
 MAKEFILE=		makefile
 
diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile
index 286c2d5cd38..59775983194 100644
--- a/sysutils/easydiskpasswd/Makefile
+++ b/sysutils/easydiskpasswd/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/19 20:56:57 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:27 jmmv 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 3e6020b398c..25ad6254f07 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/03/28 21:14:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/29 12:42:27 jmmv Exp $
 
 DISTNAME=	etcupdate-20030204
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,7 +11,6 @@ HOMEPAGE=	http://www.netbsd.org/Documentation/current/
 COMMENT=	Script to update the configuration and startup files in /etc
 
 EXTRACT_ONLY=	# defined
-WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	# defined
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 1d7227ea325..4524f32aeac 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/07/10 13:05:32 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:27 jmmv Exp $
 #
 
 DISTNAME=	extipl-5.04
+WRKSRC=		${WRKDIR}/${PKGNAME}/src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tsden.org/takamiti/extipl/archs/
 
@@ -11,7 +12,6 @@ COMMENT=	IPL compatible OS boot selector
 
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/src
 USE_GMAKE=	#defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
index 66fe467bc86..b1d3d67b036 100644
--- a/sysutils/fakeroot/Makefile
+++ b/sysutils/fakeroot/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2003/01/04 11:27:44 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:27 jmmv Exp $
 #
 
 DISTNAME=	fakeroot_0.5.8
 PKGNAME=	fakeroot-0.5.8
+WRKSRC=		${WRKDIR}/fakeroot-0.5.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.debian.org/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 991f9715f0b..3d91af42d90 100644
--- a/sysutils/fix4SA110rev2/Makefile
+++ b/sysutils/fix4SA110rev2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:47 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:28 jmmv Exp $
 #
 
 DISTNAME=	fix4SA110rev2-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/
 DISTFILES=	fix4SA110rev2.c fix4SA110rev2.README
@@ -13,8 +14,6 @@ COMMENT=	Modify arm32 binaries to work around SA rev2 problems
 ONLY_FOR_PLATFORM= NetBSD-*-arm32
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
-WRKSRC=		${WRKDIR}
-
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
 
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 12956728b33..31343665384 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/23 23:44:07 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:28 jmmv Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
 PKGNAME=	gnometoaster-1.0Beta5
+WRKSRC=		${WRKDIR}/gtoaster
 CATEGORIES=	sysutils
 MASTER_SITES=	http://gnometoaster.rulez.org/archive/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ MAINTAINER=	packages@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 ce466105961..cb30ccbf7ab 100644
--- a/sysutils/gworkspace/Makefile.common
+++ b/sysutils/gworkspace/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/09/28 02:19:53 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/03/29 12:42:28 jmmv Exp $
 #
 
 DISTNAME=		gworkspace-0.4
+WRKSRC=			${WRKDIR}/gworkspace
 CATEGORIES?=		sysutils gnustep
 MASTER_SITES=		http://www.gnustep.it/enrico/gworkspace/	\
 			http://www.imago.ro/gworkspace/
@@ -9,8 +10,6 @@ MASTER_SITES=		http://www.gnustep.it/enrico/gworkspace/	\
 MAINTAINER?=		packages@netbsd.org
 HOMEPAGE?=		http://www.gnustep.it/enrico/gworkspace/
 
-WRKSRC=			${WRKDIR}/gworkspace
-
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/sysutils/klavg/Makefile b/sysutils/klavg/Makefile
index 38c6dc354fd..563a101606b 100644
--- a/sysutils/klavg/Makefile
+++ b/sysutils/klavg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/12 21:02:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:28 jmmv Exp $
 #
 
 DISTNAME=	klavg-1.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/klavg
 CATEGORIES=	kde sysutils
 MASTER_SITES=	ftp://ftp.crocodile.org/pub/
 
@@ -13,6 +14,5 @@ COMMENT=	Xload for the KDE panel
 DEPENDS+=	kdebase-1.1.2nb2:../../x11/kdebase
 
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}/klavg
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 2ff8a6ac434..590a2f273de 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/07/24 19:45:27 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:28 jmmv Exp $
 #
 
 DISTNAME=	lavaps-1.20
 PKGNAME=	lavaps-1.20
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
@@ -12,7 +13,6 @@ COMMENT=	Lava lamp of currently running processes
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 USE_PERL5=	build
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 USE_X11=	# defined
 GNU_CONFIGURE=	# defined
diff --git a/sysutils/memconf/Makefile b/sysutils/memconf/Makefile
index 6504423fa3f..67ba414923c 100644
--- a/sysutils/memconf/Makefile
+++ b/sysutils/memconf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/02/25 04:47:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:28 jmmv 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
@@ -13,8 +14,6 @@ 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 aa73c2093f8..dedd0c0e557 100644
--- a/sysutils/mgm/Makefile
+++ b/sysutils/mgm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/12/23 16:31:46 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:29 jmmv Exp $
 
 DISTNAME=	mgm-1.1
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.xiph.org/mgm/
 EXTRACT_SUFX=	.tgz
@@ -15,8 +16,6 @@ NO_BUILD=	# defined
 USE_PERL5=	YES
 PERL_SCRIPTS=	mgm
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
-
 MGM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}
 MGM_DOC_DIR=	${PREFIX}/share/doc/html/${DISTNAME:C/-.*$//}
 
diff --git a/sysutils/pcvt-utils/Makefile b/sysutils/pcvt-utils/Makefile
index 9e200b2b85d..19f73e02e83 100644
--- a/sysutils/pcvt-utils/Makefile
+++ b/sysutils/pcvt-utils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:29 jmmv Exp $
 #
 
 DISTNAME=	netbsd-pcvt-20000611
 PKGNAME=	pcvt-utils-20000611
+WRKSRC=		${WRKDIR}/pcvt/Util
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -11,7 +12,6 @@ HOMEPAGE=	http://cvsweb.netbsd.org/bsdweb.cgi/syssrc/sys/arch/i386/isa/pcvt/
 COMMENT=	Useful leftovers from pcvt: playvt and two font editors
 
 ONLY_FOR_PLATFORM= NetBSD-*-*
-WRKSRC=		${WRKDIR}/pcvt/Util
 
 do-install:
 	${INSTALL_PROGRAM} \
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
index 95f0d691697..ec69d393f2b 100644
--- a/sysutils/pflogsumm/Makefile
+++ b/sysutils/pflogsumm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:29 jmmv Exp $
 #
 
 DISTNAME=		pflogsumm-1.0.4
+WRKSRC=			${WRKDIR}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://jimsun.linxnet.com/pub/postfix_contrib/
 EXTRACT_SUFX=		.pl
@@ -18,8 +19,6 @@ DEPENDS+=		p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
 NO_CONFIGURE=		# defined
 USE_PERL5=		# defined
 
-WRKSRC=			${WRKDIR}
-
 do-build:
 	${SED} 's;/usr/bin/perl;${PERL5};' ${DISTDIR}/${DISTFILES} \
 	    > ${WRKDIR}/pflogsumm
diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
index 0900d608738..05a52a96f70 100644
--- a/sysutils/pstree/Makefile
+++ b/sysutils/pstree/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/12/25 22:44:53 mjl Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:29 jmmv Exp $
 #
 
 DISTNAME=	pstree-2.17
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 # PKGREVISION=	1
 MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/misc/
@@ -9,8 +10,6 @@ MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/misc/
 MAINTAINER=	packages@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 11d6c3a4be1..1bc4d57a9de 100644
--- a/sysutils/rox-archive/Makefile
+++ b/sysutils/rox-archive/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/15 13:23:08 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:29 jmmv Exp $
 #
 
 DISTNAME=	Archive-0.1.2
 PKGNAME=	rox-archive-0.1.2
+WRKSRC=		${WRKDIR}/Archive
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -20,8 +21,6 @@ USE_PERL5=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/Archive
-
 APPDIR=		${PREFIX}/share/rox
 
 post-patch:
diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile
index 29d868b50a1..bb93f83c777 100644
--- a/sysutils/rox-edit/Makefile
+++ b/sysutils/rox-edit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/14 13:25:22 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
 #
 
 DISTNAME=	Edit-0.1.2
 PKGNAME=	rox-edit-0.1.2
+WRKSRC=		${WRKDIR}/Edit
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -19,8 +20,6 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/Edit
-
 PYTHON_PATCH_SCRIPTS=	AppRun
 
 post-patch:
diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile
index d71cbcd8c98..946b975dad9 100644
--- a/sysutils/rox-lib/Makefile
+++ b/sysutils/rox-lib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/14 13:25:22 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
 #
 
 DISTNAME=	ROX-Lib-0.1.4
 PKGNAME=	rox-lib-0.1.4
+WRKSRC=		${WRKDIR}/ROX-Lib
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -19,8 +20,6 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/ROX-Lib
-
 PYTHON_PATCH_SCRIPTS=	AppRun bin/savebox
 
 post-patch:
diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile
index b8d965a54cc..25f41edca8f 100644
--- a/sysutils/rox-memo/Makefile
+++ b/sysutils/rox-memo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/14 13:25:23 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
 #
 
 DISTNAME=	Memo-1.0.0
 PKGNAME=	rox-memo-1.0.0
+WRKSRC=		${WRKDIR}/Memo
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -19,8 +20,6 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/Memo
-
 PYTHON_PATCH_SCRIPTS=	AppRun
 
 post-patch:
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 7676c4a6cd3..496c4744d26 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:30 jmmv Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
 PKGNAME=	rox-session-0.1.14
 PKGREVISION=	3
+WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -20,8 +21,6 @@ USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
-
 post-build:
 	${MV} ${WRKSRC} ${WRKDIR}/${DISTNAME}/src
 
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
index 0b13b4b7c6d..a6d4ad95525 100644
--- a/sysutils/rox-system/Makefile
+++ b/sysutils/rox-system/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/13 12:14:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:31 jmmv Exp $
 #
 
 DISTNAME=	System-0.1.2
 PKGNAME=	rox-system-0.1.2
+WRKSRC=		${WRKDIR}/System/src
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -18,8 +19,6 @@ DIST_SUBDIR=	rox
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
-WRKSRC=		${WRKDIR}/System/src
-
 APPDIR=		${PREFIX}/share/rox
 
 post-patch:
diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile
index ef081e8d6f8..dbaf3bd98d2 100644
--- a/sysutils/rox-wallpaper/Makefile
+++ b/sysutils/rox-wallpaper/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/14 13:25:23 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:31 jmmv Exp $
 #
 
 DISTNAME=	Wallpaper-0.1.1
 PKGNAME=	rox-wallpaper-0.1.1
+WRKSRC=		${WRKDIR}/Wallpaper
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -20,8 +21,6 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/Wallpaper
-
 PYTHON_PATCH_SCRIPTS=	AppRun
 
 post-patch:
diff --git a/sysutils/rox-wrappers/Makefile b/sysutils/rox-wrappers/Makefile
index f8fa98773e1..cace32d8410 100644
--- a/sysutils/rox-wrappers/Makefile
+++ b/sysutils/rox-wrappers/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2002/06/01 19:56:29 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:32 jmmv Exp $
 #
 
 DISTNAME=	Wrappers-1.0.2
 PKGNAME=	rox-wrappers-1.0.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/Wrappers
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -19,8 +20,6 @@ DIST_SUBDIR=	rox
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/Wrappers
-
 do-install:
 	${RM} -f ${WRKSRC}/Emacs/AppRun.orig
 	${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index c4b0a5626f7..d2516c7cf81 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:10:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:32 jmmv Exp $
 #
 
 DISTNAME=	rox-1.2.0
 PKGREVISION=	4
+WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -21,8 +22,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gtk2
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
-
 post-patch:
 	${SED} -e "s:@PREFIX@:"${PREFIX}":g" < ${FILESDIR}/rox > \
 		${WRKDIR}/${DISTNAME}/rox
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 5352b27f1ac..ce813647499 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:42:32 jmmv 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=	packages@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 386dce3fe88..7f398d66617 100644
--- a/sysutils/safetynet/Makefile
+++ b/sysutils/safetynet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/27 19:14:44 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:32 jmmv Exp $
 #
 
 DISTNAME=	safetynet-1.15
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.unixpimps.org/safetynet/
 
@@ -9,8 +10,6 @@ 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 d80cc003f09..d9faa50450e 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:32 jmmv Exp $
 #
 
 DISTNAME=	setquota-0.1
+WRKSRC=		${WRKDIR}/setquota/
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.jurai.net/users/winter/
 
@@ -12,6 +13,4 @@ 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/sysbuild/Makefile b/sysutils/sysbuild/Makefile
index f60e693063f..95d8bab3067 100644
--- a/sysutils/sysbuild/Makefile
+++ b/sysutils/sysbuild/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/28 21:14:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:33 jmmv Exp $
 #
 
 DISTNAME=	sysbuild-1.9
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -12,7 +13,6 @@ COMMENT=	Automate NetBSD system and kernel unprivileged builds
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 CHECK_SHLIBS=	no
 SHLIB_HANDLING=	no
 
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
index e618f4607e8..9aea17d0a94 100644
--- a/sysutils/sysgen/Makefile
+++ b/sysutils/sysgen/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/03/15 04:57:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:33 jmmv Exp $
 #
 
 DISTNAME=	sysgen
 PKGNAME=	sysgen-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ox.compsoc.net/~dankolb/sysgen/
 EXTRACT_SUFX=	.tar.Z
@@ -10,7 +11,6 @@ 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 c988b8400d6..01a4d6b1ba8 100644
--- a/sysutils/tkcron/Makefile
+++ b/sysutils/tkcron/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:48 agc Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:33 jmmv Exp $
 #
 
 DISTNAME=	tkcron-2.12
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 tk
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
 EXTRACT_SUFX=	.tcl.gz
@@ -13,7 +14,6 @@ DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 USE_X11=	yes
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
-WRKSRC=		${WRKDIR}
 
 do-build:
 	${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron
diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
index 63b418741fa..c7f05d5e49e 100644
--- a/sysutils/user/Makefile
+++ b/sysutils/user/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/07 02:39:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:33 jmmv Exp $
 #
 
 # Note to package maintainers:
@@ -6,6 +6,7 @@
 # "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}
 
@@ -13,8 +14,6 @@ MAINTAINER=		agc@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/
 COMMENT=		Solaris-compatible {user,group}{add,del,mod} commands
 
-WRKSRC=			${WRKDIR}/user
-
 ONLY_FOR_PLATFORM=	NetBSD-*-* # already in Solaris base system
 
 .if exists(/usr/sbin/user)
diff --git a/sysutils/vidc-tools/Makefile b/sysutils/vidc-tools/Makefile
index 02b30402d8c..a488e386f18 100644
--- a/sysutils/vidc-tools/Makefile
+++ b/sysutils/vidc-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:33 jmmv 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/
 
@@ -11,6 +12,4 @@ COMMENT=	Tools for the VIDC console used by NetBSD/arm32 on RiscPC
 
 ONLY_FOR_PLATFORM= NetBSD-*-arm32
 
-WRKSRC=		${WRKDIR}/misc-src
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 5ec65e55b60..f208dfdf6f7 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/03 02:59:29 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:34 jmmv 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
@@ -11,7 +12,6 @@ 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 7f1d2c8c1e5..b434a962263 100644
--- a/sysutils/xfm/Makefile
+++ b/sysutils/xfm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/03 02:59:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:34 jmmv 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/
 
@@ -10,8 +11,6 @@ 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 423462daeee..14baed7a41b 100644
--- a/sysutils/xmeter/Makefile
+++ b/sysutils/xmeter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/03 02:59:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:34 jmmv Exp $
 #
 
 DISTNAME=	xmeter-1.15
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=misdirected/}
 
@@ -13,6 +14,4 @@ COMMENT=	distributed system load meter for X11
 USE_X11BASE=	yes
 USE_IMAKE=	yes
 
-WRKSRC=		${WRKDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 0d02742ac72..783a37b73a0 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/22 05:26:53 dillo Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:34 jmmv Exp $
 
 DISTNAME=	xnc-4.4.7.src
 PKGNAME=	xnc-4.4.7
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.xnc.dubna.su/src/
 
@@ -10,8 +11,6 @@ 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 8ee7f5b6048..3944f0dfc6b 100644
--- a/sysutils/xuvmstat/Makefile
+++ b/sysutils/xuvmstat/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/07/27 11:16:20 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:34 jmmv Exp $
 #
 
 DISTNAME=	${PKGNAME:S/-//}
 PKGNAME=	xuvmstat-20010220
+WRKSRC=		${WRKDIR}/xuvmstat
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.netbsd.org/~chuck/gz/
 
@@ -11,8 +12,6 @@ COMMENT=	graphical display for the current UVM status
 
 MAKE_ENV+=	X11BASE=${X11BASE}
 
-WRKSRC=		${WRKDIR}/xuvmstat
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xuvmstat ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xuvmstat