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

42 files changed, 84 insertions, 100 deletions

diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index d15f0ac0c4c..09541faa9a9 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.10 2003/02/11 09:16:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/03/29 12:41:23 jmmv Exp $
 #
 
 RELVERSION=	1.3.1
 BLACKDOWN_REL=	FCS-02b
 RELNAME=	${RELVERSION}-02b-FCS-linux
 EXTNAME=	${BASENAME}-${RELNAME}
+WRKSRC=		${WRKDIR}/${BASENAME}${RELVERSION}
 CATEGORIES=	lang
 EXTRACT_SUFX=	.bin
 
@@ -44,8 +45,6 @@ CHECK_SHLIBS=	NO	# This would use NetBSD ldd on Linux shlibs.
 
 JVM_HOME=	${LOCALBASE}/java/blackdown-${RELVERSION}
 
-WRKSRC=		${WRKDIR}/${BASENAME}${RELVERSION}
-
 USE_BUILDLINK2=	yes
 NO_MTREE=	yes	# since we change PREFIX
 
diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile
index 8e11074d8b9..2a0c58bb947 100644
--- a/lang/brandybasic/Makefile
+++ b/lang/brandybasic/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/06/04 09:59:04 abs Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:24 jmmv Exp $
 #
 
 DISTNAME=       b110
 PKGNAME=        brandybasic-1.0.10
+WRKSRC=		${WRKDIR}/brandy-1.0.10
 CATEGORIES=     lang
 MASTER_SITES=   http://www.argonet.co.uk/users/dave_daniels/
 EXTRACT_SUFX=   .tgz
@@ -11,8 +12,6 @@ MAINTAINER=     abs
 HOMEPAGE=       http://www.argonet.co.uk/users/dave_daniels/
 COMMENT=	Brandy Basic V interpreter - Acorn ARM Computers BASIC dialect
 
-WRKSRC=		${WRKDIR}/brandy-1.0.10
-
 DOCDIR=		${PREFIX}/share/doc/brandy
 EXAMPLEDIR=	${PREFIX}/share/examples/brandy
 
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 25f7b85c3dd..38c6da1dfa9 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/25 06:37:19 tron Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:24 jmmv Exp $
 
 DISTNAME=	bwbasic-2.20
-WRKSRC=		${WRKDIR}/bwbasic-2.20p2/${PKGNAME_NOREV}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/bwbasic-2.20p2/${PKGNAME_NOREV}
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.rahul.net/pub/rhn/
 EXTRACT_SUFX=	.tar.Z
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 67cb117efd7..8576ae23dd4 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:00 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:24 jmmv Exp $
 #
 
 DISTNAME=		cl74unix
 PKGNAME=		caml-light-0.74
+WRKSRC=			${WRKDIR}/cl74/src
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.inria.fr/lang/caml-light/
 
@@ -12,8 +13,6 @@ COMMENT=		Another implementation of Caml
 
 ALL_TARGET=		world
 
-WRKSRC=			${WRKDIR}/cl74/src
-
 do-configure:
 	(cd ${WRKSRC}; make configure)
 
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index ef046856b99..aef1d4c38fe 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:31 agc Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:41:24 jmmv Exp $
 
 DISTNAME=		cint5.14
 PKGNAME=		cint-5.14.40
+WRKSRC=			${WRKDIR}
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 
@@ -12,8 +13,6 @@ COMMENT=		C/C++ interpreter
 #same distribution file name for minor versions
 DIST_SUBDIR=		${PKGNAME}
 
-WRKSRC=			${WRKDIR}
-
 do-build:
 	@cd ${WRKDIR};						\
 	case ${OPSYS} in					\
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 07ca7c94a4a..553032a405f 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2002/12/01 14:49:15 salo Exp $
+# $NetBSD: Makefile,v 1.27 2003/03/29 12:41:25 jmmv Exp $
 
 DISTNAME=		clisp-2.27
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clisp/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,7 +17,6 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ENV+=		CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
 GNU_CONFIGURE=		YES
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 UNLIMIT_RESOURCES=	stacksize
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/avcall/libtool
diff --git a/lang/cu-prolog/Makefile b/lang/cu-prolog/Makefile
index 4be630865a3..93a12913423 100644
--- a/lang/cu-prolog/Makefile
+++ b/lang/cu-prolog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:31 agc Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:25 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 2000/04/12 06:18:03 obrien Exp
 
 DISTNAME=	cu-prolog-3.94
