bash-completion: Update shells/bash-completion to 2.8

Patch provided by Attila Fülöp via netbsd/pkgsrc#36, thanks!

pkgsrc changes:
 - Update MASTER_SITES and HOMEPAGE

Changes:
Unfortunately the changelog is very long. Only new/removed completions/helpers
are documented here (since 2.1):

The following completions were added:
 - 2to3, 7z, 7za, _cal, _chfn, _chsh, _dmesg, _eject, _hexdump,
   _hwclock, _ionice, _look, _mock, _modules, _newgrp, _nmcli, _renice,
   _repomanage, _reptyr, _rfkill, _rtcwake, _runuser, _su, _svn,
   _svnadmin, _svnlook, _udevadm, _write, _yum, aclocal-1.10,
   aclocal-1.12, aclocal-1.13, aclocal-1.14, aclocal-1.15, adb,
   appdata-validate, aptitude-curses, automake-1.10, automake-1.12,
   automake-1.13, automake-1.14, automake-1.15, bind, bts, ccze,
   checksec, createuser, deja-dup, dropuser, ebtables, f77, f95,
   flake8, freebsd-update, g95, geoiplookup, geoiplookup6, getconf,
   gfortran, gm, gnokii, hostname, jpegoptim, jshint, lsscsi, lsusb,
   lz4, lz4c, micropython, mr, nproc, oggdec, optipng, pdftotext,
   perltidy, pngfix, portsnap, pv, py.test, py.test-2, py.test-3,
   pycodestyle, pyflakes, pylint-2, pylint-3, pypy, pypy3, pyvenv,
   pyvenv-3.4, pyvenv-3.5, qemu-kvm, qemu-system-i386, qemu-system-x86_64,
   radvdump, sidedoor, ssh-keygen, synclient, timeout, tipc, tox,
   xdg-mime, xdg-settings, zopfli, zopflipng, python,

The following completions were removed:
 - cal, chsh, dmesg, eject, hexdump, hwclock, ionice, look, newgrp,
   nmcli, renice, reptyr, rfkill, rtcwake, su,

The following helpers were added:
 - python

6 files changed, 141 insertions, 82 deletions

diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 137386cf7db..9cd1e8f7bf2 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2017/03/14 14:51:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2018/10/19 20:28:25 leot Exp $
 #
 # Note to packagers:
 # packages installing additional completion files should drop
 # them into ${DESTDIR}${PREFIX}/share/bash-completion.d
 # with the name of the package as file name.
 
-DISTNAME=	bash-completion-2.1
-PKGREVISION=	1
+DISTNAME=	bash-completion-2.8
 CATEGORIES=	shells
-MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=scop/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bash-completion.alioth.debian.org/
diff --git a/shells/bash-completion/PLIST b/shells/bash-completion/PLIST
index bf9edc740a8..f61eaab2a44 100644
--- a/shells/bash-completion/PLIST
+++ b/shells/bash-completion/PLIST
@@ -1,11 +1,46 @@
-@comment $NetBSD: PLIST,v 1.4 2013/05/10 12:01:51 imil Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/10/19 20:28:25 leot Exp $
 etc/profile.d/bash_completion.sh
 share/bash-completion/bash_completion
+share/bash-completion/completions/2to3
+share/bash-completion/completions/7z
+share/bash-completion/completions/7za
+share/bash-completion/completions/_cal
+share/bash-completion/completions/_chfn
+share/bash-completion/completions/_chsh
+share/bash-completion/completions/_dmesg
+share/bash-completion/completions/_eject
+share/bash-completion/completions/_hexdump
+share/bash-completion/completions/_hwclock
+share/bash-completion/completions/_ionice
+share/bash-completion/completions/_look
+share/bash-completion/completions/_mock
+share/bash-completion/completions/_modules
+share/bash-completion/completions/_newgrp
+share/bash-completion/completions/_nmcli
+share/bash-completion/completions/_renice
+share/bash-completion/completions/_repomanage
+share/bash-completion/completions/_reptyr
+share/bash-completion/completions/_rfkill
+share/bash-completion/completions/_rtcwake
+share/bash-completion/completions/_runuser
+share/bash-completion/completions/_su
+share/bash-completion/completions/_svn
+share/bash-completion/completions/_svnadmin
+share/bash-completion/completions/_svnlook
+share/bash-completion/completions/_udevadm
+share/bash-completion/completions/_write
+share/bash-completion/completions/_yum
 share/bash-completion/completions/a2x
 share/bash-completion/completions/abook
 share/bash-completion/completions/aclocal
