[59184] trunk/dports/sysutils/bash-completion

[raimue at macports.org]

Revision: 59184
          http://trac.macports.org/changeset/59184
Author:   raimue at macports.org
Date:     2009-10-11 01:55:35 -0700 (Sun, 11 Oct 2009)
Log Message:
-----------
sysutils/bash-completion:
Remove use of pidof for avahi-daemon check

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

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

Modified: trunk/dports/sysutils/bash-completion/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion/Portfile	2009-10-11 08:45:26 UTC (rev 59183)
+++ trunk/dports/sysutils/bash-completion/Portfile	2009-10-11 08:55:35 UTC (rev 59184)
@@ -4,6 +4,7 @@
 
 name            bash-completion
 version         1.1
+revision        2
 epoch           1
 categories      sysutils
 platforms       darwin
@@ -18,6 +19,8 @@
                 sha1    0e666ebda3d577571ab62bcecc16e1024922cd18 \
                 rmd160  4f3c29479225b44bb3fb682a7ea925bef2e923b6
 
+patchfiles      patch-avahi.diff
+
 post-patch {
     reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \
         ${worksrcpath}/bash_completion

Added: trunk/dports/sysutils/bash-completion/files/patch-avahi.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-avahi.diff	                        (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-avahi.diff	2009-10-11 08:55:35 UTC (rev 59184)
@@ -0,0 +1,17 @@
+--- bash_completion-orig	2009-10-11 10:21:16.000000000 +0200
++++ bash_completion	2009-10-11 10:21:33.000000000 +0200
+@@ -1306,11 +1306,9 @@
+         #  the result. But on Gentoo (at least), -k isn't available
+         #  (even if mentioned in the manpage), so...
+         if type avahi-browse >&/dev/null; then
+-            if [ -n "$(pidof avahi-daemon)" ]; then
+-                COMPREPLY=( "${COMPREPLY[@]}" $(
+-                compgen -W "$( avahi-browse -cpr _workstation._tcp | \
+-                grep ^= | cut -d\; -f7 | sort -u )" -- "$cur" ) )
+-            fi
++            COMPREPLY=( "${COMPREPLY[@]}" $(
++            compgen -W "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \
++            grep ^= | cut -d\; -f7 | sort -u )" -- "$cur" ) )
+         fi
+ 
+         # apply suffix and prefix
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091011/de93d8f2/attachment.html>