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

30 files changed, 62 insertions, 60 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 4413fdfe86c..af899e47427 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:48:42 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:21:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
 #
 
 DISTNAME=       ast54unx
 PKGNAME=        astrolog-5.40
-WRKSRC=		${WRKDIR}
 CATEGORIES=     misc
 MASTER_SITES=   http://www.astrolog.org/ftp/ephem/ \
 		http://www.astrolog.org/ftp/ \
@@ -20,6 +19,7 @@ RESTRICTED=	Do not sell or profit from this software in any way
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 EPHEM=          LRZ5_24 CHI_24 CPJV_24
 EXTRACT_ONLY=	${DISTNAME}.shr
 EXTRACT_CMD=	${EXTRACT_CMD.shar}
diff --git a/misc/brs/Makefile b/misc/brs/Makefile
index d2473e99b5a..4f295408d91 100644
--- a/misc/brs/Makefile
+++ b/misc/brs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/09/18 08:26:32 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:21:01 agc Exp $
 
 DISTNAME=	brs.4.00.l1
 PKGNAME=	brs-4.0
-WRKSRC=		${WRKDIR}/bible
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/religion/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	bcv@hub3.net
 HOMEPAGE=	http://bible.theverge.com/brs.html
 COMMENT=	Interactive King James Version Bible
 
+WRKSRC=		${WRKDIR}/bible
 USE_BUILDLINK2=	YES
 
 ALL_TARGET=
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 1fc759f90c1..7aa6e7b8cd6 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:01:13 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:21:01 agc Exp $
 #
 
 DISTNAME=	colorize_0.3.0
 PKGNAME=	colorize-0.3.0
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	misc
 MASTER_SITES=	http://nrg.martos.bme.hu/release/colorize/download/bz2/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +11,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://nrg.martos.bme.hu/release/colorize/
 COMMENT=	Log colorize perl script
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_BUILD=	yes
 USE_PERL5=	yes
 
diff --git a/misc/dt/Makefile b/misc/dt/Makefile
index 1bac226d467..547439a4c09 100644
--- a/misc/dt/Makefile
+++ b/misc/dt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2003/11/20 01:05:18 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:21:01 agc Exp $
 #
 
 DISTNAME=	dt-1.1.7
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/dt
 CATEGORIES=	misc
 MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
@@ -13,6 +12,7 @@ COMMENT=	Virtual consoles for NetBSD/mac68k (and macppc?)
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 ONLY_FOR_PLATFORM=	NetBSD-*-m68k
 
+WRKSRC=		${WRKDIR}/dt
 ALL_TARGET=	depend all
 CPPFLAGS+=	-D${DT_LAYOUT}_LAYOUT
 
diff --git a/misc/edict/Makefile b/misc/edict/Makefile
index 1ea6caaded8..8709001cbe7 100644
--- a/misc/edict/Makefile
+++ b/misc/edict/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/02 03:13:35 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:21:01 agc Exp $
 #
 
 DISTNAME=	edict
 PKGNAME=	edict-2003.005
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese misc
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
@@ -20,6 +19,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.csse.monash.edu.au/~jwb/edict.html
 COMMENT=	Japanese-English dictionary file
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	edict.gz
 
diff --git a/misc/elizatalk/Makefile b/misc/elizatalk/Makefile
index 26739593fb6..cf256c06c6d 100644
--- a/misc/elizatalk/Makefile
+++ b/misc/elizatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:48:56 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:21:01 agc Exp $
 
 DISTNAME=	elizatalk-0.4
-WRKSRC=		${WRKDIR}/elizatalk-src
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=elizatalk/}
 
@@ -9,6 +8,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://elizatalk.sourceforge.net/
 COMMENT=	Eliza talkback program
 
+WRKSRC=		${WRKDIR}/elizatalk-src
 USE_GMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 3fa3c3060ee..40ac1e530a2 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/11/11 10:42:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:21:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
 #
 
 DISTNAME=	fep
 PKGNAME=	fep-1.0
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/fep/
 
@@ -17,6 +16,7 @@ RESTRICTED=	Do not redistribute for a fee
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
 
 pre-build:
