Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 413757) +++ head/devel/android-tools-adb/Makefile (revision 413758) @@ -1,100 +1,100 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- DISTVERSION?= 6.0.1_r24 PORTREVISION?= 0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= android GH_PROJECT= platform_system_core # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= 2a288d0f331c # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* .ifndef EXTRA_PATCHES EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_include_base_logging.h EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file__test.cpp EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-liblog_logd__write.c .endif USES= compiler:c++11-lib uidfix USE_OPENSSL= yes BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=BASH DOCS TEST OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_ACCOUNT= mbrubeck:bashcomp BASH_GH_PROJECT= android-completion:bashcomp BASH_GH_TAGNAME= 3b0fabe:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test post-patch: # XXX C++ exception with description "regex_error" thrown in the test body. @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ ${REINPLACE_CMD} -Ee '/^TEST/\ s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ ${WRKSRC}/base/logging_test.cpp; \ fi # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ - ${REINPLACE_CMD} -e '/^TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ + ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} update-revision: # 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/=.*/= $$(\ ${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 # XXX Work around !target(makesum) .ifndef DISTVERSIONSUFFIX makesum: update-revision .endif Index: head/devel/android-tools-adb-devel/Makefile =================================================================== --- head/devel/android-tools-adb-devel/Makefile (revision 413757) +++ head/devel/android-tools-adb-devel/Makefile (revision 413758) @@ -1,32 +1,32 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-n-preview-2 -DISTVERSION= n-preview-2-45 -DISTVERSIONSUFFIX= -g643bc369ef8d +DISTVERSION= n-preview-2-74 +DISTVERSIONSUFFIX= -gd61bfb9a79e3 PORTREVISION= 0 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-adb DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${.CURDIR}/files EXTRA_PATCHES= ${.CURDIR}/files/patch-* GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} OPTIONS_DEFINE= TEST_PYTHON TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-7-gd66a831ffc05:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock TEST_PYTHON_USES= python:2.7,build pre-install-TEST_PYTHON-on: # XXX python tests may leave behind running adb server ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC} .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-adb-devel/distinfo =================================================================== --- head/devel/android-tools-adb-devel/distinfo (revision 413757) +++ head/devel/android-tools-adb-devel/distinfo (revision 413758) @@ -1,6 +1,6 @@ -SHA256 (android-platform_system_core-android-n-preview-2-45-g643bc369ef8d_GH0.tar.gz) = 03c3d7895ee24f8be00ddf38d69582ae8ed1314e1b5767b0c15c6a1e6cc3a525 -SIZE (android-platform_system_core-android-n-preview-2-45-g643bc369ef8d_GH0.tar.gz) = 1515393 +SHA256 (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 2e8d7d19a888805a12cd20b035ca1b6d10c721cc4e2bcb029ebd3d9801ae9664 +SIZE (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 1514832 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 SHA256 (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = d17c1ac1ea597f897b9768104e3dac86922ba3a6edabddfbde3858dc75c7de93 SIZE (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = 167896858 Index: head/devel/android-tools-adb-devel/files/patch-adb_transport.cpp =================================================================== --- head/devel/android-tools-adb-devel/files/patch-adb_transport.cpp (revision 413757) +++ head/devel/android-tools-adb-devel/files/patch-adb_transport.cpp (nonexistent) @@ -1,26 +0,0 @@ -[----------] 9 tests from transport -[ RUN ] transport.kick_transport -transport_test.cpp:97: Failure -Value of: t.fd - Actual: -1 -Expected: 42 -[ FAILED ] transport.kick_transport (42 ms) -[ RUN ] transport.kick_transport_already_kicked -[ OK ] transport.kick_transport_already_kicked (1 ms) - ---- adb/transport.cpp.orig 2016-04-16 01:50:54 UTC -+++ adb/transport.cpp -@@ -307,9 +307,13 @@ void kick_transport(atransport* t) { - adb_mutex_lock(&transport_lock); - // As kick_transport() can be called from threads without guarantee that t is valid, - // check if the transport is in transport_list first. -+#ifdef __GLIBC__ - if (std::find(transport_list.begin(), transport_list.end(), t) != transport_list.end()) { -+#endif - kick_transport_locked(t); -+#ifdef __GLIBC__ - } -+#endif - adb_mutex_unlock(&transport_lock); - } - Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_transport.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property