+share/bash-completion/completions/aclocal-1.10
 share/bash-completion/completions/aclocal-1.11
+share/bash-completion/completions/aclocal-1.12
+share/bash-completion/completions/aclocal-1.13
+share/bash-completion/completions/aclocal-1.14
+share/bash-completion/completions/aclocal-1.15
 share/bash-completion/completions/acpi
+share/bash-completion/completions/adb
 share/bash-completion/completions/add_members
 share/bash-completion/completions/alias
 share/bash-completion/completions/alpine
@@ -13,11 +48,13 @@ share/bash-completion/completions/alternatives
 share/bash-completion/completions/animate
 share/bash-completion/completions/ant
 share/bash-completion/completions/apache2ctl
+share/bash-completion/completions/appdata-validate
 share/bash-completion/completions/apropos
 share/bash-completion/completions/apt-build
 share/bash-completion/completions/apt-cache
 share/bash-completion/completions/apt-get
 share/bash-completion/completions/aptitude
+share/bash-completion/completions/aptitude-curses
 share/bash-completion/completions/arch
 share/bash-completion/completions/arm-koji
 share/bash-completion/completions/arping
@@ -28,7 +65,12 @@ share/bash-completion/completions/aspell
 share/bash-completion/completions/autoconf
 share/bash-completion/completions/autoheader
 share/bash-completion/completions/automake
+share/bash-completion/completions/automake-1.10
 share/bash-completion/completions/automake-1.11
+share/bash-completion/completions/automake-1.12
+share/bash-completion/completions/automake-1.13
+share/bash-completion/completions/automake-1.14
+share/bash-completion/completions/automake-1.15
 share/bash-completion/completions/autoreconf
 share/bash-completion/completions/autorpm
 share/bash-completion/completions/autoscan
@@ -36,18 +78,20 @@ share/bash-completion/completions/autossh
 share/bash-completion/completions/autoupdate
 share/bash-completion/completions/avctrl
 share/bash-completion/completions/badblocks
+share/bash-completion/completions/bind
 share/bash-completion/completions/bk
 share/bash-completion/completions/brctl
 share/bash-completion/completions/btdownloadcurses.py
 share/bash-completion/completions/btdownloadgui.py
 share/bash-completion/completions/btdownloadheadless.py
+share/bash-completion/completions/bts
 share/bash-completion/completions/bzip2
 share/bash-completion/completions/c++
-share/bash-completion/completions/cal
 share/bash-completion/completions/cancel
 share/bash-completion/completions/cardctl
 share/bash-completion/completions/cc
 share/bash-completion/completions/ccache
+share/bash-completion/completions/ccze
 share/bash-completion/completions/cdrecord
 share/bash-completion/completions/cfagent
 share/bash-completion/completions/cfrun
@@ -55,13 +99,13 @@ share/bash-completion/completions/chage
 share/bash-completion/completions/change_pw
 share/bash-completion/completions/check_db
 share/bash-completion/completions/check_perms
+share/bash-completion/completions/checksec
 share/bash-completion/completions/chgrp
 share/bash-completion/completions/chkconfig
 share/bash-completion/completions/chown
 share/bash-completion/completions/chpasswd
 share/bash-completion/completions/chronyc
 share/bash-completion/completions/chrpath
-share/bash-completion/completions/chsh
 share/bash-completion/completions/ci
 share/bash-completion/completions/ciptool
 share/bash-completion/completions/civclient
@@ -87,6 +131,7 @@ share/bash-completion/completions/cpan2dist
 share/bash-completion/completions/cpio
 share/bash-completion/completions/cppcheck
 share/bash-completion/completions/createdb