+WRKSRC=		${WRKDIR}/src
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.icot.or.jp/ifs/kbms-clp/unix/cuprolog/
 DISTFILES=	cupsrc.tar.gz cupdoc.tar.gz
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Experimental constraint logic programming language
 
 DIST_SUBDIR=	${DISTNAME}
-WRKSRC=		${WRKDIR}/src
 MAKEFILE=	makefile
 ALL_TARGET=	cup
 
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 84c537b79ba..4cbd64dae48 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/01/10 18:46:32 nathanw Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:25 jmmv Exp $
 #
 
 DISTNAME=		plt.src.x
 PKGNAME=		drscheme-202
+WRKSRC=                 ${WRKDIR}/plt/src
 DIST_SUBDIR=		${PKGNAME:C/-[0-9]*//}/${PKGNAME:C/.*-([0-9]*)/\1/}
 CATEGORIES=		lang
 MASTER_SITES=		http://download.plt-scheme.org/bundles/202/plt/ \
@@ -23,8 +24,6 @@ USE_GMAKE=		yes
 USE_PERL5=		yes
 GNU_CONFIGURE=		yes
 
-WRKSRC=                 ${WRKDIR}/plt/src
-
 post-patch:
 	@for patchee in \
 		${WRKDIR}/plt/bin/background-help-desk \
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 9f4cb49d02f..45a79031a86 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/10/22 06:59:27 kent Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/29 12:41:25 jmmv Exp $
 
 DISTNAME=		gcc-2.95.3
 GCC_VERSION=		2.95.3
@@ -6,6 +6,7 @@ PKGNAME=		gcc-ssp-2.95.3.13
 PKGVERSION=		${GCC_VERSION}
 PKGREVISION=
 PKGBASENAME=		gcc-ssp
+WRKSRC=			${WRKDIR}/objdir
 CATEGORIES=		lang security
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
@@ -44,7 +45,6 @@ MESSAGE_SUBST+=		MAKE=${MAKE} \
 			PKGBASENAME=${PKGBASENAME}
 PLIST_SUBST+=		PKGBASENAME=${PKGBASENAME}
 SRCDIR=			${WRKDIR}/${DISTNAME}
-WRKSRC=			${WRKDIR}/objdir
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index c0534f50ff0..6b042853cd9 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/04/22 16:36:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:41:25 jmmv Exp $
 # FreeBSD Id: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp
 
 DISTNAME=	ghc-4.04
+WRKSRC=		${WRKDIR}/fptools
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/4.04/
 DISTFILES=	ghc-4.04-src.tar.gz ghc-4.04-x86-hc.tar.gz
@@ -19,7 +20,6 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+= --enable-hc-boot --libdir=${PREFIX}/lib/ghc
 CONFIGURE_ENV+=	HASKELL_OBJ_FMT=${OBJECT_FMT}
-WRKSRC=		${WRKDIR}/fptools
 
 # a number of non-i386 platforms, including solaris/sparc, osf/alpha
 # etc are supported natively by ghc. pkg support for those platforms
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 03523e37e8e..11b2989a050 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/02/17 22:39:33 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:26 jmmv Exp $
 
 DISTNAME=		gpc-2.1
+WRKSRC=			${WRKDIR}/gcc-2.95.3
 CATEGORIES=		lang
 MASTER_SITES=		http://www.gnu-pascal.de/current/ \
 			${MASTER_SITE_GNU:=gcc/}
@@ -22,7 +23,6 @@ DEPENDS+=		rx-[0-9]*:../../devel/rx
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
 
-WRKSRC=			${WRKDIR}/gcc-2.95.3
 USE_GMAKE=		# defined
 USE_NCURSES=		# defined
 USE_PKGSRC_GCC=		# defined
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index e8181b832de..c19725bce74 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/11/13 20:15:10 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:26 jmmv Exp $
 #
 
 DISTNAME=		gprolog-1.2.16
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/
 
@@ -18,6 +19,4 @@ CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/${PKGNAME} \
 			--with-examples-dir=${PREFIX}/share/examples/gprolog \
 			--with-c-flags='-O3 -finline-functions -fomit-frame-pointer -D__unix__=1'
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index e87af036020..d8ebb92b42f 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:26 jmmv Exp $
 #
 
 DISTNAME=	jasmin-1.06
+WRKSRC=		${WRKDIR}/jasmin
 CATEGORIES=     lang
 MASTER_SITES=	http://www.cat.nyu.edu/~meyer/jasmin/
 
@@ -10,7 +11,6 @@ HOMEPAGE=	http://www.cat.nyu.edu/~meyer/jasmin/
 COMMENT=	Java "assembler" interface
 
 USE_JAVA=	run
-WRKSRC=		${WRKDIR}/jasmin
 
 USE_BUILDLINK2=	# defined
 NO_BUILD=	# defined
diff --git a/lang/java-lang-spec/Makefile b/lang/java-lang-spec/Makefile
index 0ce347e629b..dcaf99b7f0b 100644
--- a/lang/java-lang-spec/Makefile
+++ b/lang/java-lang-spec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:32 agc Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:26 jmmv Exp $
 
 DISTNAME=		langspec-2.0.html
 PKGNAME=		java-lang-spec-2.0
+WRKSRC=			${WRKDIR}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.javasoft.com/docs/specs/
 EXTRACT_SUFX=		.zip
@@ -10,7 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://java.sun.com/docs/books/jls/index.html
 COMMENT=		The Java(TM) Language Specification (HTML)
 
-WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/lang/java-vm-spec/Makefile b/lang/java-vm-spec/Makefile
index 15367b45d3e..eba675ae74d 100644
--- a/lang/java-vm-spec/Makefile
+++ b/lang/java-vm-spec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:15 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:26 jmmv Exp $
 
 DISTNAME=		vmspec.2nded.html
 PKGNAME=		java-vm-spec-2.0
+WRKSRC=			${WRKDIR}/vmspec
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.javasoft.com/docs/specs/
 
@@ -9,7 +10,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://java.sun.com/docs/books/vmspec/index.html
 COMMENT=		The Java(TM) Virtual Machine Specification (HTML)
 
-WRKSRC=			${WRKDIR}/vmspec
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index b8ec8216f07..a95cbd6aa5b 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2002/12/31 15:44:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:26 jmmv Exp $
 #
 
 DISTNAME=	unix_jb35foundation
 PKGNAME=	jbuilder-jit-1.2.15
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/javacomp-1.2.15
 CATEGORIES=     lang
 MASTER_SITES=	http://ftp.cdut.edu.cn/pub2/linux/develop/jbuilder/ \
 		http://python.planetmirror.com/ftp/jbuilder/foundation/3.5/linux/ \
@@ -20,7 +21,6 @@ PLIST_SUBST+=	JAVADIR=${PKG_JAVA_HOME:C|${PREFIX}/||}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=			${WRKDIR}/javacomp-1.2.15
 EXTRACT_ELEMENTS=	LinuxJIT/javacomp-1.2.15.tar.gz
 
 LICENSE=		single-user-license
diff --git a/lang/jini/Makefile b/lang/jini/Makefile
index 3922e28c6bb..39e3ae8a1a8 100644
--- a/lang/jini/Makefile
+++ b/lang/jini/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:11 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:27 jmmv Exp $
 #
 
 DISTNAME=		jini-${SUN_VERSION}-src
 PKGNAME=		jini-${VERSION}
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/jini${SUN_VERSION}
 CATEGORIES=		lang
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.zip
@@ -39,7 +40,6 @@ MESSAGE_SUBST+=		JINI_HOME=${JINI_HOME}
 NO_BUILD=		yes
 
 DOWNLOAD=		http://wwws.sun.com/software/communitysource/jini/download.html
-WRKSRC=			${WRKDIR}/jini${SUN_VERSION}
 
 _FETCH_MESSAGE=	\
 	${ECHO} "======================================================================"; \
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index d9b0ea7c484..49c0aa661e1 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2002/12/07 02:38:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.29 2003/03/29 12:41:27 jmmv Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
 PKGNAME=	libperl-${PERL5_DIST_VERS}
 SVR4_PKGNAME=	lperl
+WRKSRC=		${WRKDIR}/${EXTRACT_ELEMENTS}
 CATEGORIES+=	lang devel
 
 MAINTAINER=	jlam@netbsd.org
@@ -12,7 +13,6 @@ COMMENT=	Perl DynaLoader as a shared object
 
 USE_BUILDLINK2=		# defined
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
 #BUILDLINK_DEPENDS.perl=	perl-${PERL5_DIST_VERS}*
 
diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile
index 29f950522ba..340840584a3 100644
--- a/lang/mzscheme/Makefile
+++ b/lang/mzscheme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/11 18:46:31 joda Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:27 jmmv Exp $
 
 DISTNAME=		mzscheme.src.unix
 PKGNAME=		mzscheme-200
+WRKSRC=			${WRKDIR}/plt/src/mzscheme
 CATEGORIES=		lang
 MASTER_SITES=		http://download.plt-scheme.org/bundles/200/mzscheme/
 DIST_SUBDIR=		${PKGNAME_NOREV}
@@ -18,8 +19,6 @@ CONFIGURE_SCRIPT=	../configure
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=			${WRKDIR}/plt/src/mzscheme
-
 post-patch:
 	@for patchee in ${WRKDIR}/plt/man/man1/mzscheme.1 \
 	${WRKDIR}/plt/collects/slibinit/init.ss ; do \
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 8b9233a62d0..ead327890ae 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/03/16 14:51:01 cjep Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:27 jmmv Exp $
 #
 
 DISTNAME=       awk
 PKGNAME=        nawk-20030314
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=   http://cm.bell-labs.com/who/bwk/
 
@@ -12,7 +13,6 @@ COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 
 DIST_SUBDIR=	${PKGNAME}
 
-WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 MAKEFLAGS+=	CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
 ALL_TARGET=	a.out
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 08dfee5321c..6042cfd1627 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/03/19 23:14:35 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:28 jmmv Exp $
 
 DISTNAME=		nhc98src-1.16
 PKGNAME=		nhc98-1.16
+WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
@@ -24,7 +25,6 @@ CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 # Note that you can also build with ghc (Glasgow Haskell Compiler) or
 # hbc (Chalmers Haskell).
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
 USE_GMAKE=		yes
 ALL_TARGET=		default
 
diff --git a/lang/openc++/Makefile b/lang/openc++/Makefile
index 9c24664d87d..0a015c978de 100644
--- a/lang/openc++/Makefile
+++ b/lang/openc++/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/11 19:03:17 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:28 jmmv Exp $
 #
 
 DISTNAME=	opencxx2512
 PKGNAME=	openc++-2.5.12
+WRKSRC=		${WRKDIR}/openc++2.5.12/src/Unix
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencxx/}
 
