diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2004-10-27 18:49:08 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-10-27 18:49:08 +0000 |
| commit | da5a605249abcfd8e7aa404083d58efa8d7bbd61 (patch) | |
| tree | 860eb8ff22743a29f4591db27cce053666932607 /shells | |
| parent | Really allow building on 4.x. Rev 1.40 was a NOP as the base readline lib (diff) | |
- Update to 20041017
PR: ports/73174
Submitted by: Kirk Strauser <kirk@strauser.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=120334
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-completion-classic/Makefile | 7 | ||||
| -rw-r--r-- | shells/bash-completion-classic/distinfo | 4 | ||||
| -rw-r--r-- | shells/bash-completion-classic/files/patch-aa | 27 | ||||
| -rw-r--r-- | shells/bash-completion/Makefile | 7 | ||||
| -rw-r--r-- | shells/bash-completion/distinfo | 4 | ||||
| -rw-r--r-- | shells/bash-completion/files/patch-aa | 27 |
6 files changed, 44 insertions, 32 deletions
diff --git a/shells/bash-completion-classic/Makefile b/shells/bash-completion-classic/Makefile index 5717c0f5c179..1a7d95fce310 100644 --- a/shells/bash-completion-classic/Makefile +++ b/shells/bash-completion-classic/Makefile @@ -6,14 +6,18 @@ # PORTNAME= bash-completion -PORTVERSION= 20040711 +PORTVERSION= 20041017 CATEGORIES= shells MASTER_SITES= http://www.caliban.org/files/bash/ MAINTAINER= kirk@strauser.com COMMENT= Programmable completion library for Bash 2.04 and up +.if defined(WITH_BASH2) RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 +.else +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +.endif .if defined(WITH_GSED) RUN_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed @@ -28,6 +32,7 @@ PLIST_FILES= etc/bash_completion pre-everything:: @${ECHO} @${ECHO} "You can build ${PKGNAME} with the following options:" + @${ECHO} "WITH_BASH2 use shells/bash2 instead of shells/bash" @${ECHO} "WITH_GSED use GNU sed to enable additional completions" @${ECHO} diff --git a/shells/bash-completion-classic/distinfo b/shells/bash-completion-classic/distinfo index 65c94919629c..4f0854c973a1 100644 --- a/shells/bash-completion-classic/distinfo +++ b/shells/bash-completion-classic/distinfo @@ -1,2 +1,2 @@ -MD5 (bash-completion-20040711.tar.gz) = 90ee706965dbf7b24515220d3bdc1f85 -SIZE (bash-completion-20040711.tar.gz) = 99087 +MD5 (bash-completion-20041017.tar.gz) = b9f75cc7b11e5768d360f4a28f44067b +SIZE (bash-completion-20041017.tar.gz) = 102970 diff --git a/shells/bash-completion-classic/files/patch-aa b/shells/bash-completion-classic/files/patch-aa index 001c5448b350..dd36d6b3651d 100644 --- a/shells/bash-completion-classic/files/patch-aa +++ b/shells/bash-completion-classic/files/patch-aa @@ -1,25 +1,26 @@ ---- bash_completion.orig Wed Mar 31 19:45:32 2004 -+++ bash_completion Sat Jun 5 16:53:42 2004 -@@ -31,14 +31,14 @@ +--- bash_completion.orig Mon Oct 25 10:10:30 2004 ++++ bash_completion Mon Oct 25 10:12:35 2004 +@@ -31,14 +31,15 @@ if [ -n "${FUNCNAME:-}" ]; then # we're being sourced from within a function, so we can't use # 'declare', as this will create local variables within a function -- BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} 2>/dev/null -- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \ -+ BASH_COMPLETION=${BASH_COMPLETION:-/usr/local/etc/bash_completion} 2>/dev/null -+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d} \ +- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" 2>/dev/null +- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" \ ++ BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ ++ 2>/dev/null ++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}" \ 2>/dev/null else -- declare -r BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} \ -+ declare -r BASH_COMPLETION=${BASH_COMPLETION:-/usr/local/etc/bash_completion} \ +- declare -r BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" \ ++ declare -r BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ 2>/dev/null declare -r \ -- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \ -+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d} \ +- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"\ ++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}"\ 2>/dev/null fi -@@ -1056,7 +1056,7 @@ +@@ -1131,7 +1132,7 @@ else len=${#cur} idx=0 @@ -28,7 +29,7 @@ if [[ "$cur" == "${pval:0:$len}" ]]; then COMPREPLY[$idx]="$pval:" idx=$(($idx+1)) -@@ -1132,7 +1132,7 @@ +@@ -1207,7 +1208,7 @@ fi len=${#cur} idx=0 diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 5717c0f5c179..1a7d95fce310 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -6,14 +6,18 @@ # PORTNAME= bash-completion -PORTVERSION= 20040711 +PORTVERSION= 20041017 CATEGORIES= shells MASTER_SITES= http://www.caliban.org/files/bash/ MAINTAINER= kirk@strauser.com COMMENT= Programmable completion library for Bash 2.04 and up +.if defined(WITH_BASH2) RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 +.else +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +.endif .if defined(WITH_GSED) RUN_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed @@ -28,6 +32,7 @@ PLIST_FILES= etc/bash_completion pre-everything:: @${ECHO} @${ECHO} "You can build ${PKGNAME} with the following options:" + @${ECHO} "WITH_BASH2 use shells/bash2 instead of shells/bash" @${ECHO} "WITH_GSED use GNU sed to enable additional completions" @${ECHO} diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo index 65c94919629c..4f0854c973a1 100644 --- a/shells/bash-completion/distinfo +++ b/shells/bash-completion/distinfo @@ -1,2 +1,2 @@ -MD5 (bash-completion-20040711.tar.gz) = 90ee706965dbf7b24515220d3bdc1f85 -SIZE (bash-completion-20040711.tar.gz) = 99087 +MD5 (bash-completion-20041017.tar.gz) = b9f75cc7b11e5768d360f4a28f44067b +SIZE (bash-completion-20041017.tar.gz) = 102970 diff --git a/shells/bash-completion/files/patch-aa b/shells/bash-completion/files/patch-aa index 001c5448b350..dd36d6b3651d 100644 --- a/shells/bash-completion/files/patch-aa +++ b/shells/bash-completion/files/patch-aa @@ -1,25 +1,26 @@ ---- bash_completion.orig Wed Mar 31 19:45:32 2004 -+++ bash_completion Sat Jun 5 16:53:42 2004 -@@ -31,14 +31,14 @@ +--- bash_completion.orig Mon Oct 25 10:10:30 2004 ++++ bash_completion Mon Oct 25 10:12:35 2004 +@@ -31,14 +31,15 @@ if [ -n "${FUNCNAME:-}" ]; then # we're being sourced from within a function, so we can't use # 'declare', as this will create local variables within a function -- BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} 2>/dev/null -- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \ -+ BASH_COMPLETION=${BASH_COMPLETION:-/usr/local/etc/bash_completion} 2>/dev/null -+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d} \ +- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" 2>/dev/null +- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" \ ++ BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ ++ 2>/dev/null ++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}" \ 2>/dev/null else -- declare -r BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} \ -+ declare -r BASH_COMPLETION=${BASH_COMPLETION:-/usr/local/etc/bash_completion} \ +- declare -r BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" \ ++ declare -r BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ 2>/dev/null declare -r \ -- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \ -+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d} \ +- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"\ ++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}"\ 2>/dev/null fi -@@ -1056,7 +1056,7 @@ +@@ -1131,7 +1132,7 @@ else len=${#cur} idx=0 @@ -28,7 +29,7 @@ if [[ "$cur" == "${pval:0:$len}" ]]; then COMPREPLY[$idx]="$pval:" idx=$(($idx+1)) -@@ -1132,7 +1132,7 @@ +@@ -1207,7 +1208,7 @@ fi len=${#cur} idx=0 |