+share/bash-completion/completions/createuser
 share/bash-completion/completions/crontab
 share/bash-completion/completions/cryptsetup
 share/bash-completion/completions/curl
@@ -95,12 +140,12 @@ share/bash-completion/completions/cvsps
 share/bash-completion/completions/dcop
 share/bash-completion/completions/dd
 share/bash-completion/completions/declare
+share/bash-completion/completions/deja-dup
 share/bash-completion/completions/desktop-file-validate
 share/bash-completion/completions/dfutool
 share/bash-completion/completions/dhclient
 share/bash-completion/completions/dict
 share/bash-completion/completions/display
-share/bash-completion/completions/dmesg
 share/bash-completion/completions/dnsspoof
 share/bash-completion/completions/dot
 share/bash-completion/completions/dpkg
@@ -109,19 +154,22 @@ share/bash-completion/completions/dpkg-query
 share/bash-completion/completions/dpkg-reconfigure
 share/bash-completion/completions/dpkg-source
 share/bash-completion/completions/dropdb
+share/bash-completion/completions/dropuser
 share/bash-completion/completions/dselect
 share/bash-completion/completions/dsniff
 share/bash-completion/completions/dumpdb
 share/bash-completion/completions/dumpe2fs
 share/bash-completion/completions/e2freefrag
 share/bash-completion/completions/e2label
+share/bash-completion/completions/ebtables
 share/bash-completion/completions/edquota
-share/bash-completion/completions/eject
 share/bash-completion/completions/eog
 share/bash-completion/completions/ether-wake
 share/bash-completion/completions/evince
 share/bash-completion/completions/explodepkg
 share/bash-completion/completions/export
+share/bash-completion/completions/f77
+share/bash-completion/completions/f95
 share/bash-completion/completions/faillog
 share/bash-completion/completions/fbgs
 share/bash-completion/completions/fbi
@@ -133,6 +181,8 @@ share/bash-completion/completions/filefrag
 share/bash-completion/completions/filesnarf
 share/bash-completion/completions/find
 share/bash-completion/completions/find_member
+share/bash-completion/completions/flake8
+share/bash-completion/completions/freebsd-update
 share/bash-completion/completions/freeciv-gtk2
 share/bash-completion/completions/freeciv-sdl
 share/bash-completion/completions/freeciv-server
@@ -142,6 +192,7 @@ share/bash-completion/completions/fusermount
 share/bash-completion/completions/g++
 share/bash-completion/completions/g4
 share/bash-completion/completions/g77
+share/bash-completion/completions/g95
 share/bash-completion/completions/gcc
 share/bash-completion/completions/gcj
 share/bash-completion/completions/gcl
@@ -149,12 +200,18 @@ share/bash-completion/completions/gdb
 share/bash-completion/completions/genaliases
 share/bash-completion/completions/gendiff
 share/bash-completion/completions/genisoimage
+share/bash-completion/completions/geoiplookup
+share/bash-completion/completions/geoiplookup6
+share/bash-completion/completions/getconf
 share/bash-completion/completions/getent
+share/bash-completion/completions/gfortran
 share/bash-completion/completions/gkrellm
 share/bash-completion/completions/gkrellm2
+share/bash-completion/completions/gm
 share/bash-completion/completions/gmake
 share/bash-completion/completions/gmplayer
 share/bash-completion/completions/gnatmake
+share/bash-completion/completions/gnokii
 share/bash-completion/completions/gnome-mplayer
 share/bash-completion/completions/gnumake
 share/bash-completion/completions/gpasswd
@@ -175,15 +232,14 @@ share/bash-completion/completions/hciconfig
 share/bash-completion/completions/hcitool
 share/bash-completion/completions/hd
 share/bash-completion/completions/hddtemp
-share/bash-completion/completions/hexdump
 share/bash-completion/completions/hid2hci
 share/bash-completion/completions/host
+share/bash-completion/completions/hostname
 share/bash-completion/completions/hping
 share/bash-completion/completions/hping2
 share/bash-completion/completions/hping3
 share/bash-completion/completions/htop
 share/bash-completion/completions/htpasswd