diff --git a/misc/gnome-dirs/Makefile b/misc/gnome-dirs/Makefile
index 54194972620..29781a7a379 100644
--- a/misc/gnome-dirs/Makefile
+++ b/misc/gnome-dirs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:49:00 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:21:01 agc Exp $
 #
 
 DISTNAME=	gnome-dirs-${GNOME_DIRS_VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	# empty
 COMMENT=	Shared GTK/GNOME (v1 and v2) directories
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	# defined
 NO_CHECKSUM=	# defined
 NO_CONFIGURE=	# defined
diff --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile
index d2c489ac038..9a77c6f0ba9 100644
--- a/misc/gnome1-dirs/Makefile
+++ b/misc/gnome1-dirs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:49:02 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	gnome1-dirs-${GNOME_DIRS_VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,6 +17,7 @@ NO_CHECKSUM=	# defined
 NO_CONFIGURE=	# defined
 NO_EXTRACT=	# defined
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 
diff --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile
index e920c990e85..6d4ebc1650f 100644
--- a/misc/gnome2-dirs/Makefile
+++ b/misc/gnome2-dirs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:49:03 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	gnome2-dirs-${GNOME_DIRS_VERSION}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,6 +15,7 @@ NO_CHECKSUM=	# defined
 NO_CONFIGURE=	# defined
 NO_EXTRACT=	# defined
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 96933245b72..3822f5aa5d8 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/11/11 10:17:39 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	x10_heyu
 PKGNAME=	x10_heyu-1.35
-WRKSRC=		${WRKDIR}/heyu.dir
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 EXTRACT_SUFX=	.tgz
@@ -13,6 +12,7 @@ HOMEPAGE=	http://heyu.tanj.com/
 COMMENT=	Home Automation Software for the X10 CM11A
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/heyu.dir
 
 CONFIGURE_SCRIPT=	./Configure
 MAKE_ENV+=	DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE}
diff --git a/misc/ibutton-pdkit/Makefile b/misc/ibutton-pdkit/Makefile
index fefb60f3746..f686cd7515f 100644
--- a/misc/ibutton-pdkit/Makefile
+++ b/misc/ibutton-pdkit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	ulinuxgnu
 PKGNAME=	ibutton-pdkit-2.00
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.dalsemi.com/pub/auto_id/public/
 EXTRACT_SUFX=	.zip
@@ -13,6 +12,7 @@ HOMEPAGE=	http://ibutton.com/
 COMMENT=	1-Wire Public Domain Kit Version 2.00
 
 MAKEFILE=	makefile
+WRKSRC=		${WRKDIR}
 
 SCRIPTS_ENV+=   SED=${SED}
 
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index d06f4c5b3f6..35af56e35a2 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:49:15 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=	jitterbug-1.6.2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 CATEGORIES=	misc
 MASTER_SITES=	ftp://jitterbug.samba.org/pub/jitterbug/
 
@@ -18,6 +17,7 @@ ADDUSER=		${LOCALBASE}/sbin/useradd
 ADDGROUP=		${LOCALBASE}/sbin/groupadd
 .endif
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 PLIST_SRC=	${WRKDIR}/PLIST-src
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index 49b7ca99a09..3aa11014929 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 17:01:15 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:21:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/04/02 07:58:25 obrien Exp
 #
 
 DISTNAME=		jive-1.1
-WRKSRC=			${WRKDIR}/jive
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=games/amusements/}
 
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Filter that converts English text to Jive
 
+WRKSRC=			${WRKDIR}/jive
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/jive.1 ${PREFIX}/man/man1
diff --git a/misc/kanjidic/Makefile b/misc/kanjidic/Makefile
index 20aef43bbaa..babc97c24fe 100644
--- a/misc/kanjidic/Makefile
+++ b/misc/kanjidic/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/02 03:14:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	kanjidic
 PKGNAME=	kanjidic-20030901
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese misc
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
@@ -20,6 +19,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.csse.monash.edu.au/~jwb/edict.html
 COMMENT=	Japanese Kanji information
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	kanjidic.gz
 
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index f246f7a38dc..d58a7f434b3 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/12/21 04:56:15 uebayasi Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:21:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1999/01/08 03:32:06 itojun Exp $
 
 DISTNAME=	lv450
 PKGNAME=	lv-4.50
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ff.iij4u.or.jp/~nrt/freeware/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.ff.iij4u.or.jp/~nrt/lv/
 COMMENT=	Powerful Multilingual File Viewer
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../src/configure
 
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index d1ae0b1a747..ead710a72d3 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/09/22 09:56:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=       mmv_1.01b.orig
 PKGNAME=	mmv-1.0b
