From 58714bb4ca6ba8756ffe555527141e15fbb8e952 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Thu, 11 Jul 2002 15:52:35 +0000
Subject: on Solaris, depend on gzip-base if GZCAT is not set, and neither
 /usr/bin/gzcat nor ${LOCALBASE}/bin/gzip exist.

required for Solaris systems which do not include gzcat in the base
system.

sanity checked by Stoned Elipot <seb@netbsd.org>.
---
 mk/bsd.pkg.mk    | 9 ++++++++-
 mk/defs.SunOS.mk | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3314542e826..c6ff257633a 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1003 2002/07/03 16:30:18 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1004 2002/07/11 15:52:35 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -1601,6 +1601,13 @@ BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
     !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha)
 BUILD_DEPENDS+=		lha>=114.9:../../archivers/lha  
 .endif
+.if !defined(GZCAT)
+.  if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \
+      !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz)
+BUILD_DEPENDS+=         gzip-base:../../archivers/gzip-base
+GZCAT=                  ${LOCALBASE}/bin/zcat
+.  endif
+.endif
 
 DECOMPRESS_CMD.tar.gz?=		${GZCAT}
 DECOMPRESS_CMD.tgz?=		${DECOMPRESS_CMD.tar.gz}
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 65ae46f571a..f621a2534bd 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.24 2002/06/02 00:40:19 schmonz Exp $
+# $NetBSD: defs.SunOS.mk,v 1.25 2002/07/11 15:52:36 grant Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -26,7 +26,8 @@ GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
 GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-.else
+.endif
+.if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
 GZIP?=		-9
-- 
cgit v1.2.3