Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 511884) +++ head/devel/android-tools-adb/Makefile (revision 511885) @@ -1,85 +1,82 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= platform-tools- DISTVERSION?= 29.0.3 PORTREVISION?= 0 CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes -GH_ACCOUNT= aosp-mirror -GH_PROJECT= platform_system_core +GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON OPTIONS_DEFAULT=MDNSRESPONDER 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_GH_TUPLE= mbrubeck:android-completion:c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_USES= localbase:ldflags MDNSRESPONDER_LDFLAGS= -ldns_sd MDNSRESPONDER_MAKE_ENV_OFF= MDNSEXT=_unsupported TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \ googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} -TEST_PYTHON_GH_PROJECT= platform_development:development +TEST_PYTHON_GH_TUPLE= aosp-mirror:platform_development:${DISTVERSIONFULL}:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} TEST_PYTHON_USES= python:2.7,build 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 # XXX getcwd fails and not connected upstream @${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \ ${WRKSRC}/adb/bugreport_test.cpp pre-install-TEST-on: do-test 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} post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} .include Index: head/devel/android-tools-fastboot/Makefile =================================================================== --- head/devel/android-tools-fastboot/Makefile (revision 511884) +++ head/devel/android-tools-fastboot/Makefile (revision 511885) @@ -1,65 +1,63 @@ # $FreeBSD$ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= platform-tools- DISTVERSION?= 29.0.3 PORTREVISION?= 0 CATEGORIES= devel sysutils MASTER_SITES= https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage DISTFILES= fastboot.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool LICENSE= APACHE20 BSD2CLAUSE LICENSE_COMB= multi USE_GITHUB= yes -GH_ACCOUNT= aosp-mirror jbeich:extras,mkbootimg -GH_PROJECT= platform_system_core platform_system_extras:extras \ - platform_system_tools_mkbootimg:mkbootimg +GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} \ + jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \ + jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" \ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" \ MANDIR="${PREFIX}/man/man" 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_GH_TUPLE= mbrubeck:android-completion: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} # Adjust paths relative to core @(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC}) @(cd ${WRKSRC_mkbootimg} && ${COPYTREE_SHARE} . ${WRKSRC}) post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} .include Index: head/devel/android-tools-simpleperf/Makefile =================================================================== --- head/devel/android-tools-simpleperf/Makefile (revision 511884) +++ head/devel/android-tools-simpleperf/Makefile (revision 511885) @@ -1,44 +1,43 @@ # $FreeBSD$ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- DISTVERSION= 7.1.2_r17 PORTREVISION= 8 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android simpleperf tool LICENSE= APACHE20 BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} 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 +GH_TUPLE= jbeich:platform_system_extras:${DISTVERSIONFULL} \ + aosp-mirror:platform_system_core:${DISTVERSIONFULL}:core \ + aosp-mirror:platform_bionic:${DISTVERSIONFULL}: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_DEFAULT}" ALL_TARGET= all TEST_TARGET= test LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps) PLIST_FILES= bin/simpleperf 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: head/devel/android-tools-simpleperf/distinfo =================================================================== --- head/devel/android-tools-simpleperf/distinfo (revision 511884) +++ head/devel/android-tools-simpleperf/distinfo (revision 511885) @@ -1,7 +1,7 @@ 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 +SHA256 (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449 +SIZE (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372 +SHA256 (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a +SIZE (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577