Index: head/devel/android-tools-adb-devel/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/Makefile	(revision 411610)
+++ head/devel/android-tools-adb-devel/Makefile	(revision 411611)
@@ -1,30 +1,32 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-n-preview-1
 DISTVERSION=	n-preview-1-554
 DISTVERSIONSUFFIX=	-g371e7ea170d7
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 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
 
 pre-install-TEST_PYTHON-on:
 # XXX python tests may leave behind running adb server
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC}
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-adb-devel/distinfo
===================================================================
--- head/devel/android-tools-adb-devel/distinfo	(revision 411610)
+++ head/devel/android-tools-adb-devel/distinfo	(revision 411611)
@@ -1,6 +1,6 @@
 SHA256 (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 6672ae5e1088335f2f721b357f178163c19259abe38a8b307ebb0c8b37b291cb
 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
Index: head/devel/android-tools-fastboot-devel/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/Makefile	(revision 411610)
+++ head/devel/android-tools-fastboot-devel/Makefile	(revision 411611)
@@ -1,19 +1,20 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
 DISTVERSION=	m-preview-6425
 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]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-simpleperf/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/Makefile	(revision 411610)
+++ head/devel/android-tools-simpleperf/Makefile	(revision 411611)
@@ -1,60 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	n-preview-1-116
 DISTVERSIONSUFFIX=	-gea4a5a4
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android simpleperf tool
 
 LICENSE=	APACHE20 PD
 LICENSE_COMB=	multi
 LICENSE_FILE_PD=	${WRKSRC}/lzma/NOTICE
 
 BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 
 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
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}"
 ALL_TARGET=	all
 TEST_TARGET=	test
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (llvm deps)
 PLIST_FILES=	bin/simpleperf
 
 LLVM_VER?=	38 # XXX Move to DEFAULT_VERSIONS
 
 OPTIONS_DEFINE=	TEST
 
 TEST_BUILD_DEPENDS=	googletest>=1.6.0:devel/googletest
 TEST_ALL_TARGET=	simpleperf_test
 
 post-extract:
 # Adjust paths relative to extras
 	@(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC})
 	@${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic
 	@${MV} ${WRKSRC_lzma} ${WRKSRC}/lzma
 
 post-patch:
 # XXX C++ exception with description "regex_error" thrown in the test body.
 	@if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \
 		${REINPLACE_CMD} -Ee '/^TEST/\
 			s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \
 		${WRKSRC}/base/logging_test.cpp; \
 	fi
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>