-WRKSRC=		${WRKDIR}/mmv-1.01b.orig
 CATEGORIES=     misc
 MASTER_SITES=   ${MASTER_SITE_DEBIAN:=dists/potato/main/source/utils/}
 
@@ -11,6 +10,7 @@ MAINTAINER=     tech-pkg@NetBSD.org
 HOMEPAGE=       # none
 COMMENT=	mmv is a program to move multiple files using wildcard patterns
 
+WRKSRC=		${WRKDIR}/mmv-1.01b.orig
 ALL_TARGET=	mmv
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 679a1a6108b..853fa64aaec 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/10/05 14:29:35 mrauch Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=		OOo_1.0.3.1_LinuxIntel_install
 PKGNAME=		openoffice-linux-1.0.3.1
-WRKSRC=			${WRKDIR}/install
 CATEGORIES=		misc
 MASTER_SITES=		http://mirrors.isc.org/pub/openoffice/stable/1.0.3/ \
 			http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -19,6 +18,7 @@ CONFLICTS+=		openoffice-[0-9]*
 ONLY_FOR_PLATFORM=	NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
 
+WRKSRC=			${WRKDIR}/install
 TEMP?=			${WRKSRC}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 300625809f5..3fa23005304 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2004/01/11 23:06:54 grant Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=		openoffice-0.0.0.641
 PKGREVISION=		2
-WRKSRC=			${WRKDIR}/oo_641_src/config_office
 CATEGORIES=		misc
 MASTER_SITES=		http://www.fs.tum.de/~mrauch/OpenOffice/download/
 DISTFILES=		oo_641_src.tar.bz2
@@ -15,6 +14,7 @@ MAINTAINER=		mrauch@NetBSD.org
 HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite
 
+WRKSRC=			${WRKDIR}/oo_641_src/config_office
 USE_BUILDLINK2=		yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/p5-Msgcat/Makefile b/misc/p5-Msgcat/Makefile
index 921b42c3043..245c41f4003 100644
--- a/misc/p5-Msgcat/Makefile
+++ b/misc/p5-Msgcat/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:01:25 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=		Msgcat-1.01
 PKGNAME=		p5-${DISTNAME}
 SVR4_PKGNAME=		p5lco
-WRKSRC=			${WRKDIR}/Msgcat
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Locale/}
 
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=
 COMMENT=		Perl5 module to use the message catalog functions
 
+WRKSRC=			${WRKDIR}/Msgcat
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Locale/Msgcat/.packlist
 
diff --git a/misc/parchive/Makefile b/misc/parchive/Makefile
index d94e6897122..bbf207075b0 100644
--- a/misc/parchive/Makefile
+++ b/misc/parchive/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/09/19 23:08:25 dent Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	par-v1.1
 PKGNAME=	parchive-1.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/par-cmdline
 CATEGORIES=	misc archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=parchive/}
 
@@ -12,6 +11,8 @@ MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://parchive.sourceforge.net/
 COMMENT=	Create or use "Parity Volume Set" (PAR and Pnn) files
 
