From owner-svn-ports-head@freebsd.org Mon Dec 31 19:02:48 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62641143D364; Mon, 31 Dec 2018 19:02:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0991480CF5; Mon, 31 Dec 2018 19:02:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F28E0ECBD; Mon, 31 Dec 2018 19:02:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVJ2lMD034160; Mon, 31 Dec 2018 19:02:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVJ2lms034159; Mon, 31 Dec 2018 19:02:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812311902.wBVJ2lms034159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 31 Dec 2018 19:02:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488821 - in head/devel/android-tools-adb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/android-tools-adb: . files X-SVN-Commit-Revision: 488821 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0991480CF5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2018 19:02:48 -0000 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]