Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 400114) +++ head/devel/android-tools-adb/Makefile (revision 400115) @@ -1,95 +1,94 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- DISTVERSION?= 6.0.0_r1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel -MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - bash_completion.d/adb?id=2b8cfec:bashcomp -EXTRACT_ONLY= ${DISTFILES:N*\:bashcomp:C/:.*//} 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= bb0c180e6270 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* .ifndef EXTRA_PATCHES EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file__test.cpp .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 \ - %%BASH%%etc/bash_completion.d/adb +PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=BASH DOCS TEST OPTIONS_SUB= yes -BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi # debian/copyright +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:${PORTSDIR}/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_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H} - ${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \ - ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//} +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/distinfo =================================================================== --- head/devel/android-tools-adb/distinfo (revision 400114) +++ head/devel/android-tools-adb/distinfo (revision 400115) @@ -1,4 +1,4 @@ SHA256 (android-platform_system_core-android-6.0.0_r1_GH0.tar.gz) = 3027e73c8f23d8348c76bc558987ecd10c07ed7c89b60a2a76be9e0ef7c84dd5 SIZE (android-platform_system_core-android-6.0.0_r1_GH0.tar.gz) = 1186291 -SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7 -SIZE (bash_completion.d/adb?id=2b8cfec) = 5198 +SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc +SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 Index: head/devel/android-tools-adb-devel/Makefile =================================================================== --- head/devel/android-tools-adb-devel/Makefile (revision 400114) +++ head/devel/android-tools-adb-devel/Makefile (revision 400115) @@ -1,34 +1,34 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-m-preview DISTVERSION= m-preview-4374 DISTVERSIONSUFFIX= -gf83766079e24 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-adb DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${.CURDIR}/files EXTRA_PATCHES= ${.CURDIR}/files/patch-* OPTIONS_DEFINE= TEST_PYTHON TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development TEST_PYTHON_GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-2091-g6d49ceb:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock TEST_PYTHON_USES= python:2.7,build pre-install-TEST_PYTHON-on: # XXX python tests may leave behind running adb server # test_adb.py remains in core repository for some reason ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} ${WRKSRC_development}/python-packages/adb/test_device.py .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-adb-devel/distinfo =================================================================== --- head/devel/android-tools-adb-devel/distinfo (revision 400114) +++ head/devel/android-tools-adb-devel/distinfo (revision 400115) @@ -1,6 +1,6 @@ -SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7 -SIZE (bash_completion.d/adb?id=2b8cfec) = 5198 SHA256 (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 099ad3bfb625a52665562291bd822955695046e4c5d68b7f6d5fd39e265a1efd SIZE (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 1365538 +SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc +SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 SHA256 (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = ea74221301367e0f8788cfca585a015c930aa98a5fded23caaed762bafcd3a2f SIZE (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = 126184363 Index: head/devel/android-tools-fastboot/Makefile =================================================================== --- head/devel/android-tools-fastboot/Makefile (revision 400114) +++ head/devel/android-tools-fastboot/Makefile (revision 400115) @@ -1,86 +1,88 @@ # $FreeBSD$ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- DISTVERSION?= 6.0.0_r1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel -MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage -DISTFILES= bash_completion.d/fastboot?id=2b8cfec:bashcomp \ - fastboot.1?id=706e754:manpage -EXTRACT_ONLY= ${DISTFILES:N*\:bashcomp:N*\:manpage:C/:.*//} +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 PUBLIC_DOMAIN LICENSE_COMB= multi LICENSE_NAME_PUBLIC_DOMAIN= Public Domain LICENSE_FILE_PUBLIC_DOMAIN= ${WRKSRC}/libselinux/NOTICE LICENSE_PERMS_PUBLIC_DOMAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre USE_GITHUB= yes GH_ACCOUNT= android jbeich:extras,libselinux GH_PROJECT= platform_system_core platform_system_extras:extras \ platform_external_libselinux:libselinux # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= bb0c180e6270 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* 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 \ - %%BASH%%etc/bash_completion.d/fastboot \ man/man1/fastboot.1.gz PORTDOCS= * SUB_FILES= pkg-message OPTIONS_DEFINE= BASH DOCS OPTIONS_SUB= yes -BASH_VARS= LICENSE+=MIT # debian/copyright +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 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}) @${MV} ${WRKSRC_libselinux} ${WRKSRC}/libselinux -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H} - ${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \ - ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//} +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-fastboot/distinfo =================================================================== --- head/devel/android-tools-fastboot/distinfo (revision 400114) +++ head/devel/android-tools-fastboot/distinfo (revision 400115) @@ -1,10 +1,10 @@ -SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1e5518cf066a04479f61e5ebf3761d4bc4 -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-6.0.0_r1_GH0.tar.gz) = 3027e73c8f23d8348c76bc558987ecd10c07ed7c89b60a2a76be9e0ef7c84dd5 SIZE (android-platform_system_core-android-6.0.0_r1_GH0.tar.gz) = 1186291 SHA256 (jbeich-platform_system_extras-android-6.0.0_r1_GH0.tar.gz) = 84877e2e17a57a2832b6992073691124ad817b013132594313f3e74f8c32aa39 SIZE (jbeich-platform_system_extras-android-6.0.0_r1_GH0.tar.gz) = 650275 SHA256 (jbeich-platform_external_libselinux-android-6.0.0_r1_GH0.tar.gz) = ed9ad172dd78591d4f0400c092d8151154a75cc244b6c53ccbb3ae0b165322e4 SIZE (jbeich-platform_external_libselinux-android-6.0.0_r1_GH0.tar.gz) = 50961 +SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc +SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 Index: head/devel/android-tools-fastboot-devel/Makefile =================================================================== --- head/devel/android-tools-fastboot-devel/Makefile (revision 400114) +++ head/devel/android-tools-fastboot-devel/Makefile (revision 400115) @@ -1,17 +1,17 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-m-preview DISTVERSION= m-preview-1212 DISTVERSIONSUFFIX= -g94c617ccbba4 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -devel GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-195-g7434d1f:extras \ ${DISTVERSIONFULL:C/-[0-9].*//}-19-g249094f:libselinux CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-fastboot DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-fastboot-devel/distinfo =================================================================== --- head/devel/android-tools-fastboot-devel/distinfo (revision 400114) +++ head/devel/android-tools-fastboot-devel/distinfo (revision 400115) @@ -1,10 +1,10 @@ -SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1e5518cf066a04479f61e5ebf3761d4bc4 -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-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686 SHA256 (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = b08cf354cc0e920df937356d8fb024dfae660c2a8fee549c833199e033cb163c SIZE (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = 76441782 SHA256 (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 3539bdbe4444e0b84da7f0ef1d0ab9d46cc6af537062c1016a6400bd09397d41 SIZE (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 58632 +SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc +SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948