10 files changed, 99 insertions, 256 deletions

diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index d3444bcc6455..d08e7cd0c754 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	bash-completion
-PORTVERSION=	2.1
-PORTREVISION=	6
+PORTVERSION=	2.4
 PORTEPOCH=	1
 CATEGORIES=	shells
-MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Programmable completion library for Bash
@@ -15,33 +13,40 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	bash:shells/bash
 
-USE_AUTOTOOLS=	aclocal automake
+USE_GITHUB=	yes
+GH_ACCOUNT=	scop
+
+USES=		autoreconf gmake pathfix
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix tar:bzip2
-PATHFIX_MAKEFILEIN=	Makefile.am
+NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	RUNFILE=${DATADIR}/bash_completion.sh
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	CMAKE_MODULES DOCS
+OPTIONS_DEFAULT=CMAKE_MODULES
+CMAKE_MODULES_DESC=	Install bash-completion modules for cmake
+OPTIONS_SUB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|FLAC|&\|flv\|FLV|;' ${WRKSRC}/bash_completion
+	@${REINPLACE_CMD} -e \
+		'/^profiledir =/s|(sysconfdir)/profile.d|(prefix)/share/bash-completion|; \
+		s|\((datadir)/cmake\)|\1/Modules|' \
+		${WRKSRC}/Makefile.am
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
-		s|/etc/bash_completion|${PREFIX}&|g; \
 		s|/usr\(/sbin/postconf\)|${PREFIX}\1|g; \
