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

21 files changed, 42 insertions, 45 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 6cf1cea5f02..31a5b0da9fe 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:48:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:00 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp 
 #
 
 DISTNAME=       arc521e.pl8
 PKGNAME=        arc-5.21e
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=   .tar.Z
@@ -15,7 +16,6 @@ RESTRICTED=	"Do not modify. Do not charge for redistribution"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 do-install:
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 290c0f61e48..1265b8559e0 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 18:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:01 jmmv Exp $
 #
 
 DISTNAME=		bicom101
 PKGNAME=		bicom-1.01
+WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		http://www3.sympatico.ca/mt0000/bicom/
 EXTRACT_SUFX=		.zip
@@ -13,7 +14,6 @@ COMMENT=		data compressor in the PPM family
 
 LICENSE=		no-commercial-use
 USE_BUILDLINK2=		# defined
-WRKSRC=			${WRKDIR}
 
 do-build:
 	for i in bialib bicom; do					\
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 654f2363a1b..70137b1abc7 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 21:48:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:01 jmmv Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.gz
@@ -11,7 +12,6 @@ HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
 USE_BUILDLINK2=		# defined
-WRKSRC=			${WRKDIR}
 
 do-build:
 	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 1462490685e..98ab8b19432 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 21:49:10 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:01 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
 DISTNAME=       ha0999
 PKGNAME=        ha-0.999b
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=   .tgz
@@ -13,7 +14,6 @@ COMMENT=	The HA archiver using the HSC compression method
 
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}
 MAKEFILE=       makefile.nix
 MAKE_FLAGS=     CC="${CC}"
 ALL_TARGET=     ha
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 819ec1d35a5..ac6574a2f7d 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:11 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:01 jmmv Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
 
@@ -11,7 +12,6 @@ COMMENT=	Multi-System Archiver with open keys PGP-based security
 USE_BUILDLINK2=	yes
 
 CRYPTO=		yes
-WRKSRC=		${WRKDIR}
 
 MAKEFILE=       makefile
 ALL_TARGET=     hpack
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index 7afd1004522..e4d96252868 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/28 21:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:01 jmmv Exp $
 #
 
 DISTNAME=	jamjar-0.6
+WRKSRC=		${WRKDIR}/jamjar
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://wonka.acunia.com/pub/wonka/
 
@@ -12,7 +13,6 @@ COMMENT=	Acunia version of the jar archiver
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
 USE_BUILDLINK2=	YES
-WRKSRC=		${WRKDIR}/jamjar
 
 JAM_COMMAND=	\
 	cd ${WRKSRC} &&							\
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index 7ee266f374f..f8f1a4d2eff 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:16 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:02 jmmv Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
+WRKSRC=			${WRKDIR}/macutil
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://ftp.cwi.nl/pub/dik/
 EXTRACT_SUFX=		.shar.Z
@@ -12,7 +13,6 @@ COMMENT=		Create & extract Mac archive files
 MAKEFILE=		makefile
 MAKE_ENV+=		CF="${CFLAGS}"
 
-WRKSRC=			${WRKDIR}/macutil
 USE_BUILDLINK2=		# defined
 
 do-install:
diff --git a/archivers/mousetar/Makefile b/archivers/mousetar/Makefile
index 2516f090c95..e3c0c94f7dd 100644
--- a/archivers/mousetar/Makefile
+++ b/archivers/mousetar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/02 09:45:48 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:02 jmmv Exp $
 #
 
 DISTNAME=	mousetar-20021217
+WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/tar/
 DISTFILES=	tar.c tar.man
@@ -10,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	none
 COMMENT=	der Mouse's version of tar program
 
-WRKSRC=		${WRKDIR}
-
 do-extract:
 	for f in ${DISTFILES}; do					\
 		${CP} ${DISTDIR}/$$f ${WRKDIR};				\
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 278a92a846c..fb6b3851fe1 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:17 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:02 jmmv Exp $
 #
 
 DISTNAME=	nulibdist
 PKGNAME=	nulib2-1.0.1
+WRKSRC=		${WRKDIR}/nulib2-101
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.nulib.com/downloads/
 
@@ -10,8 +11,6 @@ MAINTAINER=	tv@poxbox.com
 HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
-WRKSRC=		${WRKDIR}/nulib2-101
-
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cache-file=${WRKDIR}/config.cache
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 3f2fa626a9a..c58f2d3972c 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:02 jmmv Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
+WRKSRC=		${WRKDIR}/PPUnpack
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -12,7 +13,6 @@ COMMENT=	Decompresses Amiga PowerPacker files
 
 USE_BUILDLINK2=	# defined
 
