2 files changed, 16 insertions, 14 deletions

diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index c63e84cdfe82..742a4346dc7a 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -25,13 +25,6 @@ GH_PROJECT=	platform_system_core platform_system_extras:extras \
 GH_TAGNAME?=	android-7.1.2_r17:libselinux
 GH_SUBDIR=	libselinux:libselinux
 
-# Emulate GH_COMMIT without causing desync
-.ifdef DISTVERSIONSUFFIX
-GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
-.else
-GH_REVISION=	86c2b588a369 # generated by: make update-revision
-.endif
-
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
 USES=		compiler:c++11-lib pkgconfig uidfix
@@ -40,7 +33,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
-		FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \
+		FILESDIR="${DOCSDIR}" \
+		VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android" \
 		MANDIR="${PREFIX}/man/man" \
 		LIBPCRE="${LOCALBASE}/lib/libpcre.a"
 PLIST_FILES=	bin/fastboot \
@@ -48,6 +42,10 @@ PLIST_FILES=	bin/fastboot \
 PORTDOCS=	*
 SUB_FILES=	pkg-message
 
+# Generated by "make update-revision" for "fastboot --version"
+SDK_REVISION?=	27.0.0
+GH_REVISION=	${DISTVERSIONSUFFIX:U86c2b588a369:S/-g//}
+
 OPTIONS_DEFINE=	BASH DOCS
 OPTIONS_SUB=	yes
 
@@ -75,13 +73,19 @@ post-install-BASH-on:
 		${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
 
 update-revision:
+	@${REINPLACE_CMD} -i '' -e "/^SDK_REVISION?=/s/=.*/=	$$(\
+		${FETCH_CMD} -qo- \
+			https://github.com/${GH_ACCOUNT}/platform_build/raw/${GH_TAGNAME}/core/version_defaults.mk | \
+			${SED} -n 's/^[[:space:]]*PLATFORM_SDK_VERSION := //p' \
+		).0.0/" \
+		${.CURDIR}/Makefile
 # https://developer.github.com/v3/repos/commits/#get-a-single-commit
 # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1)
-	@${REINPLACE_CMD} -i '' -e "/^GH_REVISION.*$@/s/=.*/=	$$(\
+	@${REINPLACE_CMD} -i '' -e "/^GH_REVISION=/s/:U[^}:]*/:U$$(\
 		${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \
 			https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \
 			${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \
-		) # generated by: make $@/" \
+		)/" \
 		${.CURDIR}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile
index e26240812932..abe2d3ceb38a 100644
--- a/devel/android-tools-fastboot/files/Makefile
+++ b/devel/android-tools-fastboot/files/Makefile
@@ -3,6 +3,7 @@
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
+VERSION?=0.0.0-0
 
 FILES=	*.md
 
@@ -98,9 +99,7 @@ SRCS+=	FileMap.cpp
 .PATH:	${.CURDIR}/../libziparchive
 SRCS+=	zip_archive.cc
 
-REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
-
-CPPFLAGS+=	-DFASTBOOT_VERSION="\"27.0.0-0 ${REVISION}-android\""
+CPPFLAGS+=	-DFASTBOOT_VERSION="\"${VERSION}\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
@@ -133,7 +132,6 @@ LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz \-lpthread
 DPADD+=	${LIBPCRE} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
-GIT?=		git
 PKG_CONFIG?=	pkg-config
 
 beforeinstall: