From fb954fb0ae92a711bc48372c4f0f6774a4008a3c Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Mon, 1 Oct 2012 10:45:16 +0000
Subject: Add 7z archive distfile support. Fix PR pkg/42967

---
 mk/tools/defaults.mk |  3 ++-
 mk/tools/replace.mk  | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'mk/tools')

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index bafd4a4d9e6..6fd5b7c1f20 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.57 2009/07/08 12:51:16 minskim Exp $
+# $NetBSD: defaults.mk,v 1.58 2012/10/01 10:45:16 ryoon Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -113,6 +113,7 @@ _TOOLS_VARNAME.mv=		MV
 _TOOLS_VARNAME.nice=		NICE
 _TOOLS_VARNAME.nroff=		NROFF
 _TOOLS_VARNAME.openssl=		OPENSSL
+_TOOLS_VARNAME.7za=		P7ZA
 _TOOLS_VARNAME.patch=		PATCH
 _TOOLS_VARNAME.pax=		PAX
 _TOOLS_VARNAME.perl=		PERL5
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 067a28dd4d5..92acae0f0e8 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.251 2012/07/27 10:48:36 jperkin Exp $
+# $NetBSD: replace.mk,v 1.252 2012/10/01 10:45:16 ryoon Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -205,6 +205,17 @@ _TOOLS_USE_PKGSRC.${_t_}?=	yes
 # command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has
 # been associated with <tool>.
 #
+.if !defined(TOOLS_IGNORE.7za) && !empty(_USE_TOOLS:M7za)
+.  if !empty(PKGPATH:Marchivers/p7zip)
+MAKEFLAGS+=			TOOLS_IGNORE.7za=
+.  elif !empty(_TOOLS_USE_PKGSRC.7za:M[yY][eE][sS])
+TOOLS_DEPENDS.7za?=		p7zip>=9.04:../../archivers/p7zip
+TOOLS_CREATE+=			7za
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.7za=7za
+TOOLS_PATH.7za=			${TOOLS_PREFIX.7za}/bin/7za
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk)
 .  if !empty(PKGPATH:Mlang/nawk)
 MAKEFLAGS+=			TOOLS_IGNORE.awk=
-- 
cgit v1.2.3