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

20 files changed, 40 insertions, 47 deletions

diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile
index ac05cf85a09..4ea26d68a72 100644
--- a/misc/9menu/Makefile
+++ b/misc/9menu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:34 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:48 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
 #
 
 DISTNAME=		9menu-1.5
+WRKSRC=			${WRKDIR}
 CATEGORIES=		plan9 misc
 MASTER_SITES=		ftp://ftp.freefriends.org/arnold/Source/
 EXTRACT_SUFX=		.shar.gz
@@ -15,7 +16,6 @@ COMMENT=		Simple menu patterened after plan9
 MANCOMPRESSED=		yes
 .endif
 
-WRKSRC=			${WRKDIR}
 USE_X11=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index f7b6a275084..e708863555e 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2002/02/25 04:47:22 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:48 jmmv 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/ \
@@ -27,7 +28,6 @@ USE_X11BASE=	yes
 
 DIST_SUBDIR=    astrolog
 ALL_TARGET=     astrolog
-WRKSRC=		${WRKDIR}
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 2b2e626ec16..1d426a4847e 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/06/13 14:02:50 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:48 jmmv Exp $
 #
 
 DISTNAME=	colorize_0.3.0
 PKGNAME=	colorize-0.3.0
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	misc
 MASTER_SITES=	http://nrg.martos.bme.hu/release/colorize/download/bz2/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +12,6 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://nrg.martos.bme.hu/release/colorize/
 COMMENT=	log colorize perl script
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_BUILD=	yes
 USE_PERL5=	yes
 
diff --git a/misc/dt/Makefile b/misc/dt/Makefile
index 4ab47ebb769..7d5c6829fa7 100644
--- a/misc/dt/Makefile
+++ b/misc/dt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/02/03 15:26:27 kei Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:49 jmmv Exp $
 #
 
 DISTNAME=	dt-1.1.7
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/dt
 CATEGORIES=	misc
 MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
@@ -16,7 +17,6 @@ ALL_TARGET=	depend all
 CPPFLAGS+=	-D${DT_LAYOUT}_LAYOUT
 
 DTDOCSDIR=	${PREFIX}/share/doc/dt
-WRKSRC=		${WRKDIR}/dt
 
 post-install:
 	${INSTALL_DATA_DIR} ${DTDOCSDIR}
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 00fbc83e1e7..6f24c621a85 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2003/03/22 04:12:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:49 jmmv 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/
 
@@ -16,7 +17,6 @@ RESTRICTED=	Do not redistribute for a fee
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 19de4e2780b..51cfcea890b 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/08/12 12:06:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:49 jmmv Exp $
 #
 
 DISTNAME=	x10_heyu
 PKGNAME=	x10_heyu-1.33
+WRKSRC=		${WRKDIR}/heyu.dir
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,6 @@ COMMENT=	Home Automation Software for the X10 CM11A
 DIST_SUBDIR=	${PKGNAME}
 
 CONFIGURE_SCRIPT=	./Configure
-WRKSRC=		${WRKDIR}/heyu.dir
 MAKE_ENV+=	DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE}
 
 pre-install:
diff --git a/misc/ibutton-pdkit/Makefile b/misc/ibutton-pdkit/Makefile
index c152b53b6c0..24d64b92df2 100644
--- a/misc/ibutton-pdkit/Makefile
+++ b/misc/ibutton-pdkit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/10/26 12:33:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:49 jmmv 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
@@ -11,7 +12,6 @@ MAINTAINER=	damon@brodiefamily.org
 HOMEPAGE=	http://ibutton.com
 COMMENT=	1-Wire Public Domain Kit Version 2.00
 
-WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 
 SCRIPTS_ENV+=   SED=${SED}
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index 6bdcf1a748c..fd70d5c3a6f 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:09:08 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:41:50 jmmv 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=		packages@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/kstars/Makefile b/misc/kstars/Makefile
index bb824aebec5..9a840044830 100644
--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/20 12:05:19 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:50 jmmv Exp $
 # FreeBSD Id: ports/astro/kstars/Makefile,v 1.7 2002/03/31 06:52:00 pat Exp
 
 DISTNAME=	kstars-0.9.kde2
 PKGNAME=	kstars-0.9
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kstars/}
 
@@ -16,8 +17,6 @@ USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../x11/kde2/buildlink2.mk"
 .include "../../x11/kdelibs2/buildlink2.mk"
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index 0911218fe0d..ee292d89007 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/02/22 02:20:46 minoura Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:50 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.3 1999/01/08 03:32:06 itojun Exp $
 
 DISTNAME=	lv4494
 PKGNAME=	lv-4.49.4
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ff.iij4u.or.jp/~nrt/freeware/
 
@@ -12,7 +13,6 @@ COMMENT=	Powerful Multilingual File Viewer
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../src/configure
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
 
 # Causes unaligned access fault...
 # Note that the 32bit (sparc) binary works fine.
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index ed48af3d8d2..e5ba9ae5520 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/15 21:09:04 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:50 jmmv Exp $
 #
 
 DISTNAME=       mmv_1.01b.orig
 PKGNAME=	mmv-1.0b
+WRKSRC=		${WRKDIR}/mmv-1.01b.orig
 CATEGORIES=     misc
 MASTER_SITES=   http://ftp.debian.org/debian/dists/potato/main/source/utils/
 
@@ -10,8 +11,6 @@ MAINTAINER=     packages@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.pkg.mk"
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 42d03f988dc..52a6e3fbd62 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:51 jmmv Exp $
 
 DISTNAME=		OOo_1.0.2_LinuxIntel_install
 PKGNAME=		openoffice-linux-1.0.2
 PKGREVISION=		3