-share/bash-completion/completions/hwclock
 share/bash-completion/completions/iconv
 share/bash-completion/completions/id
 share/bash-completion/completions/identify
@@ -200,7 +256,6 @@ share/bash-completion/completions/insmod.static
 share/bash-completion/completions/installpkg
 share/bash-completion/completions/interdiff
 share/bash-completion/completions/invoke-rc.d
-share/bash-completion/completions/ionice
 share/bash-completion/completions/ip
 share/bash-completion/completions/iperf
 share/bash-completion/completions/ipmitool
@@ -219,7 +274,9 @@ share/bash-completion/completions/java
 share/bash-completion/completions/javac
 share/bash-completion/completions/javadoc
 share/bash-completion/completions/javaws
+share/bash-completion/completions/jpegoptim
 share/bash-completion/completions/jps
+share/bash-completion/completions/jshint
 share/bash-completion/completions/k3b
 share/bash-completion/completions/kcov
 share/bash-completion/completions/kill
@@ -253,11 +310,12 @@ share/bash-completion/completions/list_admins
 share/bash-completion/completions/list_lists
 share/bash-completion/completions/list_members
 share/bash-completion/completions/list_owners
-share/bash-completion/completions/look
 share/bash-completion/completions/lpq
 share/bash-completion/completions/lpr
 share/bash-completion/completions/lrzip
 share/bash-completion/completions/lsof
+share/bash-completion/completions/lsscsi
+share/bash-completion/completions/lsusb
 share/bash-completion/completions/lua
 share/bash-completion/completions/luac
 share/bash-completion/completions/luseradd
@@ -275,6 +333,8 @@ share/bash-completion/completions/lvrename
 share/bash-completion/completions/lvresize
 share/bash-completion/completions/lvs
 share/bash-completion/completions/lvscan
+share/bash-completion/completions/lz4
+share/bash-completion/completions/lz4c
 share/bash-completion/completions/lzip
 share/bash-completion/completions/lzma
 share/bash-completion/completions/lzop
@@ -291,6 +351,7 @@ share/bash-completion/completions/mdecrypt
 share/bash-completion/completions/mdtool
 share/bash-completion/completions/medusa
 share/bash-completion/completions/mencoder
+share/bash-completion/completions/micropython
 share/bash-completion/completions/mii-diag
 share/bash-completion/completions/mii-tool
 share/bash-completion/completions/minicom
@@ -307,6 +368,7 @@ share/bash-completion/completions/mount
 share/bash-completion/completions/mount.linux
 share/bash-completion/completions/mplayer
 share/bash-completion/completions/mplayer2
+share/bash-completion/completions/mr
 share/bash-completion/completions/msgsnarf
 share/bash-completion/completions/msynctool
 share/bash-completion/completions/mtx
@@ -323,25 +385,28 @@ share/bash-completion/completions/nc
 share/bash-completion/completions/ncal
 share/bash-completion/completions/ncftp
 share/bash-completion/completions/nethogs
-share/bash-completion/completions/newgrp
 share/bash-completion/completions/newlist
 share/bash-completion/completions/newusers
 share/bash-completion/completions/ngrep
 share/bash-completion/completions/nmap
-share/bash-completion/completions/nmcli
+share/bash-completion/completions/nproc
 share/bash-completion/completions/nslookup
 share/bash-completion/completions/ntpdate
+share/bash-completion/completions/oggdec
 share/bash-completion/completions/openssl
 share/bash-completion/completions/opera
+share/bash-completion/completions/optipng
 share/bash-completion/completions/p4
 share/bash-completion/completions/pack200
 share/bash-completion/completions/passwd
 share/bash-completion/completions/patch
 share/bash-completion/completions/pbzip2
 share/bash-completion/completions/pccardctl
+share/bash-completion/completions/pdftotext
 share/bash-completion/completions/pdlzip
 share/bash-completion/completions/perl
 share/bash-completion/completions/perldoc
+share/bash-completion/completions/perltidy
 share/bash-completion/completions/pgrep
 share/bash-completion/completions/phing
 share/bash-completion/completions/pidof