-		s|/usr\(/lib/rpm/macros\)|${PREFIX}\1|g; \
-		s|/usr/share\(/ssl/openssl.cnf\)|/etc\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/*
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README doc/bash_completion.txt doc/bashrc doc/inputrc
+.for i in CHANGES README.md doc/bash_completion.txt doc/bashrc doc/inputrc
 		${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
index 6a7e53c3950c..46fe09469a58 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bash-completion-2.1.tar.bz2) = 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f
-SIZE (bash-completion-2.1.tar.bz2) = 265329
+TIMESTAMP = 1480694742
+SHA256 (scop-bash-completion-2.4_GH0.tar.gz) = a66153892b0863ce94979730985edfd9bc272c2a27b65e64556af7d2c73cc8f3
+SIZE (scop-bash-completion-2.4_GH0.tar.gz) = 308692
diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am
deleted file mode 100644
index 40771d02009a..000000000000
--- a/shells/bash-completion/files/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig	2016-10-04 13:52:42 UTC
-+++ Makefile.am
-@@ -5,7 +5,7 @@ pkgdata_DATA = bash_completion
- # Empty, but here just to get the compat dir created with install
- compat_DATA =
- 
--profiledir = $(sysconfdir)/profile.d
-+profiledir = $(prefix)/share/bash-completion
- profile_DATA = bash_completion.sh
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig
-@@ -20,8 +20,10 @@ EXTRA_DIST = CHANGES $(sysconf_DATA) $(p
-         .dir-locals.el
- 
- install-data-hook:
-+	chmod 644 $(DESTDIR)$(pkgdatadir)/bash_completion
- 	tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \
- 	sed -e 's|=/etc/bash_completion\.d|=$(compatdir)|' \
- 		$(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \
- 	cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \
- 	rm $$tmpfile
-+	chmod 444 $(DESTDIR)$(pkgdatadir)/bash_completion
diff --git a/shells/bash-completion/files/patch-bash__completion b/shells/bash-completion/files/patch-bash__completion
deleted file mode 100644
index 6e6d95fa1a68..000000000000
--- a/shells/bash-completion/files/patch-bash__completion
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash_completion.orig	2015-01-20 16:17:24 UTC
-+++ bash_completion
-@@ -707,7 +707,7 @@ _init_completion()
-         fi
-     done
- 
--    [[ $cword -eq 0 ]] && return 1
-+    [[ $cword -le 0 ]] && return 1
-     prev=${words[cword-1]}
- 
-     [[ ${split-} ]] && _split_longopt && split=true
diff --git a/shells/bash-completion/files/patch-freebsd-update b/shells/bash-completion/files/patch-freebsd-update
deleted file mode 100644
index e25f83e14002..000000000000
--- a/shells/bash-completion/files/patch-freebsd-update
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5ff5a4e0f875e8d1a49848408cfe72778889cbe8 Mon Sep 17 00:00:00 2001
-From: Peter Dave Hello <hsu@peterdavehello.org>
-Date: Tue, 7 Jan 2014 12:29:24 +0800
-Subject: freebsd-update: New completion.
-
-
-diff --git completions/Makefile.am completions/Makefile.am
-index 7b8f767..9ef17ea 100644
---- completions/Makefile.am
-+++ completions/Makefile.am
-@@ -96,6 +96,7 @@ bashcomp_DATA = 2to3 \
- 		filesnarf \
- 		find \
- 		find_member \
-+		freebsd-update \
- 		freeciv-gtk2 \
- 		freeciv-server \
- 		function \
-diff --git completions/freebsd-update completions/freebsd-update
-new file mode 100644
-index 0000000..4cf8650
---- /dev/null
-+++ completions/freebsd-update
-@@ -0,0 +1,29 @@
-+# bash completion for FreeBSD update tool - freebsd-update -*- shell-script -*-
-+
-+[[ $OSTYPE == *freebsd* ]] || return 1
-+
-+_freebsd_update()
-+{
-+    local cur prev words cword
-+    _init_completion || return
-+
-+    case $prev in
-+        -b|-d)
-+            _filedir -d
-+            return
-+            ;;
-+        -f)
-+            _filedir
-+            return
-+            ;;
-+        -k|-r|-s|-t)
-+            return
-+            ;;
-+    esac
-+
-+    COMPREPLY=( $(compgen -W "fetch cron upgrade install rollback IDS" -- \
-+        $cur) )
-+} &&
-+complete -F _freebsd_update  freebsd-update
-+
-+# ex: ts=4 sw=4 et filetype=sh
--- 
-cgit v0.10.2
-
diff --git a/shells/bash-completion/files/patch-portsnap b/shells/bash-completion/files/patch-portsnap
deleted file mode 100644
index aeaab80300f4..000000000000
--- a/shells/bash-completion/files/patch-portsnap
+++ /dev/null
@@ -1,52 +0,0 @@
-From c3770c17984bb61255db6adb48886b466c335e03 Mon Sep 17 00:00:00 2001
-From: Peter Dave Hello <hsu@peterdavehello.org>
-Date: Thu, 2 Jan 2014 03:28:56 +0800
-Subject: portsnap: New completion.
-
-
-diff --git completions/Makefile.am completions/Makefile.am
-index be5bc26..7b8f767 100644
---- completions/Makefile.am
-+++ completions/Makefile.am
-@@ -261,6 +261,7 @@ bashcomp_DATA = 2to3 \
- 		pm-is-supported \
- 		pm-powersave \
- 		portinstall \
-+		portsnap \
- 		portupgrade \
- 		postcat \
- 		postconf \
-diff --git completions/portsnap completions/portsnap
-new file mode 100644
-index 0000000..22937c0
---- /dev/null
-+++ completions/portsnap
-@@ -0,0 +1,25 @@
-+# bash completion for Portsnap                             -*- shell-script -*-
-+
-+[[ $OSTYPE == *freebsd* ]] || return 1
-+
-+_portsnap()
-+{
-+    local cur prev words cword
-+    _init_completion || return
-+
-+    case $prev in
-+        -d|-p)
-+            _filedir -d
-+            return
-+            ;;
-+        -l|-f)
-+            _filedir
-+            return
-+            ;;
-+    esac
-+
-+    COMPREPLY=( $(compgen -W "fetch cron extract update" -- $cur) )
-+} &&
-+complete -F _portsnap  portsnap
-+
-+# ex: ts=4 sw=4 et filetype=sh
--- 
-cgit v0.10.2
-
diff --git a/shells/bash-completion/files/patch-reptyr b/shells/bash-completion/files/patch-reptyr
deleted file mode 100644
index eacb1f8e4c4c..000000000000
--- a/shells/bash-completion/files/patch-reptyr
+++ /dev/null
@@ -1,84 +0,0 @@
-From 6a4ad49fa53cc92d3bd23b5b4db0b3318f2ef136 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Tue, 3 Feb 2015 07:55:22 +0200
-Subject: reptyr: Rename file to _reptyr to avoid conflict with upstreamed
- completion
-
-https://github.com/nelhage/reptyr/pull/53
----
- completions/Makefile.am |  2 +-
- completions/_reptyr     | 26 ++++++++++++++++++++++++++
- completions/reptyr      | 23 -----------------------
- 3 files changed, 27 insertions(+), 24 deletions(-)
- create mode 100644 completions/_reptyr
- delete mode 100644 completions/reptyr
-
---- completions/Makefile.am
-+++ completions/Makefile.am
-@@ -303,7 +303,7 @@ bashcomp_DATA = 2to3 \
- 		_renice \
- 		_repomanage \
- 		reportbug \
--		reptyr \
-+		_reptyr \
- 		resolvconf \
- 		rfkill \
- 		ri \
---- /dev/null
-+++ completions/_reptyr
-@@ -0,0 +1,26 @@
-+# bash completion for reptyr(1)                            -*- shell-script -*-
-+
-+# Use of this file is deprecated.  Upstream completion is available in
-+# reptyr > 0.6.2, use that instead.
-+
-+_reptyr()
-+{
-+    local cur prev words cword
-+    _init_completion || return
-+
-+    case $prev in
-+        -l)
-+            return 0
-+            ;;
-+    esac
-+
-+    if [[ $cur == -* ]]; then
-+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
-+        return 0
-+    fi
-+
-+    [[ $prev != +([0-9]) ]] && _pids
-+} &&
-+complete -F _reptyr reptyr
-+
-+# ex: ts=4 sw=4 et filetype=sh
---- completions/reptyr
-+++ /dev/null
-@@ -1,23 +0,0 @@
--# bash completion for reptyr(1)                            -*- shell-script -*-
--
--_reptyr()
--{
--    local cur prev words cword
--    _init_completion || return
--
--    case $prev in
--        -l)
--            return 0
--            ;;
--    esac
--
--    if [[ $cur == -* ]]; then
--        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
--        return 0
--    fi
--
--    [[ $prev != +([0-9]) ]] && _pids
--} &&
--complete -F _reptyr reptyr
--
--# ex: ts=4 sw=4 et filetype=sh
--- 
-cgit v0.11.2
-
diff --git a/shells/bash-completion/files/pkg-message.in b/shells/bash-completion/files/pkg-message.in
index 295c11f08d8d..f5c3c0203fd3 100644
--- a/shells/bash-completion/files/pkg-message.in
+++ b/shells/bash-completion/files/pkg-message.in
@@ -7,7 +7,7 @@ your .bashrc file:
 [[ $PS1 && -f %%RUNFILE%% ]] && \
 	source %%RUNFILE%%
 
-See %%DOCSDIR%%/README for more information.
+See %%DOCSDIR%%/README.md for more information.
 
 =====================================================================
 
diff --git a/shells/bash-completion/pkg-descr b/shells/bash-completion/pkg-descr
index f54b05e43e21..3c4886bcb6bf 100644
--- a/shells/bash-completion/pkg-descr
+++ b/shells/bash-completion/pkg-descr
@@ -2,4 +2,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.
 
-WWW: http://bash-completion.alioth.debian.org/
+WWW: https://github.com/scop/bash-completion
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
index f76334d56b15..595571329ef5 100644
--- a/shells/bash-completion/pkg-plist
+++ b/shells/bash-completion/pkg-plist
@@ -1,12 +1,45 @@
 libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/bash_completion
 %%DATADIR%%/bash_completion.sh
+%%DATADIR%%/completions/_cal
+%%DATADIR%%/completions/_chfn
+%%DATADIR%%/completions/_chsh
+%%DATADIR%%/completions/_dmesg
+%%DATADIR%%/completions/_eject
+%%DATADIR%%/completions/_hexdump
+%%DATADIR%%/completions/_hwclock
+%%DATADIR%%/completions/_ionice
+%%DATADIR%%/completions/_look
+%%DATADIR%%/completions/_mock
+%%DATADIR%%/completions/_modules
+%%DATADIR%%/completions/_newgrp
+%%DATADIR%%/completions/_nmcli
+%%DATADIR%%/completions/_renice
+%%DATADIR%%/completions/_repomanage
 %%DATADIR%%/completions/_reptyr
+%%DATADIR%%/completions/_rtcwake
+%%DATADIR%%/completions/_runuser
+%%DATADIR%%/completions/_su
+%%DATADIR%%/completions/_svn
+%%DATADIR%%/completions/_svnadmin
+%%DATADIR%%/completions/_svnlook
+%%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
+%%DATADIR%%/completions/aclocal-1.10
 %%DATADIR%%/completions/aclocal-1.11
+%%DATADIR%%/completions/aclocal-1.12
+%%DATADIR%%/completions/aclocal-1.13
+%%DATADIR%%/completions/aclocal-1.14
+%%DATADIR%%/completions/aclocal-1.15
 %%DATADIR%%/completions/acpi
+%%DATADIR%%/completions/adb
 %%DATADIR%%/completions/add_members
 %%DATADIR%%/completions/alias
 %%DATADIR%%/completions/alpine
@@ -14,6 +47,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/animate
 %%DATADIR%%/completions/ant
 %%DATADIR%%/completions/apache2ctl
+%%DATADIR%%/completions/appdata-validate
 %%DATADIR%%/completions/apropos
 %%DATADIR%%/completions/apt-build
 %%DATADIR%%/completions/apt-cache
@@ -29,7 +63,12 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/autoconf
 %%DATADIR%%/completions/autoheader
 %%DATADIR%%/completions/automake
+%%DATADIR%%/completions/automake-1.10
 %%DATADIR%%/completions/automake-1.11
+%%DATADIR%%/completions/automake-1.12
+%%DATADIR%%/completions/automake-1.13
+%%DATADIR%%/completions/automake-1.14
+%%DATADIR%%/completions/automake-1.15
 %%DATADIR%%/completions/autoreconf
 %%DATADIR%%/completions/autorpm
 %%DATADIR%%/completions/autoscan
@@ -42,9 +81,9 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/btdownloadcurses.py
 %%DATADIR%%/completions/btdownloadgui.py
 %%DATADIR%%/completions/btdownloadheadless.py
+%%DATADIR%%/completions/bts
 %%DATADIR%%/completions/bzip2
 %%DATADIR%%/completions/c++
-%%DATADIR%%/completions/cal
 %%DATADIR%%/completions/cancel
 %%DATADIR%%/completions/cardctl
 %%DATADIR%%/completions/cc
@@ -56,13 +95,13 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/change_pw
 %%DATADIR%%/completions/check_db
 %%DATADIR%%/completions/check_perms
+%%DATADIR%%/completions/checksec
 %%DATADIR%%/completions/chgrp
 %%DATADIR%%/completions/chkconfig
 %%DATADIR%%/completions/chown
 %%DATADIR%%/completions/chpasswd
 %%DATADIR%%/completions/chronyc
 %%DATADIR%%/completions/chrpath
-%%DATADIR%%/completions/chsh
 %%DATADIR%%/completions/ci
 %%DATADIR%%/completions/ciptool
 %%DATADIR%%/completions/civclient
@@ -88,6 +127,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/cpio
 %%DATADIR%%/completions/cppcheck
 %%DATADIR%%/completions/createdb
+%%DATADIR%%/completions/createuser
 %%DATADIR%%/completions/crontab
 %%DATADIR%%/completions/cryptsetup
 %%DATADIR%%/completions/curl
@@ -101,7 +141,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/dhclient
 %%DATADIR%%/completions/dict
 %%DATADIR%%/completions/display
-%%DATADIR%%/completions/dmesg
 %%DATADIR%%/completions/dnsspoof
 %%DATADIR%%/completions/dot
 %%DATADIR%%/completions/dpkg
@@ -110,6 +149,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/dpkg-reconfigure
 %%DATADIR%%/completions/dpkg-source
 %%DATADIR%%/completions/dropdb
+%%DATADIR%%/completions/dropuser
 %%DATADIR%%/completions/dselect
 %%DATADIR%%/completions/dsniff
 %%DATADIR%%/completions/dumpdb
@@ -117,12 +157,13 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/e2freefrag
 %%DATADIR%%/completions/e2label
 %%DATADIR%%/completions/edquota
-%%DATADIR%%/completions/eject
 %%DATADIR%%/completions/eog
 %%DATADIR%%/completions/ether-wake
 %%DATADIR%%/completions/evince
 %%DATADIR%%/completions/explodepkg
 %%DATADIR%%/completions/export
+%%DATADIR%%/completions/f77
+%%DATADIR%%/completions/f95
 %%DATADIR%%/completions/faillog
 %%DATADIR%%/completions/fbgs
 %%DATADIR%%/completions/fbi
@@ -134,6 +175,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/filesnarf
 %%DATADIR%%/completions/find
 %%DATADIR%%/completions/find_member
+%%DATADIR%%/completions/flake8
 %%DATADIR%%/completions/freebsd-update
 %%DATADIR%%/completions/freeciv-gtk2
 %%DATADIR%%/completions/freeciv-sdl
@@ -144,6 +186,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/g++
 %%DATADIR%%/completions/g4
 %%DATADIR%%/completions/g77
+%%DATADIR%%/completions/g95
 %%DATADIR%%/completions/gcc
 %%DATADIR%%/completions/gcj
 %%DATADIR%%/completions/gcl
@@ -152,11 +195,13 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/gendiff
 %%DATADIR%%/completions/genisoimage
 %%DATADIR%%/completions/getent
+%%DATADIR%%/completions/gfortran
 %%DATADIR%%/completions/gkrellm
 %%DATADIR%%/completions/gkrellm2
 %%DATADIR%%/completions/gmake
 %%DATADIR%%/completions/gmplayer
 %%DATADIR%%/completions/gnatmake
+%%DATADIR%%/completions/gnokii
 %%DATADIR%%/completions/gnome-mplayer
 %%DATADIR%%/completions/gnumake
 %%DATADIR%%/completions/gpasswd
@@ -177,15 +222,14 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/hcitool
 %%DATADIR%%/completions/hd
 %%DATADIR%%/completions/hddtemp
-%%DATADIR%%/completions/hexdump
 %%DATADIR%%/completions/hid2hci
 %%DATADIR%%/completions/host
+%%DATADIR%%/completions/hostname
 %%DATADIR%%/completions/hping
 %%DATADIR%%/completions/hping2
 %%DATADIR%%/completions/hping3
 %%DATADIR%%/completions/htop
 %%DATADIR%%/completions/htpasswd
-%%DATADIR%%/completions/hwclock
 %%DATADIR%%/completions/iconv
 %%DATADIR%%/completions/id
 %%DATADIR%%/completions/identify
@@ -202,7 +246,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/installpkg
 %%DATADIR%%/completions/interdiff
 %%DATADIR%%/completions/invoke-rc.d
-%%DATADIR%%/completions/ionice
 %%DATADIR%%/completions/ip
 %%DATADIR%%/completions/iperf
 %%DATADIR%%/completions/ipmitool
@@ -221,7 +264,9 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/javac
 %%DATADIR%%/completions/javadoc
 %%DATADIR%%/completions/javaws
+%%DATADIR%%/completions/jpegoptim
 %%DATADIR%%/completions/jps
+%%DATADIR%%/completions/jshint
 %%DATADIR%%/completions/k3b
 %%DATADIR%%/completions/kcov
 %%DATADIR%%/completions/kill
@@ -255,7 +300,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/list_lists
 %%DATADIR%%/completions/list_members
 %%DATADIR%%/completions/list_owners
-%%DATADIR%%/completions/look
 %%DATADIR%%/completions/lpq
 %%DATADIR%%/completions/lpr
 %%DATADIR%%/completions/lrzip
@@ -277,6 +321,8 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/lvresize
 %%DATADIR%%/completions/lvs
 %%DATADIR%%/completions/lvscan
+%%DATADIR%%/completions/lz4
+%%DATADIR%%/completions/lz4c
 %%DATADIR%%/completions/lzip
 %%DATADIR%%/completions/lzma
 %%DATADIR%%/completions/lzop
@@ -325,22 +371,22 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/ncal
 %%DATADIR%%/completions/ncftp
 %%DATADIR%%/completions/nethogs
-%%DATADIR%%/completions/newgrp
 %%DATADIR%%/completions/newlist
 %%DATADIR%%/completions/newusers
 %%DATADIR%%/completions/ngrep
 %%DATADIR%%/completions/nmap
-%%DATADIR%%/completions/nmcli
 %%DATADIR%%/completions/nslookup
 %%DATADIR%%/completions/ntpdate
 %%DATADIR%%/completions/openssl
 %%DATADIR%%/completions/opera
+%%DATADIR%%/completions/optipng
 %%DATADIR%%/completions/p4
 %%DATADIR%%/completions/pack200
 %%DATADIR%%/completions/passwd
 %%DATADIR%%/completions/patch
 %%DATADIR%%/completions/pbzip2
 %%DATADIR%%/completions/pccardctl
+%%DATADIR%%/completions/pdftotext
 %%DATADIR%%/completions/pdlzip
 %%DATADIR%%/completions/perl
 %%DATADIR%%/completions/perldoc
@@ -370,6 +416,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/pm-suspend
 %%DATADIR%%/completions/pm-suspend-hybrid
 %%DATADIR%%/completions/pmake
+%%DATADIR%%/completions/pngfix
 %%DATADIR%%/completions/portinstall
 %%DATADIR%%/completions/portsnap
 %%DATADIR%%/completions/portupgrade
@@ -405,11 +452,20 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/pxz
 %%DATADIR%%/completions/pydoc
 %%DATADIR%%/completions/pydoc3
+%%DATADIR%%/completions/pyflakes
 %%DATADIR%%/completions/pylint
+%%DATADIR%%/completions/pypy
+%%DATADIR%%/completions/pypy3
 %%DATADIR%%/completions/python
 %%DATADIR%%/completions/python2
 %%DATADIR%%/completions/python3
+%%DATADIR%%/completions/pyvenv
+%%DATADIR%%/completions/pyvenv-3.4
+%%DATADIR%%/completions/pyvenv-3.5
 %%DATADIR%%/completions/qdbus
+%%DATADIR%%/completions/qemu-kvm
+%%DATADIR%%/completions/qemu-system-i386
+%%DATADIR%%/completions/qemu-system-x86_64
 %%DATADIR%%/completions/qemu
 %%DATADIR%%/completions/qrunner
 %%DATADIR%%/completions/querybts
@@ -424,7 +480,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/rdict
 %%DATADIR%%/completions/remove_members
 %%DATADIR%%/completions/removepkg
-%%DATADIR%%/completions/renice
 %%DATADIR%%/completions/reportbug
 %%DATADIR%%/completions/repquota
 %%DATADIR%%/completions/resolvconf
@@ -445,7 +500,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/rpmcheck
 %%DATADIR%%/completions/rrdtool
 %%DATADIR%%/completions/rsync
-%%DATADIR%%/completions/rtcwake
 %%DATADIR%%/completions/s390-koji
 %%DATADIR%%/completions/sbcl
 %%DATADIR%%/completions/sbcl-mt
@@ -477,18 +531,19 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/ssh
 %%DATADIR%%/completions/ssh-add
 %%DATADIR%%/completions/ssh-copy-id
+%%DATADIR%%/completions/ssh-keygen
 %%DATADIR%%/completions/sshfs
 %%DATADIR%%/completions/sshmitm
 %%DATADIR%%/completions/sshow
 %%DATADIR%%/completions/strace
 %%DATADIR%%/completions/stream
 %%DATADIR%%/completions/strings
-%%DATADIR%%/completions/su
 %%DATADIR%%/completions/sudo
 %%DATADIR%%/completions/sudoedit
 %%DATADIR%%/completions/svcadm
 %%DATADIR%%/completions/svk
 %%DATADIR%%/completions/sync_members
+%%DATADIR%%/completions/synclient
 %%DATADIR%%/completions/sysbench
 %%DATADIR%%/completions/sysctl
 %%DATADIR%%/completions/tar
@@ -496,6 +551,8 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/tcpkill
 %%DATADIR%%/completions/tcpnice
 %%DATADIR%%/completions/tightvncviewer
+%%DATADIR%%/completions/timeout
+%%DATADIR%%/completions/tipc
 %%DATADIR%%/completions/tracepath
 %%DATADIR%%/completions/tracepath6
 %%DATADIR%%/completions/tshark
@@ -568,8 +625,13 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/ypcat
 %%DATADIR%%/completions/ypmatch
 %%DATADIR%%/completions/yum-arch
+%%DATADIR%%/completions/zopfli
+%%DATADIR%%/completions/zopflipng
 %%DATADIR%%/helpers/perl
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%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
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/bash_completion.txt
 %%PORTDOCS%%%%DOCSDIR%%/bashrc
 %%PORTDOCS%%%%DOCSDIR%%/inputrc