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

70 files changed, 152 insertions, 140 deletions

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"