@@ -368,7 +433,9 @@ share/bash-completion/completions/pm-powersave
 share/bash-completion/completions/pm-suspend
 share/bash-completion/completions/pm-suspend-hybrid
 share/bash-completion/completions/pmake
+share/bash-completion/completions/pngfix
 share/bash-completion/completions/portinstall
+share/bash-completion/completions/portsnap
 share/bash-completion/completions/portupgrade
 share/bash-completion/completions/postalias
 share/bash-completion/completions/postcat
@@ -388,6 +455,7 @@ share/bash-completion/completions/puppetdoc
 share/bash-completion/completions/puppetmasterd
 share/bash-completion/completions/puppetqd
 share/bash-completion/completions/puppetrun
+share/bash-completion/completions/pv
 share/bash-completion/completions/pvchange
 share/bash-completion/completions/pvcreate
 share/bash-completion/completions/pvdisplay
@@ -400,20 +468,36 @@ share/bash-completion/completions/pwd
 share/bash-completion/completions/pwdx
 share/bash-completion/completions/pwgen
 share/bash-completion/completions/pxz
+share/bash-completion/completions/py.test
+share/bash-completion/completions/py.test-2
+share/bash-completion/completions/py.test-3
+share/bash-completion/completions/pycodestyle
 share/bash-completion/completions/pydoc
 share/bash-completion/completions/pydoc3
+share/bash-completion/completions/pyflakes
 share/bash-completion/completions/pylint
+share/bash-completion/completions/pylint-2
+share/bash-completion/completions/pylint-3
+share/bash-completion/completions/pypy
+share/bash-completion/completions/pypy3
 share/bash-completion/completions/python
 share/bash-completion/completions/python2
 share/bash-completion/completions/python3
+share/bash-completion/completions/pyvenv
+share/bash-completion/completions/pyvenv-3.4
+share/bash-completion/completions/pyvenv-3.5
 share/bash-completion/completions/qdbus
 share/bash-completion/completions/qemu
+share/bash-completion/completions/qemu-kvm
+share/bash-completion/completions/qemu-system-i386
+share/bash-completion/completions/qemu-system-x86_64
 share/bash-completion/completions/qrunner
 share/bash-completion/completions/querybts
 share/bash-completion/completions/quota
 share/bash-completion/completions/quotacheck
 share/bash-completion/completions/quotaoff
 share/bash-completion/completions/quotaon
+share/bash-completion/completions/radvdump
 share/bash-completion/completions/ralsh
 share/bash-completion/completions/rcs
 share/bash-completion/completions/rcsdiff
@@ -421,13 +505,10 @@ share/bash-completion/completions/rdesktop
 share/bash-completion/completions/rdict
 share/bash-completion/completions/remove_members
 share/bash-completion/completions/removepkg
-share/bash-completion/completions/renice
 share/bash-completion/completions/reportbug
 share/bash-completion/completions/repquota
-share/bash-completion/completions/reptyr
 share/bash-completion/completions/resolvconf
 share/bash-completion/completions/rfcomm
-share/bash-completion/completions/rfkill
 share/bash-completion/completions/ri
 share/bash-completion/completions/rlog
 share/bash-completion/completions/rmlist
@@ -443,7 +524,6 @@ share/bash-completion/completions/rpmbuild-md5
 share/bash-completion/completions/rpmcheck
 share/bash-completion/completions/rrdtool
 share/bash-completion/completions/rsync
-share/bash-completion/completions/rtcwake
 share/bash-completion/completions/s390-koji
 share/bash-completion/completions/sbcl
 share/bash-completion/completions/sbcl-mt
@@ -454,6 +534,7 @@ share/bash-completion/completions/sdptool
 share/bash-completion/completions/setquota
 share/bash-completion/completions/sftp
 share/bash-completion/completions/sh
+share/bash-completion/completions/sidedoor
 share/bash-completion/completions/sitecopy
 share/bash-completion/completions/slackpkg
 share/bash-completion/completions/slapt-get
@@ -475,18 +556,19 @@ share/bash-completion/completions/ss
 share/bash-completion/completions/ssh
 share/bash-completion/completions/ssh-add
 share/bash-completion/completions/ssh-copy-id
