Index: branches/2017Q2/devel/android-tools-adb/Makefile =================================================================== --- branches/2017Q2/devel/android-tools-adb/Makefile (revision 443572) +++ branches/2017Q2/devel/android-tools-adb/Makefile (revision 443573) @@ -1,98 +1,98 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- -DISTVERSION?= 7.1.1_r4 -PORTREVISION?= 1 +DISTVERSION?= 7.1.2_r17 +PORTREVISION?= 0 CATEGORIES= devel comms .ifndef EXTRA_PATCHES PATCH_SITES= https://github.com/android/platform_system_core/commit/ PATCHFILES= b4cff495a1f9.patch:-p1 .endif 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= 5cf8bbd5b29d # generated by: make update-revision +GH_REVISION= 1346a4012db4 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* .ifndef EXTRA_PATCHES EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-adb_sysdeps_mutex.h EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp .endif USES= compiler:c++11-lib pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 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= c1b0656: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+= googlemock>=1.6.0:devel/googlemock \ googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test post-patch: # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ ${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: branches/2017Q2/devel/android-tools-adb/distinfo =================================================================== --- branches/2017Q2/devel/android-tools-adb/distinfo (revision 443572) +++ branches/2017Q2/devel/android-tools-adb/distinfo (revision 443573) @@ -1,7 +1,7 @@ -TIMESTAMP = 1477379212 -SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc -SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590 +TIMESTAMP = 1495068953 +SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449 +SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50 SIZE (b4cff495a1f9.patch) = 2066 Index: branches/2017Q2/devel/android-tools-fastboot/Makefile =================================================================== --- branches/2017Q2/devel/android-tools-fastboot/Makefile (revision 443572) +++ branches/2017Q2/devel/android-tools-fastboot/Makefile (revision 443573) @@ -1,94 +1,94 @@ # $FreeBSD$ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- -DISTVERSION?= 7.1.1_r4 -PORTREVISION?= 1 +DISTVERSION?= 7.1.2_r17 +PORTREVISION?= 0 CATEGORIES= devel sysutils MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage DISTFILES= fastboot.1?id=706e754:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool LICENSE= APACHE20 BSD2CLAUSE PD LICENSE_COMB= multi LICENSE_FILE_PD= ${WRKSRC}/libselinux/NOTICE LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes GH_ACCOUNT= android jbeich:extras,libselinux GH_PROJECT= platform_system_core platform_system_extras:extras \ platform_external_libselinux:libselinux GH_SUBDIR= libselinux:libselinux # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else -GH_REVISION= 5cf8bbd5b29d # generated by: make update-revision +GH_REVISION= 1346a4012db4 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* .ifndef EXTRA_PATCHES EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp .endif USES= compiler:c++11-lib pkgconfig uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${.CURDIR}/files/Makefile # XXX ?= when bmake-only MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \ MANDIR="${PREFIX}/man/man" \ LIBPCRE="${LOCALBASE}/lib/libpcre.a" PLIST_FILES= bin/fastboot \ man/man1/fastboot.1.gz PORTDOCS= * SUB_FILES= pkg-message OPTIONS_DEFINE= BASH DOCS 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= c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/fastboot BASH_VARS= LICENSE+=MIT DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" post-extract: @${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \ ${BUILD_WRKSRC}/${DISTFILES:M*\:manpage:C/\?.*//} # Adjust paths relative to core @(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC}) 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: branches/2017Q2/devel/android-tools-fastboot/distinfo =================================================================== --- branches/2017Q2/devel/android-tools-fastboot/distinfo (revision 443572) +++ branches/2017Q2/devel/android-tools-fastboot/distinfo (revision 443573) @@ -1,11 +1,11 @@ -TIMESTAMP = 1477379212 +TIMESTAMP = 1495068953 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc -SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590 -SHA256 (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 72c758f5f4fe69b5f4e2f46ceb78ca7240e2968bea63505c45158b6ef56bc09f -SIZE (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 79624857 -SHA256 (jbeich-platform_external_libselinux-android-7.1.1_r4_GH0.tar.gz) = 7d79b146e4355d721c14a2712868fa9af9eb991c194e0b6452d4c121300aca62 -SIZE (jbeich-platform_external_libselinux-android-7.1.1_r4_GH0.tar.gz) = 59766 +SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449 +SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372 +SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42 +SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709 +SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7 +SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 Index: branches/2017Q2/devel/android-tools-simpleperf/Makefile =================================================================== --- branches/2017Q2/devel/android-tools-simpleperf/Makefile (revision 443572) +++ branches/2017Q2/devel/android-tools-simpleperf/Makefile (revision 443573) @@ -1,46 +1,45 @@ # $FreeBSD$ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- -DISTVERSION= 7.1.1_r4 -PORTREVISION= 1 +DISTVERSION= 7.1.2_r17 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android simpleperf tool LICENSE= APACHE20 BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} USE_GITHUB= yes GH_ACCOUNT= android:bionic,core jbeich GH_PROJECT= platform_bionic:bionic platform_system_core:core \ platform_system_extras GH_SUBDIR= bionic:bionic USES= compiler:c++11-lib ncurses uidfix BUILD_WRKSRC= ${WRKSRC}/simpleperf INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}" ALL_TARGET= all TEST_TARGET= test LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps) PLIST_FILES= bin/simpleperf LLVM_VER?= 38 # XXX Move to DEFAULT_VERSIONS OPTIONS_DEFINE= TEST TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= simpleperf_test post-extract: # Adjust paths relative to extras @(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC}) pre-install-TEST-on: do-test .include Index: branches/2017Q2/devel/android-tools-simpleperf/distinfo =================================================================== --- branches/2017Q2/devel/android-tools-simpleperf/distinfo (revision 443572) +++ branches/2017Q2/devel/android-tools-simpleperf/distinfo (revision 443573) @@ -1,7 +1,7 @@ -TIMESTAMP = 1477379212 -SHA256 (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 72c758f5f4fe69b5f4e2f46ceb78ca7240e2968bea63505c45158b6ef56bc09f -SIZE (jbeich-platform_system_extras-android-7.1.1_r4_GH0.tar.gz) = 79624857 -SHA256 (android-platform_bionic-android-7.1.1_r4_GH0.tar.gz) = 5df4a9d8fcc5653a55fedaa43baba0ba2cf23aa8e7936ea39f382d96adf7954f -SIZE (android-platform_bionic-android-7.1.1_r4_GH0.tar.gz) = 3515656 -SHA256 (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 7ee986fcc6d5856bee645855f36ea00f57336914f1307a51eedebb59ee6035fc -SIZE (android-platform_system_core-android-7.1.1_r4_GH0.tar.gz) = 1591590 +TIMESTAMP = 1495068953 +SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42 +SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709 +SHA256 (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a +SIZE (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577 +SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449 +SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372 Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 443572) +++ branches/2017Q2 (revision 443573) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r443543