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.

7 files changed, 65 insertions, 226 deletions

diff --git a/shells/bash-completion-classic/Makefile b/shells/bash-completion-classic/Makefile
index ad0cec8ca4d6..3798764ee896 100644
--- a/shells/bash-completion-classic/Makefile
+++ b/shells/bash-completion-classic/Makefile
@@ -5,45 +5,48 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bash-completion
-PORTVERSION=	1.2
-PORTREVISION=	1
-PORTEPOCH=		1
-CATEGORIES=		shells
-MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
+PORTNAME=	bash-completion-classic
+PORTVERSION=	20060301
+CATEGORIES=	shells
+MASTER_SITES=	http://www.caliban.org/files/bash/ \
+		CRITICAL
+DISTNAME=	${PORTNAME:C/\-classic//}-${PORTVERSION}
 
-MAINTAINER=		adamw@FreeBSD.org
-COMMENT=		Programmable completion library for Bash
+MAINTAINER=	ehaupt@critical.ch
+COMMENT=	Programmable completion library for Bash 2.04 and up
 
-USE_BZIP2=		yes
-SUB_FILES=		pkg-message
+WRKSRC=		${WRKDIR}/bash_completion
+NO_BUILD=	yes
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+CONFLICTS=	bash-completion-[0-9]*
+
+SUB_FILES=	pkg-message
+PLIST_FILES=	etc/bash_completion
 
-GNU_CONFIGURE=	yes
+OPTIONS=	GSED	"Use GNU sed to enable additional completions"	off
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-AMD64_REMOVE_RSYNC=	/contrib\/rsync/d
-PLIST_SUB+=	NOAMD64="@comment "
-.else
-PLIST_SUB+=	NOAMD64=""
+RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+
+.if defined(WITH_GSED)
+RUN_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
 		s|/etc/bash_completion|${PREFIX}&|g; \
-		s|/usr\(/sbin/postconf\)|${PREFIX}\1|g; \
-		s|/usr\(/lib/rpm/macros\)|${PREFIX}\1|g; \
+		s|/usr\(/sbin/postconf\)|${LOCALBASE}\1|g; \
+		s|/usr\(/lib/rpm/macros\)|${LOCALBASE}\1|g; \
 		s|/usr/share\(/ssl/openssl.cnf\)|/etc\1|g; \
 		s|/usr/ports|${PORTSDIR}|g; \
-		s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \
-		s|/usr/share/info|&:${PREFIX}/info|g; \
-		s|\$$(sysconfdir)/profile.d|${PREFIX}/bin|g; \
-		s|\(FLAC\)|\1\|flv\|FLV|; \
-		${AMD64_REMOVE_RSYNC}' \
-		${WRKSRC}/bash_completion ${WRKSRC}/Makefile.in ${WRKSRC}/contrib/*
+		s|/usr/lib\(/aspell\)|${LOCALBASE}/share\1|g; \
+		s|/usr/share/info|&:${LOCALBASE}/info|g; \
+		s|\(FLAC\)|\1\|flv\|FLV|' \
+		${WRKSRC}/bash_completion
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/bash_completion ${PREFIX}/etc
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/shells/bash-completion-classic/distinfo b/shells/bash-completion-classic/distinfo
index 963f9b288a63..285a36c0e2d4 100644
--- a/shells/bash-completion-classic/distinfo
+++ b/shells/bash-completion-classic/distinfo
@@ -1,3 +1,3 @@
-MD5 (bash-completion-1.2.tar.bz2) = 88c022a98a02a02293716f840eadd884
-SHA256 (bash-completion-1.2.tar.bz2) = dd09a86134204e4c6b860bfbd5ee8ac46c6b32a54478b967dcf81e8a7839d354
-SIZE (bash-completion-1.2.tar.bz2) = 197574
+MD5 (bash-completion-20060301.tar.gz) = 9bca1cf97e8f8c73e3ef560cc9dead21
+SHA256 (bash-completion-20060301.tar.gz) = 29b78834b975b29810f0bf1f15e5d3a6c003a137cfac7fea671bfaf8f58f5c0d
+SIZE (bash-completion-20060301.tar.gz) = 123300
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
 
diff --git a/shells/bash-completion-classic/pkg-descr b/shells/bash-completion-classic/pkg-descr
index f54b05e43e21..bffd7c7627b4 100644
--- a/shells/bash-completion-classic/pkg-descr
+++ b/shells/bash-completion-classic/pkg-descr
@@ -1,5 +1,9 @@
-This is a programmable completion convenience library for the bash(1)
-shell. It features the ability to tab-complete arguments for many common
-programs.
+This is a programmable completion library for bash users. It features the
+ability to tab-complete arguments for many common programs.
 
-WWW: http://bash-completion.alioth.debian.org/
+This is the original project which became later shells/bash-completion. The new
+version 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.
+
+WWW: http://www.caliban.org/bash/index.shtml
diff --git a/shells/bash-completion-classic/pkg-plist b/shells/bash-completion-classic/pkg-plist
deleted file mode 100644
index da9385be9452..000000000000
--- a/shells/bash-completion-classic/pkg-plist
+++ /dev/null
@@ -1,166 +0,0 @@
-bin/bash_completion.sh
-etc/bash_completion
-etc/bash_completion.d/abook
-etc/bash_completion.d/ant
-etc/bash_completion.d/apache2ctl
-etc/bash_completion.d/apt
-etc/bash_completion.d/apt-build
-etc/bash_completion.d/aptitude
-etc/bash_completion.d/aspell
-etc/bash_completion.d/autorpm
-etc/bash_completion.d/bash-builtins
-etc/bash_completion.d/bind-utils
-etc/bash_completion.d/bitkeeper
-etc/bash_completion.d/bittorrent
-etc/bash_completion.d/bluez
-etc/bash_completion.d/brctl
-etc/bash_completion.d/bzip2
-etc/bash_completion.d/cardctl
-etc/bash_completion.d/cfengine
-etc/bash_completion.d/chkconfig
-etc/bash_completion.d/chsh
-etc/bash_completion.d/cksfv
-etc/bash_completion.d/clisp
-etc/bash_completion.d/configure
-etc/bash_completion.d/coreutils
-etc/bash_completion.d/cowsay
-etc/bash_completion.d/cpan2dist
-etc/bash_completion.d/cpio
-etc/bash_completion.d/cryptsetup
-etc/bash_completion.d/cups
-etc/bash_completion.d/cvs
-etc/bash_completion.d/cvsps
-etc/bash_completion.d/dd
-etc/bash_completion.d/dhclient
-etc/bash_completion.d/dict
-etc/bash_completion.d/dpkg
-etc/bash_completion.d/dselect
-etc/bash_completion.d/dsniff
-etc/bash_completion.d/findutils
-etc/bash_completion.d/freeciv
-etc/bash_completion.d/fuse
-etc/bash_completion.d/gcc
-etc/bash_completion.d/gcl
-etc/bash_completion.d/gdb
-etc/bash_completion.d/genisoimage
-etc/bash_completion.d/getent
-etc/bash_completion.d/gkrellm
-etc/bash_completion.d/gnatmake
-etc/bash_completion.d/gpg
-etc/bash_completion.d/gpg2
-etc/bash_completion.d/gzip
-etc/bash_completion.d/heimdal
-etc/bash_completion.d/hping2
-etc/bash_completion.d/iconv
-etc/bash_completion.d/ifupdown
-etc/bash_completion.d/imagemagick
-etc/bash_completion.d/info
-etc/bash_completion.d/ipmitool
-etc/bash_completion.d/ipsec
-etc/bash_completion.d/iptables
-etc/bash_completion.d/ipv6calc
-etc/bash_completion.d/isql
-etc/bash_completion.d/jar
-etc/bash_completion.d/java
-etc/bash_completion.d/k3b
-etc/bash_completion.d/kldload
-etc/bash_completion.d/larch
-etc/bash_completion.d/ldapvi
-etc/bash_completion.d/lftp
-etc/bash_completion.d/lilo
-etc/bash_completion.d/links
-etc/bash_completion.d/lintian
-etc/bash_completion.d/lisp
-etc/bash_completion.d/lvm
-etc/bash_completion.d/lzma
-etc/bash_completion.d/lzop
-etc/bash_completion.d/mailman
-etc/bash_completion.d/make
-etc/bash_completion.d/man
-etc/bash_completion.d/mc
-etc/bash_completion.d/mcrypt
-etc/bash_completion.d/mdadm
-etc/bash_completion.d/medusa
-etc/bash_completion.d/minicom
-etc/bash_completion.d/mkinitrd
-etc/bash_completion.d/module-init-tools
-etc/bash_completion.d/monodevelop
-etc/bash_completion.d/mount
-etc/bash_completion.d/mplayer
-etc/bash_completion.d/msynctool
-etc/bash_completion.d/mtx
-etc/bash_completion.d/munin-node
-etc/bash_completion.d/mutt
-etc/bash_completion.d/mysqladmin
-etc/bash_completion.d/ncftp
-etc/bash_completion.d/net-tools
-etc/bash_completion.d/nmap
-etc/bash_completion.d/ntpdate
-etc/bash_completion.d/openldap
-etc/bash_completion.d/openssl
-etc/bash_completion.d/p4
-etc/bash_completion.d/perl
-etc/bash_completion.d/pine
-etc/bash_completion.d/pkg-config
-etc/bash_completion.d/pkg_install
-etc/bash_completion.d/pkgtools
-etc/bash_completion.d/pm-utils
-etc/bash_completion.d/portupgrade
-etc/bash_completion.d/postfix
-etc/bash_completion.d/postgresql
-etc/bash_completion.d/povray
-etc/bash_completion.d/procps
-etc/bash_completion.d/python
-etc/bash_completion.d/qdbus
-etc/bash_completion.d/qemu
-etc/bash_completion.d/quota-tools
-etc/bash_completion.d/rcs
-etc/bash_completion.d/rdesktop
-etc/bash_completion.d/reportbug
-etc/bash_completion.d/resolvconf
-etc/bash_completion.d/rfkill
-etc/bash_completion.d/ri
-etc/bash_completion.d/rpcdebug
-etc/bash_completion.d/rpm
-etc/bash_completion.d/rpmcheck
-etc/bash_completion.d/rrdtool
-%%NOAMD64%%etc/bash_completion.d/rsync
-etc/bash_completion.d/rtcwake
-etc/bash_completion.d/samba
-etc/bash_completion.d/sbcl
-etc/bash_completion.d/screen
-etc/bash_completion.d/service
-etc/bash_completion.d/shadow
-etc/bash_completion.d/sitecopy
-etc/bash_completion.d/smartctl
-etc/bash_completion.d/snownews
-etc/bash_completion.d/ssh
-etc/bash_completion.d/sshfs
-etc/bash_completion.d/strace
-etc/bash_completion.d/svk
-etc/bash_completion.d/sysctl
-etc/bash_completion.d/sysv-rc
-etc/bash_completion.d/tar
-etc/bash_completion.d/tcpdump
-etc/bash_completion.d/unace
-etc/bash_completion.d/unrar
-etc/bash_completion.d/update-alternatives
-etc/bash_completion.d/util-linux
-etc/bash_completion.d/vncviewer
-etc/bash_completion.d/vpnc
-etc/bash_completion.d/wireless-tools
-etc/bash_completion.d/wodim
-etc/bash_completion.d/wol
-etc/bash_completion.d/wtf
-etc/bash_completion.d/wvdial
-etc/bash_completion.d/xhost
-etc/bash_completion.d/xm
-etc/bash_completion.d/xmllint
-etc/bash_completion.d/xmlwf
-etc/bash_completion.d/xmms
-etc/bash_completion.d/xrandr
-etc/bash_completion.d/xsltproc
-etc/bash_completion.d/xz
-etc/bash_completion.d/yp-tools
-etc/bash_completion.d/yum-arch
-@dirrm etc/bash_completion.d