@@ -10,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.csg.is.titech.ac.jp/~chiba/openc++.html
 COMMENT=	OpenC++ is a version of C++ with a Metaobject Protocol
 
-WRKSRC=		${WRKDIR}/openc++2.5.12/src/Unix
-
 USE_GMAKE=	YES
 MAKEFILE=	Makefile.SunOSandBSD
 MAKE_FLAGS+=	CXXFLAGS=-I${PREFIX}/include
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 255a73cbc42..a8553b5e4ba 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/04/24 03:05:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:29 jmmv Exp $
 
 DISTNAME=		pfthpc21
 PKGNAME=		pforth-21
+WRKSRC=			${WRKDIR}
 CATEGORIES=		lang
 MASTER_SITES=		http://www.softsynth.com/pforth/
 EXTRACT_SUFX=		.zip
@@ -10,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.softsynth.com/pforth/
 COMMENT=		Portable ANS-like Forth
 
-WRKSRC=			${WRKDIR}
 USE_GMAKE=		YES
 MAKEFILE=		${WRKSRC}/makefile
 
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 4f45666570e..f2f97111c95 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/05/14 14:01:33 yyamano Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:41:29 jmmv Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
+WRKSRC=			${WRKDIR}/objdir
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
@@ -37,7 +38,6 @@ GCC_VERSION=		${PKGNAME}
 MESSAGE_SUBST+=		MAKE=${MAKE}
 PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
 SRCDIR=			${WRKDIR}/${DISTNAME}
-WRKSRC=			${WRKDIR}/objdir
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile
index 337c01e3f99..ef163f0a25d 100644
--- a/lang/py-extclass/Makefile
+++ b/lang/py-extclass/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/01/22 18:26:19 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:29 jmmv Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
 PKGNAME=	py-extclass-2.2.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass
 CATEGORIES=	lang
 MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
@@ -13,8 +14,6 @@ COMMENT=	Python-extensible C "classes" and Acquisition for Python
 
 EXTRACT_ELEMENTS=       ${DISTNAME}/lib/Components/ExtensionClass
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass
-
 do-configure:
 	( cd ${WRKSRC} ;\
 	  ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . ;\
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index 17be3f3851b..dcbc2a93720 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:32 agc Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:30 jmmv Exp $
 #
 
 DISTNAME=	html-2.0
 PKGNAME=	py-html-docs-2.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=	http://www.python.org/ftp/python/doc/2.0/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,8 +14,6 @@ COMMENT=	HTML Documentation for Python
 
 DIST_SUBDIR=	python
 
-WRKSRC=		${WRKDIR}
-
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/lang/py21-html-docs/Makefile b/lang/py21-html-docs/Makefile
index 529850c23c4..c22d9b5e9f4 100644
--- a/lang/py21-html-docs/Makefile
+++ b/lang/py21-html-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/19 10:48:34 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:30 jmmv Exp $
 #
 
 DISTNAME=	html-2.1.3
 PKGNAME=	py21-html-docs-2.1.3
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=	http://www.python.org/ftp/python/doc/2.1.3/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,8 +14,6 @@ COMMENT=	HTML Documentation for Python
 
 DIST_SUBDIR=	python
 
-WRKSRC=		${WRKDIR}
-
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/lang/py22-html-docs/Makefile b/lang/py22-html-docs/Makefile
index f1f4376d5ea..ff2e985fa25 100644
--- a/lang/py22-html-docs/Makefile
+++ b/lang/py22-html-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 16:17:06 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:30 jmmv Exp $
 #
 
 DISTNAME=	html-2.2.2
 PKGNAME=	py22-html-docs-2.2.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=	http://www.python.org/ftp/python/doc/2.2.2/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,8 +14,6 @@ COMMENT=	HTML Documentation for Python
 
 DIST_SUBDIR=	python
 
-WRKSRC=		${WRKDIR}
-
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 877dd1d5290..8ff448c3b45 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/14 19:37:44 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:31 jmmv Exp $
 #
 
 DISTNAME=	Python-2.0.1
 PKGNAME=	python20-2.0.1
 PKGREVISION=	3
+WRKSRC=		${WRKDIR}/Python-2.0.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.0.1/
 EXTRACT_SUFX=	.tgz
@@ -19,7 +20,6 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 DIST_SUBDIR=	python
 
 USE_BUILDLINK2=	yes
-WRKSRC=		${WRKDIR}/Python-2.0.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-threads
 INSTALL_TARGET=	altinstall
diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 968bb217f02..2e6322fb2e1 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/02 17:22:25 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:31 jmmv Exp $
 #
 
 DISTNAME=	regina301
 PKGNAME=	rexx-regina-3.0.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=regina-rexx/}
 EXTRACT_SUFX=	.zip