+WRKSRC=		${WRKDIR}/par-cmdline
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/par ${PREFIX}/bin/parchive
 
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index ac10f623675..24e1f4dae64 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/09/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	pdmenu_1.2.65
 PKGNAME=	${DISTNAME:S/_/-/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/pdmenu
 CATEGORIES=	misc
 MASTER_SITES=	http://www.kitenet.net/programs/pdmenu/
 
@@ -12,6 +11,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.kitenet.net/programs/pdmenu/
 COMMENT=	Simple console menu program
 
+WRKSRC=		${WRKDIR}/pdmenu
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
diff --git a/misc/root/Makefile b/misc/root/Makefile
index d9261ce2357..f10d3b5663f 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:49:50 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=		root_v2.23.08.source
 PKGNAME=		root-2.23
-WRKSRC=			${WRKDIR}
 CATEGORIES=		misc
 MASTER_SITES=		ftp://root.cern.ch/root/
 
@@ -12,6 +11,7 @@ COMMENT=		OO framework for data analysis and visualisation
 
 BUILD_DEPENDS+=		cint-5.14.40:../../lang/cint
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile
index 571300f8a9b..32dedbc1dd6 100644
--- a/misc/routeplanner-cli/Makefile
+++ b/misc/routeplanner-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=		routeplanner_0.11
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://routeplanner.sourceforge.net/
 COMMENT=		Highway trip planner written in Python
 
-WRKSRC=	${WRKDIR}/routeplanner-0.11
+WRKSRC=			${WRKDIR}/routeplanner-0.11
 USE_BUILDLINK2=		yes
 NO_BUILD=		yes
 
diff --git a/misc/sch/Makefile b/misc/sch/Makefile
index 0a502065fdb..26498b39398 100644
--- a/misc/sch/Makefile
+++ b/misc/sch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:01:27 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=	sch-20010224
-WRKSRC=		${WRKDIR}/sch/build
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.itojun.org/pub/misc/
 
@@ -10,6 +9,7 @@ COMMENT=	Curses-based schedule management tool
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/sch/build
 GNU_CONFIGURE=	yes
 
 # manpages are not complete, don't confuse people
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 2ff5950f7a5..0d28aed12f9 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/07/17 21:49:57 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=		so51a_lnx_${LANGNO}
 PKGNAME=		staroffice-${LANGUAGE}-5.1a
-WRKSRC=			${WRKDIR}/so51inst/office51
 CATEGORIES=		misc
 MASTER_SITES=		${DOWNLOAD_SITE}
 EXTRACT_SUFX=		.tar
@@ -30,6 +29,7 @@ PATCH_FUZZ_FACTOR=	-F1
 INTERACTIVE_STAGE=	fetch install
 NO_BUILD=		YES
 
+WRKSRC=			${WRKDIR}/so51inst/office51
 CHECK_SHLIBS=		no
 DECOMPRESS_CMD=		${CAT}
 
diff --git a/misc/udfclient/Makefile b/misc/udfclient/Makefile
index 52145c0943d..91575f083f4 100644
--- a/misc/udfclient/Makefile
+++ b/misc/udfclient/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/10/27 03:22:52 reinoud Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=		UDFclient.0.1p2
 PKGNAME=		udfclient-0.1.2
-WRKSRC=			${WRKDIR}/UDFclient
 CATEGORIES=		misc
 MASTER_SITES=		http://www.13thmonkey.org/udfclient/releases/
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,7 @@ MAINTAINER=		buzztoh@13thmonkey.org
 HOMEPAGE=		http://www.13thmonkey.org/udfclient/
 COMMENT=		UDF disc reader for CD-ROM's, CD-RW's and DVD's
 
+WRKSRC=			${WRKDIR}/UDFclient
 MAKEFILE=		makefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/xjdic/Makefile b/misc/xjdic/Makefile
index 115ef31e13f..a2dd32da89a 100644
--- a/misc/xjdic/Makefile
+++ b/misc/xjdic/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/01/02 03:17:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=	xjdic24
 PKGNAME=	xjdic-2.4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese misc
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
@@ -22,6 +21,7 @@ COMMENT=	Japanese dictionary
 DEPENDS+=	edict-[0-9]*:../../misc/edict
 DEPENDS+=	kanjidic-[0-9]*:../../misc/kanjidic
 
+WRKSRC=		${WRKDIR}
 MESSAGE_SUBST+=	PREFIX=${PREFIX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile
index 092fee2d144..78c69b5a22a 100644
--- a/misc/xrolodex/Makefile
+++ b/misc/xrolodex/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 22:54:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:21:02 agc Exp $
 
 DISTNAME=		xrolodex.1.5.motif
 PKGNAME=		xrolodex-1.5
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/xrolodex.15
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=		.tar.Z
@@ -11,6 +10,7 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		root@garbled.net
 COMMENT=		Motif/X11 rolodex application
 
+WRKSRC=			${WRKDIR}/xrolodex.15
 USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined
 
diff --git a/misc/yrolo/Makefile b/misc/yrolo/Makefile
index 63fe20c8b7e..4c524c8170d 100644
--- a/misc/yrolo/Makefile
+++ b/misc/yrolo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:21:02 agc Exp $
 #
 
 DISTNAME=       yrolo-1.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/yrolo1.1
 CATEGORIES=	misc
 MASTER_SITES=   http://www.muquit.com/muquit/software/yrolo/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.muquit.com/muquit/software/yrolo/yrolo.html
 COMMENT=	Contact management software
 
+WRKSRC=		${WRKDIR}/yrolo1.1
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 USE_IMAKE=	yes