diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2010-09-21 07:22:37 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2010-09-21 07:22:37 +0000 |
| commit | b623d9f2fb96a02bbc2fd7b9d928b5f45ca29471 (patch) | |
| tree | b9b79ced196105f4a56fcf76c2b0f78df3f62e42 /shells/bash-completion-classic/files | |
| parent | Update maintainer's email address. (Old one now bounces.) (diff) | |
Bring back the classic version of shells/bash-completion.
shells/bash-completion is developed by a new group and has some very nice new
features. Unfortunately, the new version currently causes problems on amd64
systems. People with amd64 systems may use this classic version as an
alternative.
Notes
Notes:
svn path=/head/; revision=261521
Diffstat (limited to 'shells/bash-completion-classic/files')
3 files changed, 25 insertions, 27 deletions
diff --git a/shells/bash-completion-classic/files/patch-bash_completion b/shells/bash-completion-classic/files/patch-bash_completion new file mode 100644 index 000000000000..3d06ec6850e3 --- /dev/null +++ b/shells/bash-completion-classic/files/patch-bash_completion @@ -0,0 +1,19 @@ +--- 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 deleted file mode 100644 index caa9b91d5800..000000000000 --- a/shells/bash-completion-classic/files/patch-contrib_portupgrade +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 496b2f38a789..7bbf0ac073f2 100644 --- a/shells/bash-completion-classic/files/pkg-message.in +++ b/shells/bash-completion-classic/files/pkg-message.in @@ -1,15 +1,9 @@ -===================================================================== +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: -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 - -===================================================================== + if [ -f %%PREFIX%%/etc/bash_completion ]; then + . %%PREFIX%%/etc/bash_completion + fi |