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

24 files changed, 55 insertions, 49 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 5d9be083499..657ec408f18 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:05 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc 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
@@ -16,6 +15,8 @@ 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 4e16230b270..ac4eeb3e8fc 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=		bicom101
 PKGNAME=		bicom-1.01
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		http://www3.sympatico.ca/mt0000/bicom/
 EXTRACT_SUFX=		.zip
@@ -13,6 +12,8 @@ HOMEPAGE=		http://www3.sympatico.ca/mt0000/bicom/bicom.html
 COMMENT=		Data compressor in the PPM family
 
 LICENSE=		no-commercial-use
+
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		# defined
 USE_GCC_SHLIB=		yes
 
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index a73bda2e148..0e4174da5a3 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:21:07 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.gz
@@ -11,7 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
-USE_BUILDLINK2=		# defined
+WRKSRC=		${WRKDIR}
+USE_BUILDLINK2=	# defined
 
 do-build:
 	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 75eda6103ee..10d6123fc32 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:21:20 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:06 agc 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
@@ -12,6 +11,7 @@ EXTRACT_SUFX=   .tgz
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	The HA archiver using the HSC compression method
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 MAKEFILE=       makefile.nix
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index af0e1a7e04d..62950161811 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:21 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
 
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 CRYPTO=		yes
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index 140b5677e27..b3b189a6e39 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:21:22 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	jamjar-0.6
-WRKSRC=		${WRKDIR}/jamjar
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://wonka.acunia.com/pub/wonka/
 
@@ -12,6 +11,7 @@ COMMENT=	Acunia version of the jar archiver
 
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
+WRKSRC=		${WRKDIR}/jamjar
 USE_BUILDLINK2=	YES
 
 JAM_COMMAND=	\
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index f8f1a4d2eff..6637edf9deb 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:06 agc 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
@@ -13,6 +12,7 @@ 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 4af3e0fe343..15c043c5deb 100644
--- a/archivers/mousetar/Makefile
+++ b/archivers/mousetar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/18 14:00:58 yyamano Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	mousetar-20021217
-WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/mouse/tar/
 DISTFILES=	tar.c tar.man
@@ -11,6 +10,8 @@ MAINTAINER=	tech-pkg@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 9c68fb3f08c..5ab8c50b9bb 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/15 09:36:45 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
 #
 
 DISTNAME=	nulibdist
 PKGNAME=	nulib2-2.0.0
-WRKSRC=		${WRKDIR}/nulib2-200
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.nulib.com/downloads/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tv@poxbox.com
 HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
+WRKSRC=		${WRKDIR}/nulib2-200
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cache-file=${WRKDIR}/config.cache
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index b17671d4ac0..864d77dfd0b 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:21:34 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc 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/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Decompresses Amiga PowerPacker files
 
+WRKSRC=		${WRKDIR}/PPUnpack
 USE_BUILDLINK2=	# defined
 
 MAKE_FLAGS=	CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 8a8556f580e..da6307b0c1d 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 21:21:35 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/20 12:07:06 agc 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/
@@ -20,6 +19,7 @@ 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 7b44bb68217..f71d13b32d8 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:21:38 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:06 agc Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
-WRKSRC=		${WRKDIR}/t20-squsq
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -11,6 +10,7 @@ COMMENT=	Compressor/decompressor for CP/M Squeeze compressed files
 
 MAKEFILE=	${FILESDIR}/Makefile
 
+WRKSRC=		${WRKDIR}/t20-squsq
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index edb553e1524..123d06c0a5c 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:06 agc 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/
@@ -22,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+WRKSRC=			${WRKDIR}
 CHECK_SHLIBS=		NO
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile
index 94c914dd046..dd3d8cb99f0 100644
--- a/archivers/unace22/Makefile
+++ b/archivers/unace22/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/25 18:29:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	linunace22
 PKGNAME=	unace22-2.20
-WRKSRC=		${WRKDIR}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.servidas.net/winace/ \
 		http://www.maxeline.com/winace/ \
@@ -18,6 +17,8 @@ COMMENT=	Extract, list and test files in ACE archives (2.2 linux binary)
 
 ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 Linux-*-i[3-6]86
 
+WRKSRC=		${WRKDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index ac7925b985d..29c7069ba85 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:21:42 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:07 agc 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,6 +10,7 @@ EXTRACT_SUFX=	.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 1ad8b61529c..0bbf2f08446 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:21:43 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc 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,6 +10,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 649c0b3a05a..e948263e639 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/01/19 20:18:02 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/20 12:07:07 agc Exp $
 #
 
 DISTNAME=	unrarsrc-3.3.4
 PKGNAME=	${DISTNAME:S/src//}
-WRKSRC=		${WRKDIR}/unrar
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
 
@@ -20,6 +19,8 @@ RESTRICTED=	"Do not modify. Do not charge a fee for redistribution."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/unrar
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unrar
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} unrar ${PREFIX}/bin
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index c2c98729bf6..19015747e00 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2004/01/05 11:42:20 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	unzip550
 PKGNAME=	unzip-5.50
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/ \
@@ -20,6 +19,7 @@ COMMENT=	List, test and extract compressed files in a ZIP archive
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 086638dd4bc..c3f796811ef 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:21:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:07 agc 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
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	# defined
 MAINTAINER=	cjep@NetBSD.org
 COMMENT=	Extract zoo archives
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 do-extract:
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 673e61a5c27..55e8f5d3b1a 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/07 15:12:59 ben Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=	upx-1.24-src
 PKGNAME=	${DISTNAME:S/-src//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	misc archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=upx/}
 
@@ -12,6 +11,8 @@ COMMENT=	Ultimate packer for executables
 
 DEPENDS+=	ucl>=1.01:../../devel/ucl
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 USE_GMAKE=	yes
 USE_PERL5=	build
 
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index b15fe9da5f3..f5c46edd5aa 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:24:41 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc 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,6 +14,7 @@ RESTRICTED=	"May not be sold without permission"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 PRGNAME=	xbin
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 02655181865..55a9102067e 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:07 agc Exp $
 
 DISTNAME=		xmill-0-7
 PKGNAME=		xmill-0.7
-WRKSRC=			${WRKDIR}
 CATEGORIES=		archivers
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.zip
@@ -15,6 +14,7 @@ BUILD_DEPENDS=		unzip-[0-9]*:../../archivers/unzip
 
 EXTRACT_CMD=		${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE}
 
+WRKSRC=			${WRKDIR}
 USE_GMAKE=		#defined
 MAKEFILE=		makefile
 
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 9b48975c986..829962c3ca9 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:21:49 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:07:07 agc 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/
@@ -16,6 +15,7 @@ RESTRICTED=	"Do not modify.  Do not sell for profit."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 416b1fa2037..451a487af0b 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:21:50 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:07:07 agc 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/
 
@@ -13,6 +12,7 @@ COMMENT=	Manipulate archives of files in compressed form
 
 LICENSE=	zoo-license
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
 
 ALL_TARGET=     bsdansi