From owner-svn-ports-all@freebsd.org Fri Sep 18 15:43:34 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FAD59CF8C0; Fri, 18 Sep 2015 15:43:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53BE419E3; Fri, 18 Sep 2015 15:43:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IFhY1T024301; Fri, 18 Sep 2015 15:43:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IFhX6T024293; Fri, 18 Sep 2015 15:43:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509181543.t8IFhX6T024293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 18 Sep 2015 15:43:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397254 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-fastboot-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2015 15:43:34 -0000 Author: jbeich Date: Fri Sep 18 15:43:32 2015 New Revision: 397254 URL: https://svnweb.freebsd.org/changeset/ports/397254 Log: devel/android-tools-adb-devel: make revision match upstream ====================================================================== FAIL: test_version (__main__.NonApiTest) Get a version number out of the output of adb. ---------------------------------------------------------------------- Traceback (most recent call last): File "test_adb.py", line 53, in test_version revision_line, r'^Revision [0-9a-f]{12}-android$') AssertionError: Regexp didn't match: '^Revision [0-9a-f]{12}-android$' not found in 'Revision android-m-preview-1112-ge4c1bb5' Added: head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile (contents, props changed) head/devel/android-tools-adb-devel/distinfo (contents, props changed) head/devel/android-tools-fastboot-devel/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/distinfo (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/Makefile Fri Sep 18 15:43:13 2015 (r397253) +++ head/devel/android-tools-adb-devel/Makefile Fri Sep 18 15:43:32 2015 (r397254) @@ -1,8 +1,8 @@ # $FreeBSD$ DISTVERSION= m-preview-1112 -DISTVERSIONSUFFIX= -ge4c1bb5 -PORTREVISION= 0 +DISTVERSIONSUFFIX= -ge4c1bb53068d +PORTREVISION= 1 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* @@ -17,7 +17,7 @@ USES= compiler:c++11-lib BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV= FILESDIR="${FILESDIR}" -CFLAGS+= -DADB_REVISION='\"${DISTVERSIONFULL}\"' +CFLAGS+= -DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"' ALL_TARGET= all OPTIONS_DEFINE= TEST Modified: head/devel/android-tools-adb-devel/distinfo ============================================================================== --- head/devel/android-tools-adb-devel/distinfo Fri Sep 18 15:43:13 2015 (r397253) +++ head/devel/android-tools-adb-devel/distinfo Fri Sep 18 15:43:32 2015 (r397254) @@ -1,4 +1,4 @@ -SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 3fafd204d1ccf075fc5772937ef6e82f14d359f6ae4a9dbf9541e70314283fee -SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 1342470 +SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 15a0a0c047d5ac809de36d1498234aaca8b64d3dc36bd623ed4fa24832b5b0e9 +SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 1342456 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198 Added: head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp Fri Sep 18 15:43:32 2015 (r397254) @@ -0,0 +1,10 @@ +--- adb/fdevent_test.cpp.orig 2015-09-05 00:01:27 UTC ++++ adb/fdevent_test.cpp +@@ -18,6 +18,7 @@ + + #include + ++#include // std::unique_ptr + #include + #include + #include Modified: head/devel/android-tools-fastboot-devel/Makefile ============================================================================== --- head/devel/android-tools-fastboot-devel/Makefile Fri Sep 18 15:43:13 2015 (r397253) +++ head/devel/android-tools-fastboot-devel/Makefile Fri Sep 18 15:43:32 2015 (r397254) @@ -1,8 +1,8 @@ # $FreeBSD$ DISTVERSION= m-preview-1112 -DISTVERSIONSUFFIX= -ge4c1bb5 -PORTREVISION= 0 +DISTVERSIONSUFFIX= -ge4c1bb53068d +PORTREVISION= 1 PKGNAMESUFFIX= -devel GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-170-ga0370d7:extras \ @@ -16,6 +16,6 @@ FILESDIR= ${.CURDIR}/files EXTRA_PATCHES+= ${.CURDIR}/files/patch-* USES= compiler:c++11-lib -CFLAGS+= -DFASTBOOT_REVISION='\"${DISTVERSIONFULL}\"' +CFLAGS+= -DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"' .include "${MASTERDIR}/Makefile" Modified: head/devel/android-tools-fastboot-devel/distinfo ============================================================================== --- head/devel/android-tools-fastboot-devel/distinfo Fri Sep 18 15:43:13 2015 (r397253) +++ head/devel/android-tools-fastboot-devel/distinfo Fri Sep 18 15:43:32 2015 (r397254) @@ -2,8 +2,8 @@ SHA256 (bash_completion.d/fastboot?id=2b SIZE (bash_completion.d/fastboot?id=2b8cfec) = 3051 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 3fafd204d1ccf075fc5772937ef6e82f14d359f6ae4a9dbf9541e70314283fee -SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 1342470 +SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 15a0a0c047d5ac809de36d1498234aaca8b64d3dc36bd623ed4fa24832b5b0e9 +SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 1342456 SHA256 (jbeich-platform_system_extras-android-m-preview-170-ga0370d7_GH0.tar.gz) = 8207f52b16340dc14b5caa967683131af1edb7d602454bf7dc51cefd270d7da1 SIZE (jbeich-platform_system_extras-android-m-preview-170-ga0370d7_GH0.tar.gz) = 675090 SHA256 (jbeich-platform_external_libselinux-android-m-preview-18-g91b7d91_GH0.tar.gz) = 92e7867376f77d6d2699764685b36475e14a2de58ccd25fa0c5dc31d6525846d