devel/android-tools-{adb,fastboot}: update BASH to 20150902 snapshot

- Switch to the actual upstream on GitHub
- Reduce overuse of :FOO make(1) variable modifiers
- Restore conditional install via target option helper

8 files changed, 34 insertions, 33 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index d87eaa9dccb8..3e8dd721716a 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -3,7 +3,7 @@
 # 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]*
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index 55ecbb9d1d4c..d728a0b82915 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -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
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 419385a7bb18..e890c7cbd7ac 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -3,12 +3,8 @@
 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
@@ -43,14 +39,17 @@ MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 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=""
 
@@ -72,10 +71,10 @@ post-patch:
 			${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
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index f95fc4c8ec2c..44290b73ceb5 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -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
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index 3f33e65e2821..f91e36ca46cf 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -3,7 +3,7 @@
 # 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 \
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index 26501d4727b9..d4119912b591 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -1,5 +1,3 @@
-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
@@ -8,3 +6,5 @@ SHA256 (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz)
 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
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index e9aec4774dbc..68df4329f2ee 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -3,12 +3,11 @@
 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
@@ -44,7 +43,6 @@ MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		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
@@ -52,7 +50,11 @@ 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=""
 
@@ -63,10 +65,10 @@ post-extract:
 	@(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
diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo
index f395a986c52e..d5ac39046b07 100644
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@@ -1,5 +1,3 @@
-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
@@ -8,3 +6,5 @@ SHA256 (jbeich-platform_system_extras-android-6.0.0_r1_GH0.tar.gz) = 84877e2e17a
 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