Updated bash-completion to 2.1

An extensive changelog is readable here:

http://bash-completion.alioth.debian.org/files/CHANGES-1.1
http://bash-completion.alioth.debian.org/files/CHANGES-1.2
http://bash-completion.alioth.debian.org/files/CHANGES-1.3
http://bash-completion.alioth.debian.org/files/CHANGES-2.0
http://bash-completion.alioth.debian.org/files/CHANGES-2.1

6 files changed, 648 insertions, 135 deletions

diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 36d9676f40c..54948472b7b 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2013/04/06 19:42:42 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2013/05/10 12:01:50 imil 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-1.0
-PKGREVISION=	1
+DISTNAME=	bash-completion-2.1
 CATEGORIES=	shells
 MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
 
@@ -15,31 +14,28 @@ HOMEPAGE=	http://bash-completion.alioth.debian.org/
 COMMENT=	Programmable completion specifications for bash
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	bash:run
+USE_TOOLS+=	bash:run gmake
 
 USE_LANGUAGES=	# none
-
-INSTALLATION_DIRS=	bin share/bash-completion
-INSTALLATION_DIRS+=	share/bash-completion.d
-INSTALLATION_DIRS+=	share/doc/bash-completion
+GNU_CONFIGURE=	yes
 
 SUBST_CLASSES+=		path
 SUBST_SED.path+=	-e "s,/etc/bash_completion.d,${PREFIX}/share/bash-completion.d,g"
 SUBST_SED.path+=	-e "s,/etc/bash_completion,${PREFIX}/share/bash-completion/bash_completion,g"
 SUBST_STAGE.path=	pre-build
-SUBST_FILES.path+=	bash_completion* README
+SUBST_FILES.path+=	README
 SUBST_MESSAGE.path=	Fixing path to completion files.
 
