devel/android-tools-*: macrofy GH_TAGNAME for extra distfiles

In order to avoid typo-casualties like android-tools-adb-devel.

4 files changed, 12 insertions, 8 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 1270422..73d288d 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -13,11 +13,13 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
+GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
+
 OPTIONS_DEFINE=	TEST_PYTHON
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development
-TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-81-g782e50b09923:development
+TEST_PYTHON_GH_TAGNAME=	${GH_MYTAG}-81-g782e50b09923:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 TEST_PYTHON_USES=	python:2.7,build
 
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index 984b04c..e50d964 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -2,5 +2,5 @@ SHA256 (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.t
 SIZE (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 1536079
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
-SHA256 (android-platform_development-android-n-preview-81-g782e50b09923_GH0.tar.gz) = e6a996aa7dc0fa11c3c6dea2ec875f02f655dfcc9f0b7e0bcff0a580425f8764
-SIZE (android-platform_development-android-n-preview-81-g782e50b09923_GH0.tar.gz) = 167774064
+SHA256 (android-platform_development-android-n-preview-1-81-g782e50b09923_GH0.tar.gz) = 8dda5fadfa5919f4c1346f2343d553ddcfc55fcb385586407ec49bbb6972521f
+SIZE (android-platform_development-android-n-preview-1-81-g782e50b09923_GH0.tar.gz) = 167771145
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index a7c9651..834c2f4 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -6,8 +6,9 @@ DISTVERSIONSUFFIX=	-g0fc006685c20
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-1197-g21ac023:extras \
-		${DISTVERSIONFULL:C/-[0-9].*//}-98-gde7b594:libselinux
+GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
+GH_TAGNAME=	${GH_MYTAG}-1197-g21ac023:extras \
+		${GH_MYTAG}-98-gde7b594:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile
index c08a57c..6859243 100644
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@@ -19,9 +19,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	android:bionic,core jbeich:DEFAULT,lzma
 GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
 		platform_system_extras platform_external_lzma:lzma
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-249-g5f1de52:bionic \
-		${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-554-g371e7ea170d7:core \
-		${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-6-ge43f249:lzma
+GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
+GH_TAGNAME=	${GH_MYTAG}-249-g5f1de52:bionic \
+		${GH_MYTAG}-554-g371e7ea170d7:core \
+		${GH_MYTAG}-6-ge43f249:lzma
 
 USES=		compiler:c++11-lib uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf