[145839] users/devans/GNOME-3/unstable/dports/devel/gvfs

[devans at macports.org]

Revision: 145839
          https://trac.macports.org/changeset/145839
Author:   devans at macports.org
Date:     2016-02-18 12:47:21 -0800 (Thu, 18 Feb 2016)
Log Message:
-----------
GNOME-3/unstable: gvfs, merge test patch from stable, test script requires gsed.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/devel/gvfs/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/unstable/dports/devel/gvfs/files/patch-test-gvfs-test.diff

Property Changed:
----------------
    users/devans/GNOME-3/unstable/dports/devel/gvfs/


Property changes on: users/devans/GNOME-3/unstable/dports/devel/gvfs
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/devel/gvfs:116280-141337
/users/devans/GNOME-3/unstable/dports/devel/gvfs:118152-120100,123992-125723,128305-134374
   + /trunk/dports/devel/gvfs:116280-141337
/users/devans/GNOME-3/stable/dports/devel/gvfs:143561-145838
/users/devans/GNOME-3/unstable/dports/devel/gvfs:118152-120100,123992-125723,128305-134374

Modified: users/devans/GNOME-3/unstable/dports/devel/gvfs/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/gvfs/Portfile	2016-02-18 20:33:19 UTC (rev 145838)
+++ users/devans/GNOME-3/unstable/dports/devel/gvfs/Portfile	2016-02-18 20:47:21 UTC (rev 145839)
@@ -44,7 +44,8 @@
                     port:autoconf \
                     port:automake \
                     port:libtool \
-                    port:pidof
+                    port:pidof \
+                    port:gsed
 
 depends_lib         port:gtk3 \
                     port:gettext \
@@ -57,7 +58,8 @@
                     port:libsecret \
                     port:gnome-online-accounts
 
-patchfiles          patch-test-run-in-tree.sh.diff
+patchfiles          patch-test-run-in-tree.sh.diff \
+                    patch-test-gvfs-test.diff
 
 post-patch {
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}

Copied: users/devans/GNOME-3/unstable/dports/devel/gvfs/files/patch-test-gvfs-test.diff (from rev 145838, users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff)
===================================================================
--- users/devans/GNOME-3/unstable/dports/devel/gvfs/files/patch-test-gvfs-test.diff	                        (rev 0)
+++ users/devans/GNOME-3/unstable/dports/devel/gvfs/files/patch-test-gvfs-test.diff	2016-02-18 20:47:21 UTC (rev 145839)
@@ -0,0 +1,11 @@
+--- test/gvfs-test.orig	2016-02-18 11:43:03.000000000 -0800
++++ test/gvfs-test	2016-02-18 11:44:43.000000000 -0800
+@@ -63,7 +63,7 @@
+ have_httpd = httpd_cmd is not None
+ sshd_path = subprocess.check_output(['which', 'sshd'], universal_newlines=True).strip()
+ 
+-local_ip = subprocess.check_output("ip -4 addr | sed -nr '/127\.0\.0/ n; "
++local_ip = subprocess.check_output("ifconfig -a | gsed -nr '/127\.0\.0/ n; "
+                                    "/inet / {  s/^.*inet ([0-9.]+).*$/\\1/; p; q  }'",
+                                    shell=True, universal_newlines=True)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160218/61086d29/attachment.html>