@@ -14,8 +15,6 @@ COMMENT=	implementation of the REXX language
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}
-
 CONFLICTS=	rexx-imc-[0-9]*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index f1a626d9870..9cbe0f1ff37 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/03/24 14:49:37 taca Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:31 jmmv Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
+WRKSRC=		${RUBY_WRKSRC}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -17,7 +18,6 @@ RUBY_BUILD_DEPENDS= no
 DIST_SUBDIR=	ruby
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	--enable-shared
 MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
 TEST_TARGET=	test
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 6b5537118e6..75aee352a81 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/12 16:21:12 agc Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:32 jmmv Exp $
 
 DISTNAME=		siod
 PKGNAME=		siod-3.0
+WRKSRC=			${WRKDIR}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.std.com/pub/gjc/
 EXTRACT_SUFX=		.tgz
@@ -12,7 +13,6 @@ COMMENT=		Small-footprint implementation of the Scheme programming language
 
 DEPENDS+=		sdbm-[0-9]*:../../databases/sdbm
 
-WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 ALL_TARGET=		${OPSYS}
 MAKE_ENV+=		CC="${CC}"
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index e37c911ef9d..2a24e202e09 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/21 22:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:32 jmmv Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
 PKGNAME=	smlnj-${SML_VERSION}
+WRKSRC=		${WRKDIR}
 CATEGORIES=	lang
 MASTER_SITES=	http://www.smlnj.org/dist/working/${SML_VERSION}/ \
 		http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ \
@@ -36,7 +37,6 @@ SML_VERSION=	110.42
 # 	ftp://ftp.ntua.gr/pub/lang/smlnj/release/
 
 DIST_SUBDIR=	smlnj-${SML_VERSION}
-WRKSRC=		${WRKDIR}
 USE_GMAKE=	yes
 
 # previous versions of the package had an additional '-'
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 28cdb5631b8..b1a172c91fe 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2002/10/02 22:00:09 dillo Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:41:32 jmmv Exp $
 #
 
 DISTNAME=	Squeak-3.0
 PKGNAME=	squeak-3.0
+WRKSRC=		${WRKDIR}/Squeak-3.0/build
 CATEGORIES=	lang
 MASTER_SITES=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/platform-independent/
 MASTER_SITES+=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/unix-linux/src/
@@ -23,7 +24,6 @@ USE_X11=	yes
 CPPFLAGS+=	-DNETBSD_OSS_HACK
 DIST_SUBDIR=	squeak
 EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/Squeak-3.0/build
 
 CONFIGURE_SCRIPT= ${WRKSRC}/../src/unix/configure
 LTCONFIG_OVERRIDE= ${WRKSRC}/../src/unix/ltconfig
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index 97d98540168..684d7e47ab9 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/02/27 12:59:44 wulf Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/29 12:41:32 jmmv Exp $
 
 DISTNAME=		pl-lite-5.0.10
 PKGNAME=		swi-prolog-5.0.10
+WRKSRC=			${WRKDIR}/${DISTNAME:S,-lite,,}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.swi.psy.uva.nl/SWI-Prolog/
 
@@ -9,7 +10,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.swi-prolog.org
 COMMENT=		ISO/Edinburgh-style Prolog compiler
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S,-lite,,}
 DIST_SUBDIR=		swi-prolog
 
 GNU_CONFIGURE=		# defined
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 551ce2d3dd2..9cd11708372 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/02/17 15:28:01 dillo Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:32 jmmv Exp $
 #
 
 DISTNAME=	tclX8.2.0
 PKGNAME=	tcl-tclX-8.2.0
+WRKSRC=		${WRKDIR}/tclX8.2.0/unix
 CATEGORIES=	lang tcl
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/TclX/
 
@@ -25,8 +26,6 @@ MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 			SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
 			SHAREGRP=${SHAREGRP}
 
