From owner-svn-ports-head@freebsd.org  Fri Mar 25 15:38:58 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03835ADD211;
 Fri, 25 Mar 2016 15:38:58 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B02D018C9;
 Fri, 25 Mar 2016 15:38:57 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2PFcuun092919;
 Fri, 25 Mar 2016 15:38:56 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2PFculn092918;
 Fri, 25 Mar 2016 15:38:56 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201603251538.u2PFculn092918@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 25 Mar 2016 15:38:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411856 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Mar 2016 15:38:58 -0000

Author: jbeich
Date: Fri Mar 25 15:38:56 2016
New Revision: 411856
URL: https://svnweb.freebsd.org/changeset/ports/411856

Log:
  Add USES=7z support: common way to extract 7-Zip archives
  
  By default, it tries to take advantage of libarchive and falls back to p7zip.
  Extracting only selected few DISTFILES is also supported via :partial argument.
  
  Approved by:	portmgr (bapt)
  Differential Revision:	https://reviews.freebsd.org/D4190

Added:
  head/Mk/Uses/7z.mk   (contents, props changed)

Added: head/Mk/Uses/7z.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/7z.mk	Fri Mar 25 15:38:56 2016	(r411856)
@@ -0,0 +1,64 @@
+# $FreeBSD$
+#
+# Extract 7-Zip archives
+#
+# Feature:	7z
+# Usage:	USES=7z or USES=7z:ARGS
+# Valid ARGS:	p7zip, partial
+#
+# p7zip		Extract using 7z(1) instead of bsdtar(1)
+# partial	Extract only files tagged with :7z or in EXTRACT_ONLY_7z
+#
+# MAINTAINER:	jbeich@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_7Z_MK)
+_INCLUDE_USES_7Z_MK=	yes
+
+P7ZIP_CMD?=		7z
+P7ZIP_BEFORE_ARGS?=	x -bd -y -o${P7ZIP_WRKDIR} >/dev/null
+P7ZIP_AFTER_ARGS?=	# empty
+P7ZIP_WRKDIR?=		${EXTRACT_WRKDIR}
+
+.if !empty(7z_ARGS:Np7zip:Npartial)
+IGNORE=			USES=7z has invalid arguments: ${7z_ARGS:Np7zip:Npartial}
+.endif
+
+.if ! ${7z_ARGS:Mp7zip} && (${OPSYS} == FreeBSD && ${OSVERSION} < 1000009)
+# libarchive lacks 7zip reader, fallback to P7ZIP_CMD
+7z_ARGS+=		p7zip
+.endif
+
+.if ${7z_ARGS:Mp7zip}
+EXTRACT_DEPENDS+=	${P7ZIP_CMD}:archivers/p7zip
+.endif
+
+.if ! ${7z_ARGS:Mpartial}
+EXTRACT_SUFX?=		.7z
+.endif
+
+.if ${7z_ARGS:Mp7zip} && ! ${7z_ARGS:Mpartial}
+EXTRACT_CMD?=		${P7ZIP_CMD}
+EXTRACT_BEFORE_ARGS?=	${P7ZIP_BEFORE_ARGS}
+EXTRACT_AFTER_ARGS?=	${P7ZIP_AFTER_ARGS}
+.endif
+
+.if ! ${7z_ARGS:Mp7zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY)
+EXTRACT_ONLY+=		${EXTRACT_ONLY_7z}
+.endif
+
+.if ${7z_ARGS:Mp7zip} && ${7z_ARGS:Mpartial}
+EXTRACT_ONLY?=		${DISTFILES:N*\:*7z*:C/:.*//}
+EXTRACT_ONLY_7z?=	${DISTFILES:M*\:*7z*:C/:.*//}
+
+_USES_extract+=		520:do-p7zip-extract
+do-p7zip-extract:
+	@for file in ${EXTRACT_ONLY_7z}; do \
+		if ! ${P7ZIP_CMD} ${P7ZIP_BEFORE_ARGS} \
+			${_DISTDIR}/$$file ${P7ZIP_AFTER_ARGS}; \
+		then \
+			exit 1; \
+		fi; \
+	done
+.endif
+
+.endif