diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2010-09-04 17:51:46 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2010-09-04 17:51:46 +0000 |
| commit | 293b2c979ed4b1ec4befb07330bf2333930d9ad3 (patch) | |
| tree | d36bca2650a44539460c850f96d537c84c614919 /shells/bash-completion-classic/files | |
| parent | Remove the transparent rewriting of USE_GCC=4.3+ to USE_GCC=4.4+. (diff) | |
Replace bash-completion with a new package.
The previous bash-completion package hadn't been updated since 2006. A
new group has picked up the package and continued development. The old
completions should remain, so I'm not going to update UPDATING.
I'm taking maintainership of this as well. Many thanks to Kirk, the
previous maintainer!
Notes
Notes:
svn path=/head/; revision=260558
Diffstat (limited to 'shells/bash-completion-classic/files')
3 files changed, 27 insertions, 25 deletions
diff --git a/shells/bash-completion-classic/files/patch-bash_completion b/shells/bash-completion-classic/files/patch-bash_completion deleted file mode 100644 index 3d06ec6850e3..000000000000 --- a/shells/bash-completion-classic/files/patch-bash_completion +++ /dev/null @@ -1,19 +0,0 @@ ---- bash_completion.old Sat Sep 23 20:42:29 2006 -+++ bash_completion Sun Sep 24 10:55:26 2006 -@@ -5485,14 +5485,10 @@ - local cur portsdir prev indexfile - local -a COMPREPLY2 - -- portsdir=${PORTSDIR:-/usr/ports}/ -+ portsdir=${PORTSDIR:-/usr/ports} - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} -- # First try INDEX-5 -- indexfile=$portsdir/INDEX-5 -- # Then INDEX if INDEX-5 does not exist or system is not FreeBSD 5.x -- [ "${OSTYPE%.*}" = "freebsd5" -a -f $indexfile ] || -- indexfile=$portsdir/INDEX -+ indexfile="${portsdir}/INDEX-${OSTYPE:7:1}" - - [ "$prev" = "-l" -o "$prev" = "-L" -o "$prev" = "-o" ] && return 0 - diff --git a/shells/bash-completion-classic/files/patch-contrib_portupgrade b/shells/bash-completion-classic/files/patch-contrib_portupgrade new file mode 100644 index 000000000000..caa9b91d5800 --- /dev/null +++ b/shells/bash-completion-classic/files/patch-contrib_portupgrade @@ -0,0 +1,15 @@ +--- contrib/portupgrade.orig 2010-09-04 02:35:04.000000000 -0400 ++++ contrib/portupgrade 2010-09-04 02:38:00.000000000 -0400 +@@ -26,11 +26,7 @@ + + portsdir=${PORTSDIR:-/usr/ports}/ + _get_comp_words_by_ref cur prev +- # First try INDEX-5 +- indexfile=$portsdir/INDEX-5 +- # Then INDEX if INDEX-5 does not exist or system is not FreeBSD 5.x +- [[ "${OSTYPE%.*}" == freebsd5 && -f $indexfile ]] || +- indexfile=$portsdir/INDEX ++ indexfile="$(portsdir)/INDEX-${OSTYPE:8:1}" + + [[ "$prev" == -l || "$prev" == -L || "$prev" == -o ]] && return 0 + diff --git a/shells/bash-completion-classic/files/pkg-message.in b/shells/bash-completion-classic/files/pkg-message.in index 7bbf0ac073f2..496b2f38a789 100644 --- a/shells/bash-completion-classic/files/pkg-message.in +++ b/shells/bash-completion-classic/files/pkg-message.in @@ -1,9 +1,15 @@ -The programmable completion library is not enabled by default for various -reasons. To use it, you should source %%PREFIX%%/etc/bash_completion from -your .bashrc file. For example: +===================================================================== - if [ -f %%PREFIX%%/etc/bash_completion ]; then - . %%PREFIX%%/etc/bash_completion - fi +You must enable the bash programmable completion library yourself! + + * source %%PREFIX%%/etc/bash_completion from your .bashrc file + + if [ -f %%PREFIX%%/etc/bash_completion ]; then + . %%PREFIX%%/etc/bash_completion + fi + + * or, run %%PREFIX%%/bin/bash_completion.sh from your .bashrc + +===================================================================== |