Remove shells/bash-completion-classic, the amd64 workaround is no longer

required as shells/bash-completion works with amd64.

7 files changed, 1 insertions, 95 deletions

diff --git a/MOVED b/MOVED
index 98d6c878ddf4..9c6522162c5a 100644
--- a/MOVED
+++ b/MOVED
@@ -4691,3 +4691,4 @@ x11-toolkits/ruby-gtksourceview||2010-11-27|Removed
 misc/libpri-bristuff||2010-11-28|Superseded by asterisk 1.8
 net/asterisk-bristuff||2010-11-28|Superseded by asterisk 1.8
 www/p5-Mojo|www/p5-Mojolicious|2010-11-29|Project distname was renamed
+shells/bash-completion-classic|shells/bash-completion|2010-11-29|amd64 workaround no longer required
diff --git a/shells/Makefile b/shells/Makefile
index 37ba6805a621..e3e388c2f5bf 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -6,7 +6,6 @@
     SUBDIR += 44bsd-csh
     SUBDIR += bash
     SUBDIR += bash-completion
-    SUBDIR += bash-completion-classic
     SUBDIR += bash-static
     SUBDIR += bash3
     SUBDIR += bash3-static
diff --git a/shells/bash-completion-classic/Makefile b/shells/bash-completion-classic/Makefile
deleted file mode 100644
index 24c6ed5eba35..000000000000
--- a/shells/bash-completion-classic/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:	bash_completion
-# Date created:				29 May 2003
-# Whom:					kirk@strauser.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bash-completion-classic
-PORTVERSION=	20060301
-CATEGORIES=	shells
-MASTER_SITES=	http://www.caliban.org/files/bash/ \
-		CRITICAL
-DISTNAME=	${PORTNAME:C/\-classic//}-${PORTVERSION}
-
-MAINTAINER=	ehaupt@FreeBSD.org
-COMMENT=	Programmable completion library for Bash 2.04 and up
-
-WRKSRC=		${WRKDIR}/bash_completion
-NO_BUILD=	yes
-
-CONFLICTS=	bash-completion-[0-9]*
-
-SUB_FILES=	pkg-message
-PLIST_FILES=	etc/bash_completion
-
-OPTIONS=	GSED	"Use GNU sed to enable additional completions"	off
-
-.include <bsd.port.pre.mk>
-
-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|${LOCALBASE}|g; \
-		s|/etc/bash_completion|${PREFIX}&|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\)|${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}
-
-.include <bsd.port.post.mk>
diff --git a/shells/bash-completion-classic/distinfo b/shells/bash-completion-classic/distinfo
deleted file mode 100644
index 285a36c0e2d4..000000000000
--- a/shells/bash-completion-classic/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
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/pkg-message.in b/shells/bash-completion-classic/files/pkg-message.in
deleted file mode 100644
index 7bbf0ac073f2..000000000000
--- a/shells/bash-completion-classic/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-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
-
diff --git a/shells/bash-completion-classic/pkg-descr b/shells/bash-completion-classic/pkg-descr
deleted file mode 100644
index bffd7c7627b4..000000000000
--- a/shells/bash-completion-classic/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is a programmable completion library for bash users. It features the
-ability to tab-complete arguments for many common programs.
-
-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