Note where gzip or gunzip is required by the package since it isn't

required by default any longer in bsd.pkg.mk under the new tools
framework.

40 files changed, 103 insertions, 54 deletions

diff --git a/biology/arka/Makefile b/biology/arka/Makefile
index 5774e08f39f..0fb982e4c15 100644
--- a/biology/arka/Makefile
+++ b/biology/arka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/27 13:08:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/15 22:02:26 jlam Exp $
 #
 
 DISTNAME=	arka-0.11
@@ -20,6 +20,7 @@ CPPFLAGS+=	-DARKA_GLOBAL=\"${PKG_SYSCONFDIR}/arkarc\"
 CPPFLAGS+=	-DARKA_PROGRAMS=\"${PKG_SYSCONFDIR}/arkarc\"
 
 INSTALLATION_DIRS=	bin man/man1
+PKGSRC_USE_TOOLS+=	gunzip
 
 post-build:
 	cd ${WRKSRC} && ${GUNZIP_CMD} arka.1.gz
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index c9b946f6881..4e8c104d6df 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/15 22:02:26 jlam Exp $
 
 DISTNAME=	RasMol_2.7.1
 PKGNAME=	rasmol-2.7.1
@@ -12,6 +12,7 @@ COMMENT=	Molecular Graphics Visualisation Tool
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	YES
+PKGSRC_USE_TOOLS+=	gunzip
 
 MAKE_ENV+=	DEPTHDEF="${DEPTHDEF}"
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 55c92aa1f31..78a46ce99dc 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.63 2005/05/15 22:02:26 jlam Exp $
 #
 
 DISTNAME=	ddd-3.3.10
@@ -16,6 +16,7 @@ TEST_TARGET=		check
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_X11BASE=		YES
+PKGSRC_USE_TOOLS+=	gzip
 
 GCC_REQD+=		3.0
 
diff --git a/devel/device-driver-doc-de/Makefile b/devel/device-driver-doc-de/Makefile
index b0324ae7833..1cd3b978202 100644
--- a/devel/device-driver-doc-de/Makefile
+++ b/devel/device-driver-doc-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/29 12:44:39 agc Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/15 22:02:26 jlam Exp $
 
 DISTNAME=	NetBSD-treiber_schreiben
 PKGNAME=	device-driver-doc-de-20030729
@@ -9,7 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.unixag-kl.fh-kl.de/~jkunz/
 COMMENT=	Device driver documentation in German
 
-NO_BUILD=	# defined
+NO_BUILD=		yes
+PKGSRC_USE_TOOLS+=	gunzip
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/device-driver-doc-de
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 54ca14f0547..6eb46bdb2ca 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/15 22:02:26 jlam Exp $
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
@@ -18,6 +18,7 @@ CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
 USE_GNU_TOOLS+=		lex
 XMKMF=			${X11BASE}/bin/xmkmf # don't specify -a option
+PKGSRC_USE_TOOLS+=	gzip
 
 BUILD_TARGET=		y.tab.c depend spim xspim
 
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 2569b681cbc..97c59991507 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:26 jlam Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
@@ -22,6 +22,8 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
 
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index fa0fab14892..9dadb3708fd 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:47:07 martti Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:26 jlam Exp $
 #
 
 DISTNAME=	ISO8859-2-pcf