+share/bash-completion/completions/ssh-keygen
 share/bash-completion/completions/sshfs
 share/bash-completion/completions/sshmitm
 share/bash-completion/completions/sshow
 share/bash-completion/completions/strace
 share/bash-completion/completions/stream
 share/bash-completion/completions/strings
-share/bash-completion/completions/su
 share/bash-completion/completions/sudo
 share/bash-completion/completions/sudoedit
 share/bash-completion/completions/svcadm
 share/bash-completion/completions/svk
 share/bash-completion/completions/sync_members
+share/bash-completion/completions/synclient
 share/bash-completion/completions/sysbench
 share/bash-completion/completions/sysctl
 share/bash-completion/completions/tar
@@ -494,6 +576,9 @@ share/bash-completion/completions/tcpdump
 share/bash-completion/completions/tcpkill
 share/bash-completion/completions/tcpnice
 share/bash-completion/completions/tightvncviewer
+share/bash-completion/completions/timeout
+share/bash-completion/completions/tipc
+share/bash-completion/completions/tox
 share/bash-completion/completions/tracepath
 share/bash-completion/completions/tracepath6
 share/bash-completion/completions/tshark
@@ -547,6 +632,8 @@ share/bash-completion/completions/wol
 share/bash-completion/completions/wsimport
 share/bash-completion/completions/wtf
 share/bash-completion/completions/wvdial
+share/bash-completion/completions/xdg-mime
+share/bash-completion/completions/xdg-settings
 share/bash-completion/completions/xfreerdp
 share/bash-completion/completions/xgamma
 share/bash-completion/completions/xhost
@@ -566,7 +653,11 @@ share/bash-completion/completions/xzdec
 share/bash-completion/completions/ypcat
 share/bash-completion/completions/ypmatch
 share/bash-completion/completions/yum-arch
+share/bash-completion/completions/zopfli
+share/bash-completion/completions/zopflipng
 share/bash-completion/helpers/perl
+share/bash-completion/helpers/python
+share/cmake/bash-completion/bash-completion-config-version.cmake
+share/cmake/bash-completion/bash-completion-config.cmake
 share/pkgconfig/bash-completion.pc
-@pkgdir share/doc/bash-completion
 @pkgdir share/bash-completion.d
diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
index 6b5a9eca1aa..2a38c44b916 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2017/03/14 14:51:28 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2018/10/19 20:28:25 leot Exp $
 
-SHA1 (bash-completion-2.1.tar.gz) = fad16b1cdae2b40d6814f786990e0e50ab2d537a
-RMD160 (bash-completion-2.1.tar.gz) = a2d42658f2f6a77563614a4a733c95c57bb42cfc
-SHA512 (bash-completion-2.1.tar.gz) = f123b76dd14ca41d8f7f9ca50c11a4cffb5dc82908533820a023d4f76106f3aa879f293786a0d99c0ac0b31cf53e776341c16dbabdb2bb53c1c032b014ad5abf
-Size (bash-completion-2.1.tar.gz) = 341139 bytes
-SHA1 (patch-bash__completion) = 2ed0ae51e241b8ca6c7b1a68cede69109cddfe5e
-SHA1 (patch-completions_man) = 336d45f3567c6e69736e5cd41230874cdcb0ca56
+SHA1 (bash-completion-2.8.tar.xz) = 102d618c60fa001165153b58751d07f230aec7e8
+RMD160 (bash-completion-2.8.tar.xz) = 6ec05ded0b734ebeb9caf7d84bf09d937f923ddb
+SHA512 (bash-completion-2.8.tar.xz) = d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
+Size (bash-completion-2.8.tar.xz) = 286128 bytes
+SHA1 (patch-bash__completion) = e156374446bd0a981ecf3cf26427c10f93234467
+SHA1 (patch-completions_pkg__delete) = 01efc56fd2d65edec6336a55fca0fe3d59f84e6a
diff --git a/shells/bash-completion/patches/patch-bash__completion b/shells/bash-completion/patches/patch-bash__completion
index 2bb644e28e5..a1d50deb91c 100644
--- a/shells/bash-completion/patches/patch-bash__completion
+++ b/shells/bash-completion/patches/patch-bash__completion
@@ -1,50 +1,17 @@
-$NetBSD: patch-bash__completion,v 1.2 2017/03/14 14:51:28 jperkin Exp $
+$NetBSD: patch-bash__completion,v 1.3 2018/10/19 20:28:25 leot Exp $
 
