4 files changed, 41 insertions, 38 deletions

diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index d9219a83a919..972e19d30afb 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	bash-completion
-PORTVERSION=	2.5
+PORTVERSION=	2.7
 PORTEPOCH=	1
 CATEGORIES=	shells
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Programmable completion library for Bash
 
 LICENSE=	GPLv2+
@@ -14,43 +14,40 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash
 
-BROKEN_armv6=		fails to build: gmake: install-recursive: Error 1
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	scop
+OPTIONS_DEFINE=	CMAKE_MODULES DOCS
+OPTIONS_DEFAULT=CMAKE_MODULES
+OPTIONS_SUB=	yes
+CMAKE_MODULES_DESC=	Install bash-completion modules for cmake
 
-USES=		autoreconf gmake pathfix
-GNU_CONFIGURE=	yes
 NO_ARCH=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake pathfix
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RUNFILE=${DATADIR}/bash_completion.sh
 
-OPTIONS_DEFINE=	CMAKE_MODULES DOCS
-OPTIONS_DEFAULT=CMAKE_MODULES
-CMAKE_MODULES_DESC=	Install bash-completion modules for cmake
-OPTIONS_SUB=	yes
+GH_ACCOUNT=	scop
+USE_GITHUB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^profiledir =/s|(sysconfdir)/profile.d|(prefix)/share/bash-completion|; \
-		s|\((datadir)/cmake\)|\1/Modules|' \
-		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} \
+		-e '/^profiledir =/ s|(sysconfdir)/profile.d|(prefix)/share/bash-completion|' \
+		-e 's|\((datadir)/cmake\)|\1/Modules|' \
+			${WRKSRC}/Makefile.am
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
-		s|/usr\(/sbin/postconf\)|${PREFIX}\1|g; \
-		s|/var\(/lib/rpm/macros\)|${PREFIX}\1|g; \
-		s|\(/etc/ssl/openssl.cnf\)|${PREFIX}\1 \1|g; \
-		s|/usr/ports|${PORTSDIR}|g; \
-		s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \
-		s|/usr/share/info|&:${PREFIX}/info|g;' \
-		${WRKSRC}/completions/*
+	@${REINPLACE_CMD} \
+		-e 's|/etc/ssl/openssl.cnf|${PREFIX}& &|g' \
+		-e 's|/usr/lib\(/aspell\)|${PREFIX}/share\1|g' \
+		-e 's|/usr/local|${PREFIX}|g' \
+		-e 's|/usr/ports|${PORTSDIR}|g' \
+		-e 's|/usr\(/sbin/postconf\)|${PREFIX}\1|g' \
+		-e 's|/usr/share/info|&:${PREFIX}/info|g' \
+		-e 's|/var\(/lib/rpm/macros\)|${PREFIX}\1|g' \
+			${WRKSRC}/completions/*
 
 post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in CHANGES README.md doc/bash_completion.txt doc/bashrc doc/inputrc
-	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
-.endfor
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README.md doc/bash_completion.txt doc/bashrc doc/inputrc ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
index ef2ca55079f5..59bee271bfc5 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486291046
-SHA256 (scop-bash-completion-2.5_GH0.tar.gz) = c43b54ca3ae8d7228e5d871d5900398924d6853e0999adf155f876d5cb86253b
-SIZE (scop-bash-completion-2.5_GH0.tar.gz) = 310993
+TIMESTAMP = 1498971632
+SHA256 (scop-bash-completion-2.7_GH0.tar.gz) = dba2b88c363178622b61258f35d82df64dc8d279359f599e3b93eac0375a416c
+SIZE (scop-bash-completion-2.7_GH0.tar.gz) = 317925
diff --git a/shells/bash-completion/pkg-descr b/shells/bash-completion/pkg-descr
index 3c4886bcb6bf..50b35e9ec059 100644
--- a/shells/bash-completion/pkg-descr
+++ b/shells/bash-completion/pkg-descr
@@ -1,5 +1,4 @@
-This is a programmable completion convenience library for the bash(1)
-shell. It features the ability to tab-complete arguments for many common
-programs.
+This is a programmable completion convenience library for the bash(1) shell. It
+features the ability to tab-complete arguments for many common programs.
 
 WWW: https://github.com/scop/bash-completion
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
index 3aa4c1c5dd4c..611714ba407d 100644
--- a/shells/bash-completion/pkg-plist
+++ b/shells/bash-completion/pkg-plist
@@ -1,6 +1,9 @@
 libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/bash_completion
 %%DATADIR%%/bash_completion.sh
+%%DATADIR%%/completions/2to3
+%%DATADIR%%/completions/7z
+%%DATADIR%%/completions/7za
 %%DATADIR%%/completions/_cal
 %%DATADIR%%/completions/_chfn
 %%DATADIR%%/completions/_chsh
@@ -26,9 +29,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_udevadm
 %%DATADIR%%/completions/_write
 %%DATADIR%%/completions/_yum
-%%DATADIR%%/completions/2to3
-%%DATADIR%%/completions/7z
-%%DATADIR%%/completions/7za
 %%DATADIR%%/completions/a2x
 %%DATADIR%%/completions/abook
 %%DATADIR%%/completions/aclocal
@@ -76,6 +76,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/autoupdate
 %%DATADIR%%/completions/avctrl
 %%DATADIR%%/completions/badblocks
+%%DATADIR%%/completions/bind
 %%DATADIR%%/completions/bk
 %%DATADIR%%/completions/brctl
 %%DATADIR%%/completions/btdownloadcurses.py
@@ -199,6 +200,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/gfortran
 %%DATADIR%%/completions/gkrellm
 %%DATADIR%%/completions/gkrellm2
+%%DATADIR%%/completions/gm
 %%DATADIR%%/completions/gmake
 %%DATADIR%%/completions/gmplayer
 %%DATADIR%%/completions/gnatmake
@@ -340,6 +342,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/mdtool
 %%DATADIR%%/completions/medusa
 %%DATADIR%%/completions/mencoder
+%%DATADIR%%/completions/micropython
 %%DATADIR%%/completions/mii-diag
 %%DATADIR%%/completions/mii-tool
 %%DATADIR%%/completions/minicom
@@ -452,6 +455,9 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/pwdx
 %%DATADIR%%/completions/pwgen
 %%DATADIR%%/completions/pxz
+%%DATADIR%%/completions/py.test
+%%DATADIR%%/completions/py.test-2
+%%DATADIR%%/completions/py.test-3
 %%DATADIR%%/completions/pydoc
 %%DATADIR%%/completions/pydoc3
 %%DATADIR%%/completions/pyflakes
@@ -465,10 +471,10 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/pyvenv-3.4
 %%DATADIR%%/completions/pyvenv-3.5
 %%DATADIR%%/completions/qdbus
+%%DATADIR%%/completions/qemu
 %%DATADIR%%/completions/qemu-kvm
 %%DATADIR%%/completions/qemu-system-i386
 %%DATADIR%%/completions/qemu-system-x86_64
-%%DATADIR%%/completions/qemu
 %%DATADIR%%/completions/qrunner
 %%DATADIR%%/completions/querybts
 %%DATADIR%%/completions/quota
@@ -631,6 +637,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/zopfli
 %%DATADIR%%/completions/zopflipng
 %%DATADIR%%/helpers/perl
+%%DATADIR%%/helpers/python
 %%CMAKE_MODULES%%share/cmake/Modules/bash-completion/bash-completion-config-version.cmake
 %%CMAKE_MODULES%%share/cmake/Modules/bash-completion/bash-completion-config.cmake
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES