From 6b321a06d6a559e0bac800c897d1ba4587b22708 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 31 Dec 2018 19:02:47 +0000 Subject: devel/android-tools-adb: move SDK_VERSION into vendor Makefile During major updates SDK version indirectly reflects changed files. --- devel/android-tools-adb/Makefile | 9 ++++----- devel/android-tools-adb/files/Makefile | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'devel/android-tools-adb') diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index b0be9b9ad2c3..5dbf51d7797a 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -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$$(\ diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile index 33cfec36ed26..1e60f6f15a62 100644 --- a/devel/android-tools-adb/files/Makefile +++ b/devel/android-tools-adb/files/Makefile @@ -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] -- cgit v1.2.3