-Added pkgsrc and pkg_install completions
-Pull in upstream fix for bug 1289597.
+Added pkgsrc completions
 
---- bash_completion.orig	2013-04-05 10:55:51.000000000 +0000
+--- bash_completion.orig	2018-03-17 08:32:34.000000000 +0000
 +++ 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
-@@ -1365,6 +1365,34 @@ _terms()
+@@ -1402,6 +1402,11 @@ _terms()
      extract patch configure build install reinstall deinstall clean
      clean-depends kernel buildworld' make
  
 +# a little help for NetBSD pkgsrc users
-+[[ $OSTYPE = *netbsd* ]] && complete -W 'index search fetch fetch-list \
-+	extract patch configure build install reinstall \
-+	deinstall package clean clean-depends' make
-+
-+
-+[[ $OSTYPE = *netbsd* ]] && {
-+# NetBSD package management tool completion
-+#
-+_pkg_delete()
-+{
-+	local cur pkgdir prev
-+
-+	pkgdir=${PKG_DBDIR:-/var/db/pkg}/
-+	cur=`_get_cword`
-+	prev=${COMP_WORDS[COMP_CWORD-1]}
-+
-+	[ "$prev" = "-o" -o "$prev" = "-p" -o "$prev" = "-W" ] && return 0
-+
-+	COMPREPLY=( $( compgen -d $pkgdir$cur ) )
-+	COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
-+
-+	return 0
-+}
-+complete -F _pkg_delete $dirnames pkg_delete pkg_info
-+have pkg_deinstall && complete -F _pkg_delete $dirnames pkg_deinstall
-+}
++[[ $OSTYPE = *netbsd* ]] && complete -W 'index search fetch fetch-list
++       extract patch configure build install reinstall
++       deinstall package clean clean-depends' make
 +
  # This function provides simple user@host completion
  #
diff --git a/shells/bash-completion/patches/patch-completions_man b/shells/bash-completion/patches/patch-completions_man
deleted file mode 100644
index facf7435669..00000000000
--- a/shells/bash-completion/patches/patch-completions_man
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-completions_man,v 1.1 2013/05/10 12:01:51 imil Exp $
-
-Added NetBSD for man completion
-
---- completions/man.orig	2013-04-05 10:55:51.000000000 +0000
-+++ completions/man
-@@ -1,6 +1,6 @@
- # man(1) completion                                        -*- shell-script -*-
- 
--[[ $OSTYPE == *@(darwin|freebsd|solaris|cygwin|openbsd)* ]] || _userland GNU \
-+[[ $OSTYPE == *@(darwin|freebsd|solaris|cygwin|openbsd|netbsd)* ]] || _userland GNU \
-     || return 1
- 
- _man()
diff --git a/shells/bash-completion/patches/patch-completions_pkg__delete b/shells/bash-completion/patches/patch-completions_pkg__delete
new file mode 100644
index 00000000000..e793b575b7f
--- /dev/null
+++ b/shells/bash-completion/patches/patch-completions_pkg__delete
@@ -0,0 +1,14 @@
+$NetBSD: patch-completions_pkg__delete,v 1.1 2018/10/19 20:28:25 leot Exp $
+
+Added pkg_install completions
+
+--- completions/pkg_delete.orig	2018-03-17 08:32:34.000000000 +0000
++++ completions/pkg_delete
+@@ -1,6 +1,6 @@
+ # bash completion for FreeBSD package management tools     -*- shell-script -*-
+ 
+-[[ $OSTYPE == *freebsd* ]] || return 1
++[[ $OSTYPE == *@(free|net)bsd* ]] || return 1
+ 
+ _pkg_delete()
+ {