[109660] trunk/dports/sysutils

[raimue at macports.org]

Revision: 109660
          https://trac.macports.org/changeset/109660
Author:   raimue at macports.org
Date:     2013-08-19 09:09:48 -0700 (Mon, 19 Aug 2013)
Log Message:
-----------
sysutils/bash-completion{,-devel}:
Fix a portability issue with BSD sed in the completion of hostnames starting
with a 't', closes #32053

Modified Paths:
--------------
    trunk/dports/sysutils/bash-completion/Portfile
    trunk/dports/sysutils/bash-completion-devel/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff
    trunk/dports/sysutils/bash-completion-devel/files/patch-_known_hosts_real.diff

Modified: trunk/dports/sysutils/bash-completion/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion/Portfile	2013-08-19 15:09:48 UTC (rev 109659)
+++ trunk/dports/sysutils/bash-completion/Portfile	2013-08-19 16:09:48 UTC (rev 109660)
@@ -6,7 +6,7 @@
 conflicts       bash-completion-devel
 epoch           1
 version         2.1
-revision        1
+revision        2
 categories      sysutils
 platforms       darwin
 supported_archs noarch
@@ -27,7 +27,8 @@
 depends_run     port:bash
 
 patchfiles      patch-vpnc.diff \
-                patch-make.diff
+                patch-make.diff \
+                patch-_known_hosts_real.diff
 
 post-patch {
     reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \

Added: trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff	                        (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff	2013-08-19 16:09:48 UTC (rev 109660)
@@ -0,0 +1,12 @@
+Upstream: http://alioth.debian.org/tracker/index.php?func=detail&aid=314393&group_id=100114&atid=413095
+--- bash_completion
++++ bash_completion
+@@ -1533,7 +1533,7 @@ _known_hosts_real()
+ 
+     # append any available aliases from config files
+     if [[ ${#config[@]} -gt 0 && -n "$aliases" ]]; then
+-        local hosts=$( sed -ne 's/^[ \t]*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['"$'\t '"']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
++        local hosts=$( sed -ne 's/^[[:space:]]*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['"$'[:space:]'"']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
+         COMPREPLY+=( $( compgen -P "$prefix$user" \
+             -S "$suffix" -W "$hosts" -- "$cur" ) )
+     fi

Modified: trunk/dports/sysutils/bash-completion-devel/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/Portfile	2013-08-19 15:09:48 UTC (rev 109659)
+++ trunk/dports/sysutils/bash-completion-devel/Portfile	2013-08-19 16:09:48 UTC (rev 109660)
@@ -5,7 +5,7 @@
 name            bash-completion-devel
 conflicts       bash-completion
 version         2.1
-revision        1
+revision        2
 categories      sysutils
 platforms       darwin
 supported_archs noarch
@@ -27,7 +27,8 @@
 depends_run     port:bash
 
 patchfiles      patch-vpnc.diff \
-                patch-make.diff
+                patch-make.diff \
+                patch-_known_hosts_real.diff
 
 post-patch {
     reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \

Added: trunk/dports/sysutils/bash-completion-devel/files/patch-_known_hosts_real.diff
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/files/patch-_known_hosts_real.diff	                        (rev 0)
+++ trunk/dports/sysutils/bash-completion-devel/files/patch-_known_hosts_real.diff	2013-08-19 16:09:48 UTC (rev 109660)
@@ -0,0 +1,12 @@
+Upstream: http://alioth.debian.org/tracker/index.php?func=detail&aid=314393&group_id=100114&atid=413095
+--- bash_completion
++++ bash_completion
+@@ -1533,7 +1533,7 @@ _known_hosts_real()
+ 
+     # append any available aliases from config files
+     if [[ ${#config[@]} -gt 0 && -n "$aliases" ]]; then
+-        local hosts=$( sed -ne 's/^[ \t]*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['"$'\t '"']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
++        local hosts=$( sed -ne 's/^[[:space:]]*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['"$'[:space:]'"']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
+         COMPREPLY+=( $( compgen -P "$prefix$user" \
+             -S "$suffix" -W "$hosts" -- "$cur" ) )
+     fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130819/ff79f073/attachment.html>