Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Sep 2019 14:45:56 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r511885 - in head/devel: android-tools-adb android-tools-fastboot android-tools-simpleperf
Message-ID:  <201909121445.x8CEjuAt069785@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Sep 12 14:45:56 2019
New Revision: 511885
URL: https://svnweb.freebsd.org/changeset/ports/511885

Log:
  devel/android-tools-*: simplify via GH_TUPLE
  
  Also, chase HTTP redirect in simpleperf

Modified:
  head/devel/android-tools-adb/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/Makefile   (contents, props changed)
  head/devel/android-tools-simpleperf/Makefile   (contents, props changed)
  head/devel/android-tools-simpleperf/distinfo   (contents, props changed)

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Thu Sep 12 14:32:12 2019	(r511884)
+++ head/devel/android-tools-adb/Makefile	Thu Sep 12 14:45:56 2019	(r511885)
@@ -12,8 +12,7 @@ COMMENT=	Android debug bridge command line tool
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror
-GH_PROJECT=	platform_system_core
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL}
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
@@ -37,9 +36,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/adb
 BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi
 
@@ -55,7 +52,7 @@ TEST_BUILD_DEPENDS+=	googlemock>=1.6.0:devel/googlemoc
 TEST_ALL_TARGET=	adb_test
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
-TEST_PYTHON_GH_PROJECT=	platform_development:development
+TEST_PYTHON_GH_TUPLE=	aosp-mirror:platform_development:${DISTVERSIONFULL}:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 TEST_PYTHON_USES=	python:2.7,build
 

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Thu Sep 12 14:32:12 2019	(r511884)
+++ head/devel/android-tools-fastboot/Makefile	Thu Sep 12 14:45:56 2019	(r511885)
@@ -16,9 +16,9 @@ LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror jbeich:extras,mkbootimg
-GH_PROJECT=	platform_system_core platform_system_extras:extras \
-		platform_system_tools_mkbootimg:mkbootimg
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
+		jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
+		jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
@@ -42,9 +42,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/fastboot
 BASH_VARS=		LICENSE+=MIT
 

Modified: head/devel/android-tools-simpleperf/Makefile
==============================================================================
--- head/devel/android-tools-simpleperf/Makefile	Thu Sep 12 14:32:12 2019	(r511884)
+++ head/devel/android-tools-simpleperf/Makefile	Thu Sep 12 14:45:56 2019	(r511885)
@@ -14,10 +14,9 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	android:bionic,core jbeich
-GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
-		platform_system_extras
-GH_SUBDIR=	bionic:bionic
+GH_TUPLE=	jbeich:platform_system_extras:${DISTVERSIONFULL} \
+		aosp-mirror:platform_system_core:${DISTVERSIONFULL}:core \
+		aosp-mirror:platform_bionic:${DISTVERSIONFULL}:bionic/bionic
 
 USES=		compiler:c++11-lib ncurses uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf

Modified: head/devel/android-tools-simpleperf/distinfo
==============================================================================
--- head/devel/android-tools-simpleperf/distinfo	Thu Sep 12 14:32:12 2019	(r511884)
+++ head/devel/android-tools-simpleperf/distinfo	Thu Sep 12 14:45:56 2019	(r511885)
@@ -1,7 +1,7 @@
 TIMESTAMP = 1495068953
 SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
 SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
-SHA256 (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
-SIZE (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
-SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
-SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
+SIZE (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909121445.x8CEjuAt069785>