svn commit: r488821 - in head/devel/android-tools-adb: . files

[Jan Beich]

Author: jbeich
Date: Mon Dec 31 19:02:47 2018
New Revision: 488821
URL: https://svnweb.freebsd.org/changeset/ports/488821

Log:
  devel/android-tools-adb: move SDK_VERSION into vendor Makefile
  
  During major updates SDK version indirectly reflects changed files.

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

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Mon Dec 31 19:01:09 2018	(r488820)
+++ head/devel/android-tools-adb/Makefile	Mon Dec 31 19:02:47 2018	(r488821)
@@ -24,14 +24,13 @@ TEST_WRKSRC=	${BUILD_WRKSRC}
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \
-		VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android"
+		VEREXT="${GH_REVISION}-android"
 ALL_TARGET=	all
 TEST_TARGET=	test
 PLIST_FILES=	bin/adb
 PORTDOCS=	*
 
 # Generated by "make update-revision" for "adb --version"
-SDK_REVISION?=	28.0.0
 GH_REVISION=	${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//}
 
 OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON
@@ -85,12 +84,12 @@ post-install-BASH-on:
 		${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
 
 update-revision:
-	@${REINPLACE_CMD} -i '' -e "/^SDK_REVISION?=/s/=.*/=	$$(\
+	@${REINPLACE_CMD} -i '' -e "/^VERSION?=/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
+		).0.0-0 \$${VEREXT}/" \
+		${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/:U[^}:]*/:U$$(\

Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile	Mon Dec 31 19:01:09 2018	(r488820)
+++ head/devel/android-tools-adb/files/Makefile	Mon Dec 31 19:02:47 2018	(r488821)
@@ -5,7 +5,7 @@ NOMAN= # DragonFly, NetBSD, OpenBSD
 NO_MAN= # FreeBSD
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
-VERSION?= 0.0.0-0
+VERSION?=	28.0.0-0 ${VEREXT}
 
 FILES= *.[Tt][Xx][Tt]