Date: Tue, 26 Oct 2004 14:08:45 -0500 (CDT) From: Kirk Strauser <kirk@strauser.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Kirk Strauser <kirk@strauser.com> Subject: ports/73174: [MAINTAINER UPDATE] Update port: shells/bash-completion to 20040711 Message-ID: <20041026190845.CE3C9B8F5@kanga.honeypot.net> Resent-Message-ID: <200410261910.i9QJA35W091367@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73174 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update port: shells/bash-completion to 20040711 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 26 19:10:02 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Kirk Strauser >Release: FreeBSD 5.3-BETA7 i386 >Organization: The Strauser Group >Environment: System: FreeBSD kanga.honeypot.net 5.3-BETA7 FreeBSD 5.3-BETA7 #0: Sun Oct 10 13:47:08 CDT 2004 root@kanga.honeypot.net:/usr/obj/usr/src/sys/KANGA i386 >Description: This update to the bash-completion port brings many small bugfixes and new support for several commands. The port is also now selectively dependent on shells/bash2 or shells/bash, so users who have upgraded to Bash 3.0+ can use the port without dependency issues. >How-To-Repeat: >Fix: --- bash-completion.patch begins here --- diff -urN bash-completion.old/Makefile bash-completion/Makefile --- bash-completion.old/Makefile Wed Aug 4 15:19:32 2004 +++ bash-completion/Makefile Mon Oct 25 10:00:20 2004 @@ -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 @@ 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 -urN bash-completion.old/distinfo bash-completion/distinfo --- bash-completion.old/distinfo Wed Aug 4 15:19:32 2004 +++ bash-completion/distinfo Mon Oct 25 10:00:28 2004 @@ -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 -urN bash-completion.old/files/patch-aa bash-completion/files/patch-aa --- bash-completion.old/files/patch-aa Wed Jun 16 16:15:59 2004 +++ bash-completion/files/patch-aa Mon Oct 25 10:12:48 2004 @@ -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 --- bash-completion.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041026190845.CE3C9B8F5>