@@ -14,6 +14,8 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
+PKGSRC_USE_TOOLS+=	gzip
+
 FONTDIR=	${PREFIX}/lib/X11/fonts/biznet
 OWN_DIRS=	${FONTDIR}
 FONTS_X11_DIRS=	${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 996279c39cd..495faf00308 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/11/29 15:11:16 uebayasi Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=	efont-unicode-bdf-0.4.2
 PKGNAME=	${DISTNAME:S/-bdf//}
@@ -10,7 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/efont/unicode/
 COMMENT=	Free unicode BDF font
 
-USE_X11BASE=	YES
+USE_X11BASE=		YES
+PKGSRC_USE_TOOLS+=	gzip
 
 MESSAGE_SUBST+=	FONTDIR=${FONTDIR}
 PLIST_SUBST+=	FONTDIR=${FONTDIR}
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index 397dade868a..d2ef4c706fe 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -14,6 +14,7 @@ USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
 #ALIAS=			${WRKDIR}/fonts.alias
+PKGSRC_USE_TOOLS+=	gzip
 
 LICENSE=		no-commercial-use
 
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 9315bfeaf5a..82c7d875950 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/06/15 13:47:54 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -19,6 +19,7 @@ SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
 WRKSRC=			${WRKDIR}
 USE_GNU_TOOLS+=		patch
+PKGSRC_USE_TOOLS+=	gzip
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index d1d167d7eb8..fca1ce8ec22 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -10,6 +10,7 @@ COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
+PKGSRC_USE_TOOLS+=	gzip
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
 
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index 01cefab6eff..f2efb134a22 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:37:11 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=		knj10-1.1
 PKGNAME=		ja-naga10-1.1
@@ -12,6 +12,7 @@ HOMEPAGE=		http://hp.vector.co.jp/authors/VA013391/fonts/#naga10
 COMMENT=		10x10 dots X11 bitmap font for JIS X 0208
 
 USE_X11BASE=		YES
+PKGSRC_USE_TOOLS+=	gzip
 DOCDIR=			${PREFIX}/share/doc
 FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
 
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 87a108f6da2..f4db2af8072 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=	jisx0212fonts-0.0
 PKGREVISION=	1
@@ -21,6 +21,8 @@ FONTS=		${DISTFILES:C/\.bdf.*$//}
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
 FONTS_X11_DIRS=	${FONTDIR}
 
+PKGSRC_USE_TOOLS+=	gzip gunzip
+
 # XXX Can we assume that ${GUNZIP_CMD} can extract .Z files?
 do-extract:
 	@for f in ${DISTFILES}; do \
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index 207f1aeb3a2..9dee2ded4f4 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/31 10:23:59 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	jisx0213fonts-0.0
@@ -10,7 +10,8 @@ MAINTAINER=	itojun@itojun.org, uebayasi@NetBSD.org
 HOMEPAGE=	ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/
 COMMENT=	X11 bitmap fonts for JIS X 0213
 
-USE_X11BASE=	yes
+USE_X11BASE=		yes
+PKGSRC_USE_TOOLS+=	gzip
 
 FONTS=		K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile
index 5dce3f1b558..58c2a3374c9 100644
--- a/fonts/ko-baekmuk/Makefile
+++ b/fonts/ko-baekmuk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:37:16 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	baekmuk-2.0
@@ -14,6 +14,7 @@ COMMENT=	X11 fonts for KSX 1001 Korean standard (baekmuk foundry)
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=	yes
+USE_TOOLS+=	gzip
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
 
diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile
index ed47de5c433..bf18d70e645 100644
--- a/fonts/ko-hanyang/Makefile
+++ b/fonts/ko-hanyang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:18 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	hanyang-font-pcf
@@ -13,6 +13,7 @@ COMMENT=	X11 fonts for KSC 5601 standard
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=	yes
+USE_TOOLS+=	gzip
 EXTRACT_ONLY=	# empty
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile
index 2e0e22b051f..43d363cb00a 100644
--- a/fonts/ko-kaist/Makefile
+++ b/fonts/ko-kaist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:20 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	ko-kaist-20010718
@@ -13,6 +13,7 @@ COMMENT=	X11 fonts for Korean KSC 5601 standard (kaist foundry)
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=	yes
+USE_TOOLS+=	gzip
 EXTRACT_ONLY=	# empty
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile
index f3d47f9e6cd..1bd6125905a 100644
--- a/fonts/ko-mizi/Makefile
+++ b/fonts/ko-mizi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:37:20 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	xfntmizi-1.1-2.noarch
@@ -15,6 +15,7 @@ BUILD_DEPENDS+=	rpm-[0-9]*:../../misc/rpm
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=	yes
+USE_TOOLS+=	gzip
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
 
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 2aa821182d6..aef614ec7bc 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/09/01 19:08:06 reed Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/05/15 22:02:27 jlam Exp $
 #
 
 NETHACK_BASEVER=	3.4.3
@@ -17,6 +17,7 @@ HOMEPAGE=		http://www.nethack.org/
 WRKSRC=			${WRKDIR}/nethack-${NETHACK_BASEVER}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
+USE_TOOLS+=		gzip
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index ecdfd2f9bc0..33183643339 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -23,6 +23,8 @@ USE_X11BASE=	yes
 USE_GNU_TOOLS+=	make
 MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX}
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 .include "../../mk/bsd.prefs.mk"
 
 .ifdef ${OPSYS} == "Linux"
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 7e2b2481d88..b941b8feec3 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -18,6 +18,7 @@ NO_BIN_ON_FTP=	    ${RESTRICTED}
 NO_SRC_ON_FTP=	    ${RESTRICTED}
 
 USE_GNU_TOOLS+=		make
+PKGSRC_USE_TOOLS+=	gunzip
 USE_X11=		YES
 
 SUBST_CLASSES+=		data
diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile
index b057f295eba..5fadad7902f 100644
--- a/graphics/jhead/Makefile
+++ b/graphics/jhead/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	jhead-2.3
@@ -10,14 +10,14 @@ HOMEPAGE=	http://www.sentex.net/~mwandel/jhead/
 COMMENT=	Extract EXIF header from JPEG image
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
+PKGSRC_USE_TOOLS+=	gunzip
 
 INSTALLATION_DIRS=	bin man/man1 share/doc/html/jhead
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o jhead \
 		jhead.c exif.c jpgfile.c makernote.c -lm
-	${GZIP_CMD} -d ${WRKSRC}/jhead.1.gz
+	${GUNZIP_CMD} ${WRKSRC}/jhead.1.gz
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/jhead
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index cce206b065e..b231defa683 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/15 11:53:20 veego Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/15 22:02:27 jlam Exp $
 #
 
 RELVERSION=	1.3.1
@@ -43,10 +43,10 @@ CHECK_SHLIBS=	NO	# This would use NetBSD ldd on Linux shlibs.
 
 .include "../../mk/bsd.prefs.mk"
 
-JVM_HOME=	${PREFIX}/java/blackdown-${RELVERSION}
+JVM_HOME=		${PREFIX}/java/blackdown-${RELVERSION}
+PKGSRC_USE_TOOLS+=	gunzip
 
-
-PLIST_SUBST+=	BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
+PLIST_SUBST+=		BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
 			Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 446fe79a391..b3f3a7c127c 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=	f2c-20001205
 PKGREVISION=	8
@@ -34,6 +34,8 @@ MAKE_ENV+=	ECHO=${ECHO}
 WRKSRC=		${WRKDIR}/f2c
 USE_LIBTOOL=	yes
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 post-extract:
 	@${RM} ${WRKSRC}/index.html
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index a8bdf69d0d1..e45c8bb2be8 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:15:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -18,7 +18,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 BUILD_TARGET=	it
 
-USE_CONFIGURE=	NO
+USE_CONFIGURE=		NO
+PKGSRC_USE_TOOLS+=	gzip
 
 do-install:
 	@${CP} ${WRKSRC}/doc/head ${WRKSRC}/doc/tutorial
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index 7cf8d21f7c6..d71b13f9b3d 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
 
 DISTNAME=	Mail-Mbox-MessageParser-1.20
 PKGNAME=	p5-${DISTNAME}
@@ -15,6 +15,8 @@ DEPENDS+=	p5-Storable-[0-9]*:../../devel/p5-Storable
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/Mbox/MessageParser/.packlist
 
+USE_TOOLS+=	grep gzip
+
 SETTINGS+=	INSTALLDIRS=site
 # XXX: might need adaptation if the programs are not
 # in the base system
diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile
index 194189be601..480a65373a8 100644
--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	bbweather-0.6.2
@@ -16,6 +16,7 @@ USE_X11=		YES
 GNU_CONFIGURE=		YES
 REPLACE_PERL=		GrabWeather
 USE_PERL5=		run
+PKGSRC_USE_TOOLS+=	gunzip
 
 post-install:
 	cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} GrabWeather.1.gz
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 7aa6e7b8cd6..27e41e8fe0a 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:21:01 agc Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	colorize_0.3.0
@@ -15,6 +15,8 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_BUILD=	yes
 USE_PERL5=	yes
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 post-patch:
 	${SED}	-e "s,/usr/bin/perl,${LOCALBASE}/bin/perl,"		\
 		-e "s,/etc/colorizerc,${PREFIX}/etc/colorizerc,"	\
diff --git a/misc/kdrill/Makefile b/misc/kdrill/Makefile
index aafdc0a077d..51f07db22b6 100644
--- a/misc/kdrill/Makefile
+++ b/misc/kdrill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/15 22:02:27 jlam Exp $
 #
 
 DISTNAME=	kdrill5.11.6
@@ -14,7 +14,8 @@ COMMENT=	Kanji quiz and japanese dictionary
 DEPENDS+=	edict-[0-9]*:../../misc/edict
 DEPENDS+=	kanjidic-[0-9]*:../../misc/kanjidic
 
-USE_IMAKE=	yes
+USE_IMAKE=		yes
+PKGSRC_USE_TOOLS+=	gzip
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kdrill
diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile
index 41a97389546..912927d509a 100644
--- a/misc/routeplanner-cli/Makefile
+++ b/misc/routeplanner-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/15 22:02:28 jlam Exp $
 #
 
 DISTNAME=		routeplanner_0.11
@@ -12,6 +12,7 @@ COMMENT=		Highway trip planner written in Python
 
 WRKSRC=			${WRKDIR}/routeplanner-0.11
 NO_BUILD=		yes
+PKGSRC_USE_TOOLS+=	gzip
 
 PYTHON_PATCH_SCRIPTS=	rpcli
 RPLIBDIR=		${PREFIX}/lib/routeplanner
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 785d82dde53..6e420d3bb38 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=	xanim2801
 PKGNAME=	xanim-2.80.1
@@ -22,7 +22,8 @@ EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 .include "Makefile.codecs"
 
-USE_IMAKE=	YES
+USE_IMAKE=		YES
+PKGSRC_USE_TOOLS+=	gunzip
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile
index 1dcbde58f66..1e63f4ce9ac 100644
--- a/net/lambdamoo-core/Makefile
+++ b/net/lambdamoo-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=	LambdaCore-12Apr99.db
 PKGNAME=	lambdamoo-core-990412
@@ -11,7 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html
 COMMENT=	Generic core classes for lambdamoo
 
-EXTRACT_CMD=	:
+EXTRACT_CMD=		:
+PKGSRC_USE_TOOLS+=	gunzip
 
 WRKSRC=		${WRKDIR}
 
diff --git a/net/wakeup/Makefile b/net/wakeup/Makefile
index 1faf81282c7..b7be8f8373d 100644
--- a/net/wakeup/Makefile
+++ b/net/wakeup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:52:01 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:28 jlam Exp $
 #
 
 DISTNAME=	hpwake
@@ -11,6 +11,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.berens-partner.de/wann/computer/wol.html
 COMMENT=	Wakeup On LAN client for remote power-up of machines
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile
index 63fdb818142..ac67f682b5b 100644
--- a/print/cnprint/Makefile
+++ b/print/cnprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=		#
 PKGNAME=		cnprint-3.30b
@@ -26,6 +26,7 @@ HOMEPAGE=		http://www.neurophys.wisc.edu/~cai/software/index.html
 COMMENT=		Print & convert CJK style text to PostScript
 
 DIST_SUBDIR=		${PKGNAME}
+PKGSRC_USE_TOOLS+=	gunzip
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 9feec357fcb..ce4b722c586 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=	hpijs-1.7.1
 PKGREVISION=	# empty
@@ -15,6 +15,7 @@ USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		# defined
 CPPFLAGS+=		-DAPDK_BUFFER_SEND
 
+PKGSRC_USE_TOOLS+=	gzip
 ONLY_FOR_COMPILER=	gcc
 
 do-install:
diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile
index 43722767481..a8628ec1373 100644
--- a/shells/bash2-doc/Makefile
+++ b/shells/bash2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/18 04:26:01 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=	bash-doc-2.05b
 PKGNAME=	bash-doc-2.05.2
@@ -16,6 +16,8 @@ WRKSRC=		${WRKDIR}/doc
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
+PKGSRC_USE_TOOLS+=	gzip
+
 DOCDIR=		${PREFIX}/share/doc/bash
 HTMLDIR=	${PREFIX}/share/doc/html/bash
 
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index 69d1fa75a00..ae03968b3bc 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/23 13:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/15 22:02:28 jlam Exp $
 #
 
 DISTNAME=	tdir-1.58
@@ -11,6 +11,7 @@ COMMENT=	Display directories with files ordered by ending "extension"
 
 LICENSE=	tdir-license
 
+PKGSRC_USE_TOOLS+=	gunzip
 PYTHON_PATCH_SCRIPTS=	tdir
 
 do-install:
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 71be7a424a9..4cdbee633b0 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/28 11:25:15 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=	html2text-1.3.2a
 CATEGORIES=	textproc
@@ -12,6 +12,7 @@ USE_LANGUAGES=		c c++
 GCC_REQD=		3.0
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		ECHO="${ECHO}"
+PKGSRC_USE_TOOLS+=	gunzip
 
 post-build:
 	${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index f9a1d883ea1..7290529fdc3 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/15 22:02:28 jlam Exp $
 
 PKGNAME=	jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}
@@ -23,9 +23,11 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
 # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GZIP_CMD} -d ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
 
 PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
 MAKE_DIRS=	${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR}
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 87dea54ffaa..baf1b762147 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/15 22:02:28 jlam Exp $
 
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -21,9 +21,11 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
+PKGSRC_USE_TOOLS+=	gunzip
+
 # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
 # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GZIP_CMD} -d ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
 
 PKG_SYSCONFDIR.jakarta-tomcat55=	${TOMCAT_LIB}/conf
 MAKE_DIRS=	${PKG_SYSCONFDIR.jakarta-tomcat55}/${CATALINA_DIR}