From owner-svn-ports-branches@freebsd.org  Sun May 22 01:14:18 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 05046B3B904;
 Sun, 22 May 2016 01:14:18 +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 C65101B04;
 Sun, 22 May 2016 01:14:17 +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 u4M1EGoE065628;
 Sun, 22 May 2016 01:14:16 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4M1EGaF065627;
 Sun, 22 May 2016 01:14:16 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201605220114.u4M1EGaF065627@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: Sun, 22 May 2016 01:14:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r415620 - branches/2016Q2/devel/fb-adb
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2016 01:14:18 -0000

Author: jbeich
Date: Sun May 22 01:14:16 2016
New Revision: 415620
URL: https://svnweb.freebsd.org/changeset/ports/415620

Log:
  MFH: r415618
  
  devel/fb-adb: unbreak c6_64 build after r411857
  
  ===>  Extracting for fb-adb-1.4.4.124
  => SHA256 Checksum OK for android-ndk-r10e-linux-x86_64.bin.
  => SHA256 Checksum OK for facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz.
  tar: Error opening archive: Unrecognized archive format
  *** Error code 1
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2016Q2/devel/fb-adb/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/devel/fb-adb/Makefile
==============================================================================
--- branches/2016Q2/devel/fb-adb/Makefile	Sun May 22 01:12:09 2016	(r415619)
+++ branches/2016Q2/devel/fb-adb/Makefile	Sun May 22 01:14:16 2016	(r415620)
@@ -62,13 +62,12 @@ DISTNAME_ndk=		android-ndk-r10e-linux-${
 WRKSRC_ndk=		${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//}
 .endif
 NDK_BUILD_DEPENDS=	${LINUX_BASE_PORT}
-NDK_USES=		7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}}
+NDK_USES=		7z:partial${OVERRIDE_LINUX_BASE_PORT:M*64:C/.+/,p7zip/}
 NDK_USE=		LINUX=yes # build
 NDK_SHELL=		${SETENV} UNAME_s=Linux UNAME_m=${LINUX_RPM_ARCH} ${SH}
 NDK_CONFIGURE_ENV=	ANDROID_NDK="${WRKSRC_ndk}" \
 			ANDROID_NDK_SHELL="${NDK_SHELL}" \
 			NDK_TMPDIR="${WRKDIR}"
-NDK_7z_ARGS_x86_64=	,p7zip # libarchive fails to read
 NDK_BUILD_DEPENDS_OFF=	${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 \
 			${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gnatdroid-x86
 .if defined(.PARSEDIR)