-WRKSRC=		${WRKDIR}/PPUnpack
 MAKE_FLAGS=	CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
 ALL_TARGET=	ppunpack
 LICENSE=	no-commercial-use
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 6e41fb6d998..eb74d569613 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:20 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2003/03/29 12:40:02 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp 
 #
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
+WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://rarsoft.ti.sk/pub/rar/ \
 			ftp://ftp.elf.stuba.sk/pub/pc/pack/
@@ -19,7 +20,6 @@ RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
 USE_BUILDLINK2=		# defined
 
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index f20a1103b5a..13edef5b799 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:03 jmmv Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
+WRKSRC=		${WRKDIR}/t20-squsq
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Compressor/decompressor for CP/M Squeeze compressed files
 
-WRKSRC=		${WRKDIR}/t20-squsq
 MAKEFILE=	${FILESDIR}/Makefile
 
 USE_BUILDLINK2=	# defined
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index b43abe19f94..ce0440acb4d 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:03 jmmv Exp $
 
 DISTNAME=		stuffit520.611linux-i386
 PKGNAME=		stuffit-5.2.0.611
+WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		ftp://ftp.aladdinsys.com/pub/linux/StuffIt/ \
 			ftp://ftp2.aladdinsys.com/pub/linux/StuffIt/
@@ -13,7 +14,6 @@ COMMENT=		Stuffit Archive Creator and Expander
 
 DEPENDS+=		suse_base>=6:../../emulators/${SUSE_DIR_PREFIX}_base
 
-WRKSRC=			${WRKDIR}
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile
index abc1c6f047e..c36ee256143 100644
--- a/archivers/unace22/Makefile
+++ b/archivers/unace22/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:03 jmmv Exp $
 #
 
 DISTNAME=	linunace22
 PKGNAME=	unace22-2.20
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.servidas.net/winace/ \
 	http://www.maxeline.com/winace/ \
@@ -24,7 +25,6 @@ DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
 DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
 .endif
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 CHECK_SHLIBS=	NO
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 9f381db88f9..06ac1f95638 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:49:24 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:03 jmmv Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
 USE_BUILDLINK2=	# defined
-WRKSRC=		${WRKDIR}
 
 do-build:
 	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o undms undms-1.3.c
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 8ecf1a0e36e..472047cc9dd 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:03 jmmv Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://de.aminet.net/pub/aminet/misc/unix/ \
 		ftp://us.aminet.net/pub/aminet/misc/unix/
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
 USE_BUILDLINK2=	# defined
-WRKSRC=		${WRKDIR}
 
 do-build:
 	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o unlzx unlzx.c
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 78f97951672..138f68dcc0a 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/23 01:56:43 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:04 jmmv Exp $
 #
 
 DISTNAME=	unzoo.c
 PKGNAME=	unzoo-4.4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/util/
 EXTRACT_SUFX=	# defined
@@ -10,7 +11,6 @@ EXTRACT_SUFX=	# defined
 MAINTAINER=	cjep@netbsd.org
 COMMENT=	Extract zoo archives
 
-WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 do-extract:
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index 92974ff611a..8e86b76a533 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:27 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:04 jmmv Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
 PKGNAME=	${PRGNAME}-2.3
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/packages/TeX/tools/xbin/
 DISTFILES=	${DISTNAME}.c ${PRGNAME}.man
@@ -15,7 +16,6 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 USE_BUILDLINK2=	# defined
-WRKSRC=		${WRKDIR}
 
 PRGNAME=	xbin
 EXTRACT_ONLY=	# empty
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index a5e54fb0b9c..238368cf571 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/17 09:22:47 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:04 jmmv Exp $
 
 DISTNAME=		xmill-0-7
 PKGNAME=		xmill-0.7
+WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.zip
@@ -16,8 +17,6 @@ EXTRACT_CMD=		${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE}
 
 MAKEFILE=		makefile
 
-WRKSRC=			${WRKDIR}
-
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 8c7b25ef302..079cfcba919 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/08/25 21:49:28 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:40:04 jmmv Exp $
 #
 
 DISTNAME=	zip1-1.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/
@@ -20,7 +21,6 @@ MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
 
 USE_BUILDLINK2=	yes
-WRKSRC=		${WRKDIR}
 PLIST_SRC=	${WRKSRC}/PLIST
 
 BUILD_DEFS+=	ZIP_ENCRYPTION
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index be89396424d..f072927a5b6 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2003/01/19 06:46:23 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:40:05 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp 
 #
 
 DISTNAME=       zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
@@ -14,7 +15,6 @@ LICENSE=	zoo-license
 
 USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}
 ALL_TARGET=     bsdansi
 MAKEFILE=       makefile