Update to 1.0. Fix paths so that inclusion works without setting

additional environment variables.

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.

bash-completion (1.0)

  [ Guillaume Rousse ]
  * Make bibtex complete on .aux files
  * Add .xvid and .XVID to player completion
  * Added cowsay/cowthink completion
  * Added brctl completion
  * Added cpan2dist completion
  * Added qemu completion
  * Added net-tools (mii-tool and mii-diag) completions
  * Added minicom completion
  * Added quota-tools completion
  * Added rdesktop completion
  * Added tightvncviewer completion
  * Cleanup screen completion, and make it completes on options

  [ David Paleino ]
  * Added .kar to Timidity completion.
  * Fix killall completion, remove trailing ":" on certain process
    names
  * Fix man -l completing filenames (Debian: #497074)
  * (Partly) fixed java classes completion (Debian: #496828). Look for
    FIXME in source.
  * Dump to /dev/null error message from look(1) with no arguments
    (Debian: #495142)
  * Set ssh as default for rsync (was rsh) (Debian: #492328)
  * Added .oga, .ogv, .ogx to mplayer completion (Debian: #496162)
  * Added .epub to unzip|zipinfo completion (Debian: #492476)
  * Added ssh-copy-id completion (Debian: #491856)
  * Moved ssh completion to separate file (Debian: #360628)
  * Bogus completion when mounting subdirs fixed (Debian: #322238)
  * Fix `apt-cache showsrc` completing only on source package names
    (Debian: #361535)
  * Fixed bugs with gdb completion:
    - when an empty directory is in $PATH (thanks to Morita Sho)
      (Debian: #497597)
    - when a non-existing directory is in $PATH (Debian: #499780)
  * Fix missing completion for "-n" and "-e" (we were using echo, now
    using printf) (thanks to Morita Sho) (Debian: #498105)
  * Fixed gpg completion:
    - --@(export|@(?(l|nr|nrl)sign|edit)-key)) (Debian: #500316)
    - -@(r|-recipient))
  * Fixed .cb[rz] completion for evince (Debian: #502885)
  * Added gksudo, gksu, kdesudo completion
  * Added apache2ctl completion
  * Added gpg2 completion (Debian: #489927)
  * Fixed mplayer -skin completion (Debian: #501473)
  * Fixed errors with POSIX enabled (Debian: #502804)
  * Fixed dpkg-source wrong exit() with return() (Debian: #)
  * Added --schedule-only to aptitude's completion (Debian: #502664)
  * Added build-dep to aptitude's completion (Debian: #495883)
  * Added support for `-F configfile' to _known_hosts(), ssh, scp and
    sftp, thanks to Freddy Vulto (Debian: #504141)
  * Fixed sed quoting bug in _known_hosts(), thanks to Freddy Vulto
    (Debian: #504650)
  * Allow `Host(Name)' in ssh config file to be indented
  * Allow `Host(Name)' in ssh config file to have trailing comment.
  * Allow for comments in known_hosts files (Debian: #511789)
  * Fixed perl -I/-x completion, thanks to Freddy Vulto
    (Debian: #504547)
  * README updated: explain how to use bash-completion correctly.
    (Debian: #506560)
  * TODO updated: the Alioth team is now upstream.
  * Added qdbus completion, thanks to Terence Simpson (Ubuntu: #257903)
  * Added monodevelop and mdtool completions.
  * Split subversion-related completions to contrib/_subversion
    (prefixed with _ to avoid file conflicts with upstream's one)
  * Fixed completion of environment variables, thanks to Morita Sho
    (Debian: #272660)
  * Fix dpkg completion bug: it listed only non-Essential packages
    (Debian: #511790)
  * Fixed _dpkg_source completion (Debian: #503317)
  * Added _parse_help() to try to parse options listed in $command
    --help
  * Fixed gzip completion to use _parse_help(), since the available
    options vary with distributions
  * Added to_review/ directory, where completions needing a review would
    go. After it gets accepted, the completion would go into contrib/.
  * Remove unused UNAME local variable in _info() (Debian: #501843)
  * AUTHORS added
  * Make _alias() use _get_cword
  * Added .zip to jar completions (Debian: #521041)
  * Merge from Gentoo:
    - fix 'find' completion so that it properly completes on -?(i)whilename.
      Patch by Ciaran McCreesh.
    - use make -qp to parse the Makefile for us, so we get proper completion
      on things like pattern rules. Patch by Mike Kelly <pioto@exherbo.org>.
    - complete on gkrellm2 as well. Patch by Aaron Walker.
    - fix CVS completion
  * Merge from Ubuntu:
    - consume error messages in configure completion (Ubuntu: #223882)
      (Mika Fischer)
    - quote $xspec in _filedir_xspec in case it is empty, which would
      cause errors if there was no match under failglob. (Ubuntu: #194419)
      (Mika Fischer)
  * debian/links fixed (Debian: #494292)
  * debian/control:
    - fixed typo in the long description
    - added Vcs-* fields
  * debian/install:
    - correctly install contrib/* under /etc/bash_completion.d/
  * debian/copyright updated
  * extra/dh_bash-completion:
    - updated to support a list of files in debian/<package>.bash-completion
      (Debian: #512917)

  [ Ville Skyttä ]
  * Added JPEG 2000 files to display completion, thanks to Bastien Nocera
    (RedHat: #304771)
  * Improved rpm macro completion.
  * Added -E to rpm completion.
  * Improved rpm backup file avoidance.
  * Improved /var/log/rpmpkgs based rpm installed package completion.
  * Improved performance of rpm -qa based rpm installed package completion.
  * Improved features and performance of yum completion.
  * Added support for p (POSIX) and x (x.org) man sections.
  * Improved filename based man page completion.
  * Added minimal sqlite3 completion.
  * Improved getent completion (Ville Skyttä, Guillaume Rousse).
  * (Re)fix gzip and bzip2 options completion.
  * Improved svn filename completion (RedHat: #430059).
  * Add lzma completion (Per Øyvind Karlsen, Ville Skyttä).
  * Add .mp2 and .vdr to mplayer completion (RedHat: #444467).
  * Add .mkv, .mp2 and .vdr to *xine completion (RedHat: #444467).
  * Added lzop completion.
  * Fix scp metacharacter escaping.
  * Remove duplicate cpio completion, thanks to Freddy Vulto (Debian: #512823)
  * Fix awk error in "modprobe -r /" completion (Debian: #512556).
  * Expand ~foo to dir name more eagerly to avoid quoting issues.
  * Fix -sourcepath handling in javadoc packages completion.
  * Extract process name completion from _killall to _pnames, make it work
    for others than Linux and FreeBSD.
  * Fix process name completion with relative paths (RedHat: #484578).
  * Use improved process name completion in pgrep in addition to killall.
  * Enable pgrep and pkill completion if the commands are available, not just
    on Linux and FreeBSD.
  * Drop hg completion, an improved version is shipped with Mercurial
    (contrib/bash_completion in the tarball).
  * Make okular complete on same files as evince, thanks to Mary Ellen Foster
    (RedHat: #486998).
  * Apply ps2pdf completion to ps2pdf{12,13,14,wr} too.
  * Simplify bash_completion.sh, return earlier in non-applicable environments.
  * Remove obsolete --buildarch and --buildos rpm(build) completions.
  * Add rpmbuild --target completion.
  * Use "-profile help" to get mplayer and friends -profile completions.
  * Fix local array initialization under bash 3.0, prevents "()" occurring in
    file and dir name completions.

  [ Freddy Vulto ]
  * Restored `_display()' completion for `display' by removing
    completion-by-extension for `display' (Alioth#311429)
  * Removed duplicate completion option `-borderwidth' for `display'
  * Prevent completion dir from being sourced twice if
    BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433)
  * Make `_mii-tool()' and `_mii-diag()' POSIX-compliant
  * Fix _isql completion waiting for grep input if $ODBCINI not set; handle
    whitespace in $ODBCINI.
  * Split vncviewer completion in _tightvncviewer() and _xvnc4viewer()
    Added _realcommand() global function.

  [ Jakob Unterwurzacher ]
  * ps2pdf can run on .pdf files as well. (Debian: #516614, Ubuntu: #316943)

  [ Santiago M. Mola ]
  * Add .ape to mplayer supported extensions (Alioth#311510).

 -- David Paleino <d.paleino@gmail.com>  Wed, 25 Mar 2009 23:18:24 +0100

bash-completion (20080705) unstable; urgency=low

  [ David Paleino ]
  * Added more completions to imagemagick (thanks to Nelson A. de
    Oliveira) (Debian: #487786)
  * Added xrandr completion (thanks to Anton Khirnov) (Debian: #487825)
  * Improving _gdb completion:
    - $filenames to $default (Debian: #463969)
    - also show directory names (i.e. compgen -d) in COMPREPLY.
    - added . to $PATH, to allow debugging "local" executables.
    - do not complete Bash's builtins (thanks to Morita Sho)

  [ Luk Claes ]
  * Remove use of ucf for /etc/bash-completion (Debian: #488171).

 -- Luk Claes <luk@debian.org>  Sat, 05 Jul 2008 16:14:15 +0200

bash-completion (20080617.5) unstable; urgency=medium

  * Revert way of setting environment variables (Debian: #487774).
  * Add equals sign to _get_cword for mutt_aliases (Debian: #482635).
  * Enhance mlayer completion (Debian: #487826, #487838).

 -- Luk Claes <luk@debian.org>  Tue, 24 Jun 2008 19:50:57 +0200

bash-completion (20080617.4) experimental; urgency=low

  [ David Paleino ]
  * Merged Ubuntu changes:
    - added quote(), quote_readline(), dequote() helper functions.
    - added _remove_word()
    - fixed _get_cword()
    - refactored _filedir using quote_readline()
    - refactored _filedir_xspec using quote_readline()
    - fixed COMPREPLY's in _iwconfig
    - fixed _cvs()
    - _known_hosts(): use files from UserKnownHostsFile options in
                      addition to standard ones.
    - fixed _command() to correctly prune the command line
    - disabled completion of PostgreSQL users and databases
    - fixed _java_packages()
    - fixed _muttquery()
    - added flv/FLV completion to mplayer
    - added --installed to apt-cache
    - only complete on filenames for aspell
    - fixed code for exclusions compspecs
    - added code to gracefully handle debug options (set +/-v)

 -- Luk Claes <luk@debian.org>  Mon, 23 Jun 2008 19:25:25 +0200

bash-completion (20080617.3) unstable; urgency=low

  [ David Paleino ]
  * Fixed IFS for filedir_xspec - Thanks to Stefan Lippers-Hollmann
    (Debian: #487571)

  [ Luk Claes ]
  * Install dh-bash-completion to ease installation of completions.

 -- Luk Claes <luk@debian.org>  Mon, 23 Jun 2008 07:24:21 +0200

bash-completion (20080617.2) unstable; urgency=low

  [ David Paleino ]
  * New upstream release
    - provide a manpage for extra/dh_bash-completion
    - fix semi-serious problem with _filedir() (Debian: #487449)
  * debian/rules:
    - added rule to generate dh_bash-completion's manpage
  * debian/install, debian/dirs:
    - installing dh_bash-completion into /usr/bin
  * debian/control:
    - new package dh-bash-completion

  [ Luk Claes ]
  * Comment new package to make sure current fix gets in the archive first.
  * Add compression completion for vi(m).

 -- Luk Claes <luk@debian.org>  Sun, 22 Jun 2008 19:47:23 +0200

bash-completion (20080617.1) unstable; urgency=medium

  [ David Paleino ]
  * Urgency set to medium because the package is currently unusable.
  * New upstream sub-release
    - fixed some typos here and there which prevented bash completions
      at all (Debian: #487441).
    - really closing Debian bug #455510.

 -- Luk Claes <luk@debian.org>  Sun, 22 Jun 2008 00:22:53 +0200

bash-completion (20080617) unstable; urgency=low

  [ David Paleino ]
  * New upstream release
    - add more completions to aptitude (Debian: #432289)
    - fixed UTF-8 problem with _get_cword(), thanks to
      Andrei Paskevich (Debian: #472132)
    - fixed autoremove completion, thanks to Flavio Visentin
      (Debian: #474974)
    - cmf and CMF added to playmidi completion (Debian: #365658)
    - added rrdtool completion, thanks to Justin Pryzby (Debian: #428641)
    - added OpenDocument completion for unzip/zipinfo (.od{f,g,p,s,t})
      (Debian: #472940)
    - fixed escaping problems with job control (i.e. disown, jobs, bg,
      fg): the argument is now surrounded by "" (Debian: #347316)
    - make mkdir complete also on filenames (Debian: #376433)
    - {bz,z}{cat,cmp,diff,egrep,fgrep,grep,less,more} now should complete
      on all filenames, not just compressed archives (just commented out)
      (Debian: #455510)
    - fixes Perl completion (Debian: #470742)
    - fixes get_cword -> _get_cword typo (Debian: #478596)
    - fixes _get_cword() function to properly handle filenames with
      whitespaces (Debian: #394636, #468254, #474094)
    - added .pdf.bz2 completion to evince (Debian: #424736)
    - added .svg completion to display (Debian: #441017)
    - added .m2ts completion to mplayer (Debian: #480879)
    - added extra/dh_bash-completion to ease future rewrite of bc.
  * debian/copyright - now in a fancier machine-parsable format.
  * debian/control:
    - added myself to Uploaders
    - debhelper Build-Depends updated to >= 6.
  * debian/watch:
    - improved current watch line regex
    - added (commented out) probable future watch line
  * debian/compat bumped to 6
  * debian/dirs, debian/install and debian/links added
  * debian/rules:
    - refactored to make use of debian/{dirs,install,links}

  [ Steve Kemp ]
  * Applied patch to fix completion of umount command.
    (Debian: #470539)
  * Fixed the completion of Perl manpages.
    (Debian: #404976)
  * Added 'aif' to the filenames offed for completion for mplayer.
    (Debian: #474517)
  * Allow tsocks completion.
    (Debian: #409423)
  * Update mutt completion to handle local usernames.
    (Debian: #416655)
  * Update apt-get completion to include the flag "--no-install-recommends"
    (Debian: #475242)

 -- Luk Claes <luk@debian.org>  Sat, 21 Jun 2008 21:59:43 +0200

bash-completion (20060301-4) unstable; urgency=low

  * Add some fixes from Ubuntu:
  * Fix completion of filenames with spaces (Debian: #468254).
  * Fix parsing of SSH config files (Debian: #435117).
  * Change priority to standard (Debian: #471666).
  * Add some more completions for xine (Debian: #452083, #471249).
  * Fix completion of gzip (Debian: #351913).
  * Also use $HOSTFILE in hostname completion (Debian: #400380).

 -- Luk Claes <luk@debian.org>  Sat, 22 Mar 2008 23:10:30 +0000

bash-completion (20060301-3) unstable; urgency=low

  * Fix kpdf completion (Debian: #468163, #413374).
  * Fix completion of - or -- with _command (Debian: #415276).
  * Add sux to the complete -u list (Debian: #466089).
  * Add dvipdfm to the list of dvi programs (Debian: #396644).
  * Add --purge-unused option completion for aptitude (Debian: #438471).
  * Add divx extension completion for mplayer (Debian: #444294).
  * Add pdf.gz completion for evince (Debian: #456887).
  * Add --remove-all completion for update-alternatives (Debian: #269173).

 -- Luk Claes <luk@debian.org>  Wed, 05 Mar 2008 22:57:27 +0100

bash-completion (20060301-2) unstable; urgency=low

  * Take over the package.

 -- Luk Claes <luk@debian.org>  Wed, 27 Feb 2008 19:22:03 +0100

bash-completion (20060301-1) unstable; urgency=low

  * Upload to unstable.

 -- Matthias Klose <doko@debian.org>  Sat, 09 Feb 2008 23:18:20 +0100

bash-completion (20060301-0ubuntu2) hardy; urgency=low

  * Replace bash (<< 3.1dfsg-9), handle upgrade in preinst.
  * Exclude hashed hostnames from ssh host completion results. Debian: #428085.
  * Fix: ifup/down don't really complete. Debian: #463756.
  * Allow perl completion to complete filenames, complete -I and -x arguments.
    Debian: #443394.
  * Add find -wholename completion. Debian: #431220.
  * Handle whitespaces in $HOME for _known_hosts() completion. Debian: #414821.
  * dpkg -L: complete for removed-but-not-purged packages. Debian: #372156.
  * Complete for apt-get autoremove. Debian: #433542, #443816, #445332.
  * Update completion for mplayer (mka/flac). Debian: #340452.
  * Add ping6/fping6 completion. Debian: #413170.
  * Handle whitespace in paths for mount/umount completion. Debian: #367957.
  * apt-get: Support --auto-remove. Ubuntu: #60666.

 -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Feb 2008 23:11:32 +0100

bash-completion (20060301-0ubuntu1) hardy; urgency=low

  * Initial release, split out from the bash package.
    The software currently is unsupported upstream.
  * Don't try to set a readonly variable. Ubuntu: #149527.
  * Support purge in apt-get auto completion (Mathias Gug). Ubuntu: #151677.
  * evince: Autocomplete on cbr/cbz/djvu files. Ubuntu: #156200, #175220.
    Debian: #400678.
  * kdvi: complete .*\.dvi\.(gz|bz2). Ubuntu: #128234.
  * kpdf: Complete postscript files. Ubuntu: #162319.
  * Make completion working in the middle of a word (Adam Simpkins).
    Ubuntu: #139666.

 -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Feb 2008 16:46:34 +0100

5 files changed, 152 insertions, 43 deletions

diff --git a/shells/bash-completion/MESSAGE b/shells/bash-completion/MESSAGE
new file mode 100644
index 00000000000..75f9871006b
--- /dev/null
+++ b/shells/bash-completion/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2009/09/25 12:29:26 wiz Exp $
+
+To use this, source the included bash fragment in your startup
+files, i.e. include something like:
+
+  if [ -r ${PREFIX}/share/bash-completion/bash_completion ]; then
+    . ${PREFIX}/share/bash-completion/bash_completion
+  fi
+
+in ~/.bashrc or ~/.bash_profile.
+
+===========================================================================
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 7328e3848a4..86d6435f039 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,29 +1,45 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/25 12:29:26 wiz 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-20060301
+DISTNAME=	bash-completion-1.0
 CATEGORIES=	shells
-MASTER_SITES=	http://www.caliban.org/files/bash/
+MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.caliban.org/bash/index.shtml
+HOMEPAGE=	http://bash-completion.alioth.debian.org/
 COMMENT=	Programmable completion specifications for bash
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	bash:run
 
-WRKSRC=		${WRKDIR}/bash_completion
 USE_LANGUAGES=	# none
 
-NO_BUILD=	yes
+INSTALLATION_DIRS=	bin share/bash-completion
+INSTALLATION_DIRS+=	share/bash-completion.d
+INSTALLATION_DIRS+=	share/doc/bash-completion
 
-INSTALLATION_DIRS=	share/bash-completion/contrib share/doc/bash-completion
+SUBST_CLASSES+=		path
+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_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* ${DESTDIR}${PREFIX}/share/bash-completion
+	${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/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 f3c33303063..9bdb6ed4e93 100644
--- a/shells/bash-completion/PLIST
+++ b/shells/bash-completion/PLIST
@@ -1,32 +1,48 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:14:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/25 12:29:26 wiz Exp $
 share/bash-completion/bash_completion
 share/bash-completion/bash_completion.sh
-share/bash-completion/contrib/bitkeeper
-share/bash-completion/contrib/bittorrent
-share/bash-completion/contrib/cksfv
-share/bash-completion/contrib/clisp
-share/bash-completion/contrib/dsniff
-share/bash-completion/contrib/freeciv
-share/bash-completion/contrib/gcl
-share/bash-completion/contrib/gkrellm
-share/bash-completion/contrib/gnatmake
-share/bash-completion/contrib/harbour
-share/bash-completion/contrib/hg
-share/bash-completion/contrib/isql
-share/bash-completion/contrib/larch
-share/bash-completion/contrib/lilypond
-share/bash-completion/contrib/lisp
-share/bash-completion/contrib/mailman
-share/bash-completion/contrib/mcrypt
-share/bash-completion/contrib/modules
-share/bash-completion/contrib/mtx
-share/bash-completion/contrib/p4
-share/bash-completion/contrib/povray
-share/bash-completion/contrib/ri
-share/bash-completion/contrib/sbcl
-share/bash-completion/contrib/sitecopy
-share/bash-completion/contrib/snownews
-share/bash-completion/contrib/svk
-share/bash-completion/contrib/unace
-share/bash-completion/contrib/unrar
+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
diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
index fca8f66b37d..e92971c3f05 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/12 09:47:58 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/09/25 12:29:26 wiz Exp $
 
-SHA1 (bash-completion-20060301.tar.gz) = c99206545484c5d970803b098ce3cb84644cabc3
-RMD160 (bash-completion-20060301.tar.gz) = 12c9c11600e08f9b3547586d5a82441b1dfc290a
-Size (bash-completion-20060301.tar.gz) = 123300 bytes
+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
diff --git a/shells/bash-completion/patches/patch-aa b/shells/bash-completion/patches/patch-aa
new file mode 100644
index 00000000000..42c6fc29d6f
--- /dev/null
+++ b/shells/bash-completion/patches/patch-aa
@@ -0,0 +1,63 @@
+$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
+ #