+WRKSRC=			${WRKDIR}/install
 CATEGORIES=		misc
 MASTER_SITES=		http://sf1.mirror.openoffice.org/stable/1.0.2/	\
 			http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -12,7 +13,6 @@ HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite (binary pkg)
 
 NO_CONFIGURE=           yes
-WRKSRC=			${WRKDIR}/install
 
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-[0-9]*
diff --git a/misc/p5-Msgcat/Makefile b/misc/p5-Msgcat/Makefile
index b8da6115d6a..885c9a870d1 100644
--- a/misc/p5-Msgcat/Makefile
+++ b/misc/p5-Msgcat/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/13 12:56:50 manu Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:51 jmmv Exp $
 #
 
 DISTNAME=		Msgcat-1.01
 PKGNAME=		p5-${DISTNAME}
 SVR4_PKGNAME=		p5lco
+WRKSRC=			${WRKDIR}/Msgcat
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Locale/}
 
@@ -14,7 +15,5 @@ COMMENT=		perl5 module to use the message catalog functions
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Locale/Msgcat/.packlist
 
-WRKSRC=			${WRKDIR}/Msgcat
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/parchive/Makefile b/misc/parchive/Makefile
index 9c8229e292c..ccd9e455b7e 100644
--- a/misc/parchive/Makefile
+++ b/misc/parchive/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/04 21:02:30 fredb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:51 jmmv Exp $
 #
 
 DISTNAME=	par-v1.1
 PKGNAME=	parchive-1.1
+WRKSRC=		${WRKDIR}/par-cmdline
 CATEGORIES=	misc archivers
 MASTER_SITES=	http://telia.dl.sourceforge.net/parchive/
 
@@ -10,8 +11,6 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://sourceforge.net/project/parchive/
 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 c4761df3d79..22a83113e4d 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/10/09 13:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:51 jmmv Exp $
 #
 
 DISTNAME=	${PKGNAME:S|-|_|}
 PKGNAME=	pdmenu-1.2.65
+WRKSRC=		${WRKDIR}/pdmenu
 CATEGORIES=	misc
 MASTER_SITES=	http://kitenet.net/programs/code/pdmenu/
 
@@ -13,7 +14,6 @@ COMMENT=	Simple console menu program
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/pdmenu
 
 REPLACE_PERL=	examples/showdir.pl
 
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 212d37cba5e..73b9d1e598d 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/01/04 22:34:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:51 jmmv Exp $
 
 DISTNAME=		root_v2.23.08.source
 PKGNAME=		root-2.23
+WRKSRC=			${WRKDIR}
 CATEGORIES=		misc
 MASTER_SITES=		ftp://root.cern.ch/root/
 
@@ -22,8 +23,6 @@ MAKE_ENV=		LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
 BROKEN= 	Compilation stops due to internal compiler error
 .endif
 
-WRKSRC=			${WRKDIR}
-
 do-configure:
 	${CP} ${FILESDIR}/Makefile.netbsd ${WRKDIR}/src
 	${MKDIR} ${WRKDIR}/bin
diff --git a/misc/sch/Makefile b/misc/sch/Makefile
index 5ec4f0f6d76..f4ee29f5167 100644
--- a/misc/sch/Makefile
+++ b/misc/sch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/24 05:08:03 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:52 jmmv Exp $
 
 DISTNAME=	sch-20010224
+WRKSRC=		${WRKDIR}/sch/build
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.itojun.org/pub/misc/
 
@@ -10,7 +11,6 @@ COMMENT=	curses-based schedule management tool
 LICENSE=	no-commercial-use
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/sch/build
 
 # manpages are not complete, don't confuse people
 do-install:
diff --git a/misc/xjdic/Makefile b/misc/xjdic/Makefile
index 73f2d5aae27..85fdc784ac3 100644
--- a/misc/xjdic/Makefile
+++ b/misc/xjdic/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/02/14 17:34:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:52 jmmv Exp $
 #
 
 DISTNAME=	xjdic23
 PKGNAME=	xjdic-2.3
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese misc
 MASTER_SITES=	http://www.bcit-broadcast.com/monash/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +16,6 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.csse.monash.edu.au/~jwb/xjdic/
 COMMENT=	Japanese dictionary
 
-WRKSRC=		${WRKDIR}
 MESSAGE_SUBST+=	PREFIX=${PREFIX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile
index 38b49529a4f..b0f390d816f 100644
--- a/misc/xrolodex/Makefile
+++ b/misc/xrolodex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/03/02 20:21:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:52 jmmv Exp $
 
 DISTNAME=		xrolodex.1.5.motif
 PKGNAME=		xrolodex-1.5
 PKGREVISIO=		1
+WRKSRC=			${WRKDIR}/xrolodex.15
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=		.tar.Z
@@ -13,7 +14,6 @@ COMMENT=		Motif/X11 rolodex application
 USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined
 
-WRKSRC=			${WRKDIR}/xrolodex.15
 MAKE_ENV+=		XMLIB="${MOTIFLIB}"
 
 .include "../../mk/motif.buildlink2.mk"
diff --git a/misc/yrolo/Makefile b/misc/yrolo/Makefile
index 89b90c7009a..2fe5a470f08 100644
--- a/misc/yrolo/Makefile
+++ b/misc/yrolo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/02 20:21:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:52 jmmv Exp $
 #
 
 DISTNAME=       yrolo-1.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/yrolo1.1
 CATEGORIES=	misc
 MASTER_SITES=   http://www.muquit.com/muquit/software/yrolo/
 
@@ -10,8 +11,6 @@ MAINTAINER=	packages@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