-do-build:
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DESTDIR}${PREFIX}/share/doc/bash-completion
-	${INSTALL_DATA} ${WRKSRC}/bash_completion \
-		${DESTDIR}${PREFIX}/share/bash-completion
-	${INSTALL_DATA} ${WRKSRC}/bash_completion.sh \
-		${DESTDIR}${PREFIX}/share/bash-completion
-	${INSTALL_DATA} ${WRKSRC}/contrib/* \
-	    ${DESTDIR}${PREFIX}/share/bash-completion.d
+#do-build:
+
+#do-install:
+#	${INSTALL_DATA} ${WRKSRC}/README \
+#		${DESTDIR}${PREFIX}/share/doc/bash-completion
+#	${INSTALL_DATA} ${WRKSRC}/bash_completion \
+#		${DESTDIR}${PREFIX}/share/bash-completion
+#	${INSTALL_DATA} ${WRKSRC}/bash_completion.sh \
+#		${DESTDIR}${PREFIX}/share/bash-completion
+#	${INSTALL_DATA} ${WRKSRC}/contrib/* \
+#	    ${DESTDIR}${PREFIX}/share/bash-completion.d
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash-completion/PLIST b/shells/bash-completion/PLIST
index 9bdb6ed4e93..bf9edc740a8 100644
--- a/shells/bash-completion/PLIST
+++ b/shells/bash-completion/PLIST
@@ -1,48 +1,572 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/25 12:29:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/05/10 12:01:51 imil Exp $
+etc/profile.d/bash_completion.sh
 share/bash-completion/bash_completion
-share/bash-completion/bash_completion.sh
-share/bash-completion.d/_subversion
-share/bash-completion.d/apache2ctl
-share/bash-completion.d/bitkeeper
-share/bash-completion.d/bittorrent
-share/bash-completion.d/brctl
-share/bash-completion.d/cksfv
-share/bash-completion.d/clisp
-share/bash-completion.d/cowsay
-share/bash-completion.d/cpan2dist
-share/bash-completion.d/dsniff
-share/bash-completion.d/freeciv
-share/bash-completion.d/gcl
-share/bash-completion.d/gkrellm
-share/bash-completion.d/gnatmake
-share/bash-completion.d/gpg2
-share/bash-completion.d/harbour
-share/bash-completion.d/isql
-share/bash-completion.d/larch
-share/bash-completion.d/lilypond
-share/bash-completion.d/lisp
-share/bash-completion.d/lzma
-share/bash-completion.d/lzop
-share/bash-completion.d/mailman
-share/bash-completion.d/mcrypt
-share/bash-completion.d/minicom
-share/bash-completion.d/modules
-share/bash-completion.d/monodevelop
-share/bash-completion.d/mtx
-share/bash-completion.d/net-tools
-share/bash-completion.d/p4
-share/bash-completion.d/povray
-share/bash-completion.d/qdbus
-share/bash-completion.d/qemu
-share/bash-completion.d/quota-tools
-share/bash-completion.d/rdesktop
-share/bash-completion.d/ri
-share/bash-completion.d/sbcl
-share/bash-completion.d/sitecopy
-share/bash-completion.d/snownews
-share/bash-completion.d/ssh
-share/bash-completion.d/svk
-share/bash-completion.d/unace
-share/bash-completion.d/unrar
-share/bash-completion.d/vncviewer
-share/doc/bash-completion/README
+share/bash-completion/completions/a2x
+share/bash-completion/completions/abook
+share/bash-completion/completions/aclocal
+share/bash-completion/completions/aclocal-1.11
+share/bash-completion/completions/acpi
+share/bash-completion/completions/add_members
+share/bash-completion/completions/alias
+share/bash-completion/completions/alpine
+share/bash-completion/completions/alternatives
+share/bash-completion/completions/animate
+share/bash-completion/completions/ant
+share/bash-completion/completions/apache2ctl
+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/arch
+share/bash-completion/completions/arm-koji
+share/bash-completion/completions/arping
+share/bash-completion/completions/arpspoof
+share/bash-completion/completions/asciidoc
+share/bash-completion/completions/asciidoc.py
+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.11
+share/bash-completion/completions/autoreconf
+share/bash-completion/completions/autorpm
+share/bash-completion/completions/autoscan
+share/bash-completion/completions/autossh
+share/bash-completion/completions/autoupdate
+share/bash-completion/completions/avctrl
+share/bash-completion/completions/badblocks
+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/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/cdrecord
+share/bash-completion/completions/cfagent
+share/bash-completion/completions/cfrun
+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/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
+share/bash-completion/completions/civserver
+share/bash-completion/completions/cksfv
+share/bash-completion/completions/cleanarch
+share/bash-completion/completions/clisp
+share/bash-completion/completions/clone_member
+share/bash-completion/completions/clzip
+share/bash-completion/completions/co
+share/bash-completion/completions/colormake
+share/bash-completion/completions/compare
+share/bash-completion/completions/compgen
+share/bash-completion/completions/complete
+share/bash-completion/completions/composite
+share/bash-completion/completions/config_list
+share/bash-completion/completions/configure
+share/bash-completion/completions/conjure
+share/bash-completion/completions/convert
+share/bash-completion/completions/cowsay
+share/bash-completion/completions/cowthink
+share/bash-completion/completions/cpan2dist
+share/bash-completion/completions/cpio
+share/bash-completion/completions/cppcheck
+share/bash-completion/completions/createdb
+share/bash-completion/completions/crontab
+share/bash-completion/completions/cryptsetup
+share/bash-completion/completions/curl
+share/bash-completion/completions/cvs
+share/bash-completion/completions/cvsps
+share/bash-completion/completions/dcop
+share/bash-completion/completions/dd
+share/bash-completion/completions/declare
+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
+share/bash-completion/completions/dpkg-deb
+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/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/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/faillog
+share/bash-completion/completions/fbgs
+share/bash-completion/completions/fbi
+share/bash-completion/completions/feh
+share/bash-completion/completions/file
+share/bash-completion/completions/file-roller
+share/bash-completion/completions/filebucket
+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/freeciv-gtk2
+share/bash-completion/completions/freeciv-sdl
+share/bash-completion/completions/freeciv-server
+share/bash-completion/completions/freeciv-xaw
+share/bash-completion/completions/function
+share/bash-completion/completions/fusermount
+share/bash-completion/completions/g++
+share/bash-completion/completions/g4
+share/bash-completion/completions/g77
+share/bash-completion/completions/gcc
+share/bash-completion/completions/gcj
+share/bash-completion/completions/gcl
+share/bash-completion/completions/gdb
+share/bash-completion/completions/genaliases
+share/bash-completion/completions/gendiff
+share/bash-completion/completions/genisoimage
+share/bash-completion/completions/getent
+share/bash-completion/completions/gkrellm
+share/bash-completion/completions/gkrellm2
+share/bash-completion/completions/gmake
+share/bash-completion/completions/gmplayer
+share/bash-completion/completions/gnatmake
+share/bash-completion/completions/gnome-mplayer
+share/bash-completion/completions/gnumake
+share/bash-completion/completions/gpasswd
+share/bash-completion/completions/gpc
+share/bash-completion/completions/gpg
+share/bash-completion/completions/gpg2
+share/bash-completion/completions/gphoto2
+share/bash-completion/completions/gprof
+share/bash-completion/completions/groupadd
+share/bash-completion/completions/groupdel
+share/bash-completion/completions/groupmems
+share/bash-completion/completions/groupmod
+share/bash-completion/completions/growisofs
+share/bash-completion/completions/grpck
+share/bash-completion/completions/gzip
+share/bash-completion/completions/hciattach
+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/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
+share/bash-completion/completions/idn
+share/bash-completion/completions/ifdown
+share/bash-completion/completions/ifstatus
+share/bash-completion/completions/iftop
+share/bash-completion/completions/ifup
+share/bash-completion/completions/import
+share/bash-completion/completions/info
+share/bash-completion/completions/inject
+share/bash-completion/completions/insmod
+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
+share/bash-completion/completions/ipsec
+share/bash-completion/completions/iptables
+share/bash-completion/completions/ipv6calc
+share/bash-completion/completions/iscsiadm
+share/bash-completion/completions/isql
+share/bash-completion/completions/iwconfig
+share/bash-completion/completions/iwlist
+share/bash-completion/completions/iwpriv
+share/bash-completion/completions/iwspy
+share/bash-completion/completions/jar
+share/bash-completion/completions/jarsigner
+share/bash-completion/completions/java
+share/bash-completion/completions/javac
+share/bash-completion/completions/javadoc
+share/bash-completion/completions/javaws
+share/bash-completion/completions/jps
+share/bash-completion/completions/k3b
+share/bash-completion/completions/kcov
+share/bash-completion/completions/kill
+share/bash-completion/completions/killall
+share/bash-completion/completions/kldload
+share/bash-completion/completions/kldunload
+share/bash-completion/completions/koji
+share/bash-completion/completions/kplayer
+share/bash-completion/completions/ktutil
+share/bash-completion/completions/l2ping
+share/bash-completion/completions/larch
+share/bash-completion/completions/lastlog
+share/bash-completion/completions/lbzip2
+share/bash-completion/completions/ldapadd
+share/bash-completion/completions/ldapcompare
+share/bash-completion/completions/ldapdelete
+share/bash-completion/completions/ldapmodify
+share/bash-completion/completions/ldapmodrdn
+share/bash-completion/completions/ldappasswd
+share/bash-completion/completions/ldapsearch
+share/bash-completion/completions/ldapvi
+share/bash-completion/completions/ldapwhoami
+share/bash-completion/completions/lftp
+share/bash-completion/completions/lftpget
+share/bash-completion/completions/lilo
+share/bash-completion/completions/links
+share/bash-completion/completions/lintian
+share/bash-completion/completions/lintian-info
+share/bash-completion/completions/lisp
+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/lua
+share/bash-completion/completions/luac
+share/bash-completion/completions/luseradd
+share/bash-completion/completions/luserdel
+share/bash-completion/completions/lusermod
+share/bash-completion/completions/lvchange
+share/bash-completion/completions/lvcreate
+share/bash-completion/completions/lvdisplay
+share/bash-completion/completions/lvextend
+share/bash-completion/completions/lvm
+share/bash-completion/completions/lvmdiskscan
+share/bash-completion/completions/lvreduce
+share/bash-completion/completions/lvremove
+share/bash-completion/completions/lvrename
+share/bash-completion/completions/lvresize
+share/bash-completion/completions/lvs
+share/bash-completion/completions/lvscan
+share/bash-completion/completions/lzip
+share/bash-completion/completions/lzma
+share/bash-completion/completions/lzop
+share/bash-completion/completions/macof
+share/bash-completion/completions/mailmanctl
+share/bash-completion/completions/mailsnarf
+share/bash-completion/completions/make
+share/bash-completion/completions/makepkg
+share/bash-completion/completions/man
+share/bash-completion/completions/mc
+share/bash-completion/completions/mcrypt
+share/bash-completion/completions/mdadm
+share/bash-completion/completions/mdecrypt
+share/bash-completion/completions/mdtool
+share/bash-completion/completions/medusa
+share/bash-completion/completions/mencoder
+share/bash-completion/completions/mii-diag
+share/bash-completion/completions/mii-tool
+share/bash-completion/completions/minicom
+share/bash-completion/completions/mkinitrd
+share/bash-completion/completions/mkisofs
+share/bash-completion/completions/mktemp
+share/bash-completion/completions/mmsitepass
+share/bash-completion/completions/modinfo
+share/bash-completion/completions/modprobe
+share/bash-completion/completions/mogrify
+share/bash-completion/completions/monodevelop
+share/bash-completion/completions/montage
+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/msgsnarf
+share/bash-completion/completions/msynctool
+share/bash-completion/completions/mtx
+share/bash-completion/completions/munin-node-configure
+share/bash-completion/completions/munin-run
+share/bash-completion/completions/munin-update
+share/bash-completion/completions/munindoc
+share/bash-completion/completions/mussh
+share/bash-completion/completions/mutt
+share/bash-completion/completions/muttng
+share/bash-completion/completions/mysql
+share/bash-completion/completions/mysqladmin
+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/nslookup
+share/bash-completion/completions/ntpdate
+share/bash-completion/completions/openssl
+share/bash-completion/completions/opera
+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/pdlzip
+share/bash-completion/completions/perl
+share/bash-completion/completions/perldoc
+share/bash-completion/completions/pgrep
+share/bash-completion/completions/phing
+share/bash-completion/completions/pidof
+share/bash-completion/completions/pigz
+share/bash-completion/completions/pine
+share/bash-completion/completions/pinfo
+share/bash-completion/completions/ping
+share/bash-completion/completions/ping6
+share/bash-completion/completions/pkg-config
+share/bash-completion/completions/pkg-get
+share/bash-completion/completions/pkg_deinstall
+share/bash-completion/completions/pkg_delete
+share/bash-completion/completions/pkg_info
+share/bash-completion/completions/pkgadd
+share/bash-completion/completions/pkgrm
+share/bash-completion/completions/pkgtool
+share/bash-completion/completions/pkgutil
+share/bash-completion/completions/pkill
+share/bash-completion/completions/plague-client
+share/bash-completion/completions/plzip
+share/bash-completion/completions/pm-hibernate
+share/bash-completion/completions/pm-is-supported
+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/portinstall
+share/bash-completion/completions/portupgrade
+share/bash-completion/completions/postalias
+share/bash-completion/completions/postcat
+share/bash-completion/completions/postconf
+share/bash-completion/completions/postfix
+share/bash-completion/completions/postmap
+share/bash-completion/completions/postsuper
+share/bash-completion/completions/povray
+share/bash-completion/completions/ppc-koji
+share/bash-completion/completions/prelink
+share/bash-completion/completions/protoc
+share/bash-completion/completions/psql
+share/bash-completion/completions/puppet
+share/bash-completion/completions/puppetca
+share/bash-completion/completions/puppetd
+share/bash-completion/completions/puppetdoc
+share/bash-completion/completions/puppetmasterd
+share/bash-completion/completions/puppetqd
+share/bash-completion/completions/puppetrun
+share/bash-completion/completions/pvchange
+share/bash-completion/completions/pvcreate
+share/bash-completion/completions/pvdisplay
+share/bash-completion/completions/pvmove
+share/bash-completion/completions/pvremove
+share/bash-completion/completions/pvs
+share/bash-completion/completions/pvscan
+share/bash-completion/completions/pwck
+share/bash-completion/completions/pwd
+share/bash-completion/completions/pwdx
+share/bash-completion/completions/pwgen
+share/bash-completion/completions/pxz
+share/bash-completion/completions/pydoc
+share/bash-completion/completions/pydoc3
+share/bash-completion/completions/pylint
+share/bash-completion/completions/python
+share/bash-completion/completions/python2
+share/bash-completion/completions/python3
+share/bash-completion/completions/qdbus
+share/bash-completion/completions/qemu
+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/ralsh
+share/bash-completion/completions/rcs
+share/bash-completion/completions/rcsdiff
+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
+share/bash-completion/completions/rmmod
+share/bash-completion/completions/route
+share/bash-completion/completions/rpcdebug
+share/bash-completion/completions/rpm
+share/bash-completion/completions/rpm2targz
+share/bash-completion/completions/rpm2tgz
+share/bash-completion/completions/rpm2txz
+share/bash-completion/completions/rpmbuild
+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
+share/bash-completion/completions/sbopkg
+share/bash-completion/completions/scp
+share/bash-completion/completions/screen
+share/bash-completion/completions/sdptool
+share/bash-completion/completions/setquota
+share/bash-completion/completions/sftp
+share/bash-completion/completions/sh
+share/bash-completion/completions/sitecopy
+share/bash-completion/completions/slackpkg
+share/bash-completion/completions/slapt-get
+share/bash-completion/completions/slapt-src
+share/bash-completion/completions/slogin
+share/bash-completion/completions/smartctl
+share/bash-completion/completions/smbcacls
+share/bash-completion/completions/smbclient
+share/bash-completion/completions/smbcquotas
+share/bash-completion/completions/smbget
+share/bash-completion/completions/smbpasswd
+share/bash-completion/completions/smbtar
+share/bash-completion/completions/smbtree
+share/bash-completion/completions/snownews
+share/bash-completion/completions/sparc-koji
+share/bash-completion/completions/spovray
+share/bash-completion/completions/sqlite3
+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/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/sysbench
+share/bash-completion/completions/sysctl
+share/bash-completion/completions/tar
+share/bash-completion/completions/tcpdump
+share/bash-completion/completions/tcpkill
+share/bash-completion/completions/tcpnice
+share/bash-completion/completions/tightvncviewer
+share/bash-completion/completions/tracepath
+share/bash-completion/completions/tracepath6
+share/bash-completion/completions/tshark
+share/bash-completion/completions/tune2fs
+share/bash-completion/completions/typeset
+share/bash-completion/completions/umount
+share/bash-completion/completions/umount.linux
+share/bash-completion/completions/unace
+share/bash-completion/completions/unpack200
+share/bash-completion/completions/unrar
+share/bash-completion/completions/unshunt
+share/bash-completion/completions/update-alternatives
+share/bash-completion/completions/update-rc.d
+share/bash-completion/completions/upgradepkg
+share/bash-completion/completions/urlsnarf
+share/bash-completion/completions/useradd
+share/bash-completion/completions/userdel
+share/bash-completion/completions/usermod
+share/bash-completion/completions/valgrind
+share/bash-completion/completions/vgcfgbackup
+share/bash-completion/completions/vgcfgrestore
+share/bash-completion/completions/vgchange
+share/bash-completion/completions/vgck
+share/bash-completion/completions/vgconvert
+share/bash-completion/completions/vgcreate
+share/bash-completion/completions/vgdisplay
+share/bash-completion/completions/vgexport
+share/bash-completion/completions/vgextend
+share/bash-completion/completions/vgimport
+share/bash-completion/completions/vgmerge
+share/bash-completion/completions/vgmknodes
+share/bash-completion/completions/vgreduce
+share/bash-completion/completions/vgremove
+share/bash-completion/completions/vgrename
+share/bash-completion/completions/vgs
+share/bash-completion/completions/vgscan
+share/bash-completion/completions/vgsplit
+share/bash-completion/completions/vigr
+share/bash-completion/completions/vipw
+share/bash-completion/completions/vmstat
+share/bash-completion/completions/vncviewer
+share/bash-completion/completions/vpnc
+share/bash-completion/completions/watch
+share/bash-completion/completions/webmitm
+share/bash-completion/completions/wget
+share/bash-completion/completions/whatis
+share/bash-completion/completions/wine
+share/bash-completion/completions/withlist
+share/bash-completion/completions/wodim
+share/bash-completion/completions/wol
+share/bash-completion/completions/wsimport
+share/bash-completion/completions/wtf
+share/bash-completion/completions/wvdial
+share/bash-completion/completions/xfreerdp
+share/bash-completion/completions/xgamma
+share/bash-completion/completions/xhost
+share/bash-completion/completions/xm
+share/bash-completion/completions/xmllint
+share/bash-completion/completions/xmlwf
+share/bash-completion/completions/xmms
+share/bash-completion/completions/xmodmap
+share/bash-completion/completions/xpovray
+share/bash-completion/completions/xrandr
+share/bash-completion/completions/xrdb
+share/bash-completion/completions/xsltproc
+share/bash-completion/completions/xvnc4viewer
+share/bash-completion/completions/xxd
+share/bash-completion/completions/xz
+share/bash-completion/completions/xzdec
+share/bash-completion/completions/ypcat
+share/bash-completion/completions/ypmatch
+share/bash-completion/completions/yum-arch
+share/bash-completion/helpers/perl
+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 e92971c3f05..e777a9007eb 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/09/25 12:29:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2013/05/10 12:01:51 imil Exp $
 
-SHA1 (bash-completion-1.0.tar.gz) = 61040795731f5ff509c46e818a1edf0a7a93e11d
-RMD160 (bash-completion-1.0.tar.gz) = b590c2633c5c10c3e98b14a74f4e96c910b6177d
-Size (bash-completion-1.0.tar.gz) = 143578 bytes
-SHA1 (patch-aa) = 6c6685a3fa99c2e0585843a1138a225b2c2ea537
+SHA1 (bash-completion-2.1.tar.gz) = fad16b1cdae2b40d6814f786990e0e50ab2d537a
+RMD160 (bash-completion-2.1.tar.gz) = a2d42658f2f6a77563614a4a733c95c57bb42cfc
+Size (bash-completion-2.1.tar.gz) = 341139 bytes
+SHA1 (patch-bash__completion) = 6edb8da01fe6252cc2fabb397736e32c00e5a1a6
+SHA1 (patch-completions_man) = 336d45f3567c6e69736e5cd41230874cdcb0ca56
diff --git a/shells/bash-completion/patches/patch-aa b/shells/bash-completion/patches/patch-aa
deleted file mode 100644
index 42c6fc29d6f..00000000000
--- a/shells/bash-completion/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/25 12:29:27 wiz Exp $
-
---- bash_completion.orig	2009-04-02 20:01:39.000000000 +0000
-+++ bash_completion
-@@ -724,6 +724,11 @@ complete -F _complete complete
- 	extract patch configure build install reinstall \
- 	deinstall clean clean-depends kernel buildworld' make
- 
-+# a little help for NetBSD pkgsrc users
-+[ $UNAME = NetBSD ] && complete -W 'index search fetch fetch-list \
-+	extract patch configure build install reinstall \
-+	deinstall package clean clean-depends' make
-+
- # This completes on a list of all available service scripts for the
- # 'service' command and/or the SysV init.d directory, followed by
- # that script's available commands
-@@ -941,7 +946,7 @@ complete -F _insmod $filenames insmod mo
- #
- [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
-   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
--  -o $UNAME = OpenBSD ] &&
-+  -o $UNAME = OpenBSD -o $UNAME = NetBSD ] &&
- _man()
- {
- 	local cur prev sect manpath manext mansect UNAME
-@@ -1013,7 +1018,7 @@ _man()
- }
- [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
-   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
--  -o $UNAME = OpenBSD ] && \
-+  -o $UNAME = OpenBSD -o $UNAME = NetBSD ] && \
- complete -F _man $filenames man apropos whatis
- 
- # renice(8) completion
-@@ -5627,6 +5632,28 @@ _links()
- } &&
- complete -F _links $filenames links
- 
-+[ $UNAME = 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
-+}
-+
- [ $UNAME = FreeBSD ] && {
- # FreeBSD package management tool completion
- #
diff --git a/shells/bash-completion/patches/patch-bash__completion b/shells/bash-completion/patches/patch-bash__completion
new file mode 100644
index 00000000000..7a6769ee111
--- /dev/null
+++ b/shells/bash-completion/patches/patch-bash__completion
@@ -0,0 +1,41 @@
+$NetBSD: patch-bash__completion,v 1.1 2013/05/10 12:01:51 imil Exp $
+
+Added pkgsrc and pkg_install completions
+
+--- bash_completion.orig	2013-04-05 10:55:51.000000000 +0000
++++ bash_completion
+@@ -1365,6 +1365,34 @@ _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
++}
++
+ # This function provides simple user@host completion
+ #
+ _user_at_host()
diff --git a/shells/bash-completion/patches/patch-completions_man b/shells/bash-completion/patches/patch-completions_man
new file mode 100644
index 00000000000..facf7435669
--- /dev/null
+++ b/shells/bash-completion/patches/patch-completions_man
@@ -0,0 +1,14 @@
+$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()