Permalink
Browse files

Update to 2.0.

Please note that the mechanism for activating the completions
library has changed. You must source
${PREFIX}/share/bash-completion/bash_completion.sh from your .bashrc.

Feature safe:	yes
  • Loading branch information...
1 parent 9c3d7b2 commit 8a5543d17c931c583c260eb1731717f50e94c556 @assistcontrol assistcontrol committed Nov 2, 2012
@@ -1,32 +1,32 @@
-# New ports collection makefile for: bash_completion
-# Date created: 29 May 2003
-# Whom: kirk@strauser.com
+# Created by: kirk@strauser.com
#
# $FreeBSD$
#
PORTNAME= bash-completion
-PORTVERSION= 1.3
-PORTREVISION= 4
+PORTVERSION= 2.0
PORTEPOCH= 1
CATEGORIES= shells
MASTER_SITES= http://bash-completion.alioth.debian.org/files/
MAINTAINER= adamw@FreeBSD.org
COMMENT= Programmable completion library for Bash
-RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=bash:${PORTSDIR}/shells/bash
CONFLICTS= bash-completion-classic-[0-9]*
GNU_CONFIGURE= yes
+USE_GMAKE= yes
+
USE_BZIP2= yes
SUB_FILES= pkg-message
+SUB_LIST+= RUNFILE=${DATADIR}/bash_completion.sh
+PORTDOCS= *
post-patch:
- @${ECHO_CMD} You can safely ignore this next error...
- -@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
s|/etc/bash_completion|${PREFIX}&|g; \
s|/usr\(/sbin/postconf\)|${PREFIX}\1|g; \
s|/usr\(/lib/rpm/macros\)|${PREFIX}\1|g; \
@@ -35,11 +35,20 @@ post-patch:
s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \
s|/usr/share/info|&:${PREFIX}/info|g; \
s|\$$(sysconfdir)/profile.d|${PREFIX}/bin|g; \
- s|FLAC|&\|flv\|FLV|' \
+ s|FLAC|&\|flv\|FLV|; \
+ s|\(profiledir = \)${PREFIX}/bin|\1${DATADIR}|g; \
+ s|\$$(datadir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/bash_completion ${WRKSRC}/Makefile.in \
- ${WRKSRC}/completions/* ${WRKSRC}/completions/helpers/*
+ ${WRKSRC}/completions/*
post-install:
+.if !defined(WITHOUT_DOCS)
+ ${MKDIR} ${DOCSDIR}
+. for i in README doc/bash_completion.txt doc/bashrc doc/inputrc
+ ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+. endfor
+.endif
+
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
@@ -1,2 +1,2 @@
-SHA256 (bash-completion-1.3.tar.bz2) = 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec
-SIZE (bash-completion-1.3.tar.bz2) = 211899
+SHA256 (bash-completion-2.0.tar.bz2) = e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804
+SIZE (bash-completion-2.0.tar.bz2) = 250560
@@ -1,15 +0,0 @@
---- completions/portupgrade.orig 2010-09-04 02:35:04.000000000 -0400
-+++ completions/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:7:1}"
-
- [[ "$prev" == -l || "$prev" == -L || "$prev" == -o ]] && return 0
-
@@ -1,15 +1,13 @@
=====================================================================
-You must enable the bash programmable completion library yourself!
+To enable the bash completion library, add the following to
+your .bashrc file:
- * source %%PREFIX%%/etc/bash_completion from your .bashrc file
+[[ $PS1 && -f %%RUNFILE%% ]] && \
+ source %%RUNFILE%%
- if [ -f %%PREFIX%%/etc/bash_completion ]; then
- . %%PREFIX%%/etc/bash_completion
- fi
-
- * or, run %%PREFIX%%/bin/bash_completion.sh from your .bashrc
+See %%DOCSDIR%%/README for more information.
=====================================================================
Oops, something went wrong.

0 comments on commit 8a5543d

Please sign in to comment.