-WRKSRC=			${WRKDIR}/tclX8.2.0/unix
-
 post-extract:
 	@${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
 	@if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then	\
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index d9a082d5709..64404914741 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/02/17 15:28:01 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:33 jmmv Exp $
 #
 
 DISTNAME=		tcl8.3.4
 PKGNAME=		tcl-8.3.4
+WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
 			ftp://gd.tuwien.ac.at/languages/tcl/scriptics/tcl8_3/ \
@@ -15,7 +16,6 @@ COMMENT=		Ousterhout's Tool Command Language, a scripting language
 
 CONFLICTS+=		tclman80-[0-9]*
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		TOUCH="${TOUCH}"
 TEST_TARGET=		test
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 98fc09e98e2..7f4648de1e5 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/02/17 15:28:01 dillo Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:33 jmmv Exp $
 #
 
 DISTNAME=	tclX8.2.0
 PKGNAME=	tk-tclX-8.2.0
+WRKSRC=		${WRKDIR}/tclX8.2.0/unix
 CATEGORIES=	lang tcl tk
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/TclX/
 
@@ -30,8 +31,6 @@ MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 			SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
 			SHAREGRP=${SHAREGRP}
 
-WRKSRC=			${WRKDIR}/tclX8.2.0/unix
-
 FILESDIR=	${.CURDIR}/../../lang/tcl-tclX/files
 PATCHDIR=	${.CURDIR}/../../lang/tcl-tclX/patches
 
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index eb48c04890a..aa4a5a0d41a 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/21 22:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:33 jmmv Exp $
 #
 
 DISTNAME=	twelf-1-4
 PKGNAME=	twelf-1.4
+WRKSRC=		${WRKDIR}/twelf
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.cmu.edu/~twelf/dist/
 
@@ -18,7 +19,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/twelf
 MAKEFILE=	smlnj/Makefile
 MAKEFLAGS+=	sml=${PREFIX:Q}/bin/sml
 ALL_TARGET=	twelf-server twelf-sml
diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile
index cbab3fec162..6b1ec188f39 100644
--- a/lang/umb-scheme/Makefile
+++ b/lang/umb-scheme/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/04/12 21:06:43 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:33 jmmv Exp $
 
 DISTNAME=		umb-scheme-3.2
+WRKSRC=			${WRKDIR}/scheme-3.2
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.umb.edu/pub/scheme/
 EXTRACT_SUFX=		.tar.Z
@@ -8,7 +9,6 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		packages@netbsd.org
 COMMENT=		UMB Scheme interpreter
 
-WRKSRC=			${WRKDIR}/scheme-3.2
 ALL_TARGET=		default
 
 pre-patch:
diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 03fa7dbadd0..f2b91a53636 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/03/15 00:22:42 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:33 jmmv Exp $
 
 DISTNAME=		vslisp-4.0-1
 PKGNAME=		vslisp-4.0.1
+WRKSRC=			${WRKDIR}/vslisp-4.0
 CATEGORIES=		lang
 MASTER_SITES=		ftp://vslisp.sourceforge.net/pub/vslisp/
 PKGREVISION=		1
@@ -10,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://vslisp.sourceforge.net/
 COMMENT=		Embeddable Lisp library and standalone interpreter
 
-WRKSRC=			${WRKDIR}/vslisp-4.0
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE= 	${WRKSRC}/ltconfig
diff --git a/lang/wonka/Makefile b/lang/wonka/Makefile
index 43529572e35..488468e8eba 100644
--- a/lang/wonka/Makefile
+++ b/lang/wonka/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/10 13:55:59 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:34 jmmv Exp $
 #
 
 DISTNAME=	wonka-src-0.9.5-release
 PKGNAME=	wonka-0.9.5
+WRKSRC=		${WRKDIR}/open-wonka
 CATEGORIES=	lang
 MASTER_SITES=	http://wonka.acunia.com/
 
@@ -24,8 +25,6 @@ USE_X11=	# defined
 JVM_HOME=	${LOCALBASE}/java/${PKGBASE}
 NO_MTREE=	# defined, since we change PREFIX below
 
-WRKSRC=		${WRKDIR}/open-wonka
-
 SEDFILES=	\
 	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/lang/ClassLoader/AcuniaClassLoaderTest.java \
 	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/util/zip/GZIPInputStream/basic.java \