From owner-svn-ports-branches@freebsd.org Tue Oct 4 19:55:47 2016 Return-Path: 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 56F29AF54E0; Tue, 4 Oct 2016 19:55:47 +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 21DF39AD; Tue, 4 Oct 2016 19:55:47 +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 u94JtkWH028899; Tue, 4 Oct 2016 19:55:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u94JtkQJ028898; Tue, 4 Oct 2016 19:55:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610041955.u94JtkQJ028898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 4 Oct 2016 19:55:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r423297 - branches/2016Q4/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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2016 19:55:47 -0000 Author: jbeich Date: Tue Oct 4 19:55:46 2016 New Revision: 423297 URL: https://svnweb.freebsd.org/changeset/ports/423297 Log: MFH: r423295 devel/fb-adb: unbreak fetch for 64bit NDK fetch: https://dl.google.com/android/ndk/android-ndk-r11c-linux-x86_64.zip: Not Found Note, :7z versus :zip sizes are $ du -Ah android-ndk-* 376M android-ndk-r10e-linux-x86.bin 1.0G android-ndk-r10e-linux-x86.zip 383M android-ndk-r10e-linux-x86_64.bin 1.0G android-ndk-r10e-linux-x86_64.zip 757M android-ndk-r11c-linux-x86_64.zip 721M android-ndk-r12b-linux-x86_64.zip Approved by: ports-secteam blanket Modified: branches/2016Q4/devel/fb-adb/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/fb-adb/Makefile ============================================================================== --- branches/2016Q4/devel/fb-adb/Makefile Tue Oct 4 19:52:28 2016 (r423296) +++ branches/2016Q4/devel/fb-adb/Makefile Tue Oct 4 19:55:46 2016 (r423297) @@ -49,14 +49,15 @@ DEBUG_CONFIGURE_ENABLE= debuggable-stubs # XXX Convert into USES=android once more things depend on it NDK_DESC= Build target stubs using Android NDK -NDK_MASTER_SITES= https://dl.google.com/android/ndk/:ndk,p7zip +NDK_MASTER_SITES= https://dl.google.com/android/ndk/:7z \ + https://dl.google.com/android/repository/:zip .if defined(ANDROID_NDK) # Prefer NDK from environment WRKSRC_ndk= ${ANDROID_NDK} .else NDK_DISTFILES= ${NDK_DISTFILES_${LINUX_ARCH}} -NDK_DISTFILES_i386= android-ndk-r10e-linux-x86.bin:ndk,p7zip -NDK_DISTFILES_x86_64= android-ndk-r11c-linux-x86_64.zip:ndk +NDK_DISTFILES_i386= android-ndk-r10e-linux-x86.bin:7z +NDK_DISTFILES_x86_64= android-ndk-r11c-linux-x86_64.zip:zip WRKSRC_ndk= ${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//} .endif NDK_USES= 7z:partial linux