Modified: svn:mergeinfo

Modified: trunk/dports/devel/gvfs/Portfile (147401 => 147402)

--- trunk/dports/devel/gvfs/Portfile	2016-04-03 00:42:23 UTC (rev 147401)
+++ trunk/dports/devel/gvfs/Portfile	2016-04-03 00:42:59 UTC (rev 147402)
@@ -5,7 +5,7 @@
 
 name                gvfs
 epoch               1
-version             1.26.3
+version             1.28.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 maintainers         devans openmaintainer
 categories          devel
@@ -35,8 +35,8 @@
 
 use_xz              yes
 
-checksums           rmd160  2cb33b022c34d1493fd44e90d3ddb7c6095e6191 \
-                    sha256  a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a
+checksums           rmd160  94bd782c3a244763cbd6a779330c9f168b01ed32 \
+                    sha256  cf72fc0adf0ca702ead5b3fab3c1fa46b09678eb7c1290de7e30bb7cbaf5f704
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -45,8 +45,7 @@
                     port:automake \
                     port:libtool \
                     port:pidof \
-                    port:gsed \
-                    port:py34-gobject3
+                    port:gsed
 
 depends_lib         port:gtk3 \
                     port:gettext \
@@ -64,9 +63,6 @@
 
 post-patch {
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-    reinplace "s|^#!.*|#!${prefix}/bin/python3.4|" \
-        ${worksrcpath}/test/gvfs-test \
-        ${worksrcpath}/test/test_polkitd.py
 }
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
@@ -107,6 +103,28 @@
         ${destroot}${docdir}
 }
 
+variant python34 conflicts python35 description {Use Python 3.4 for testing} {
+    depends_build-append port:py34-gobject3
+    post-patch {
+        reinplace "s|^#!.*|#!${prefix}/bin/python3.4|" \
+            ${worksrcpath}/test/gvfs-test \
+            ${worksrcpath}/test/test_polkitd.py
+    }
+}
+
+variant python35 conflicts python35 description {Use Python 3.5 for testing} {
+    depends_build-append port:py34-gobject3
+    post-patch {
+        reinplace "s|^#!.*|#!${prefix}/bin/python3.5|" \
+            ${worksrcpath}/test/gvfs-test \
+            ${worksrcpath}/test/test_polkitd.py
+    }
+}
+
+if {![variant_isset python35]} {
+   default_variants +python34
+} 
+
 post-activate {
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
     system "${prefix}/bin/gio-querymodules ${prefix}/lib/gio/modules"

Modified: trunk/dports/devel/gvfs/files/patch-test-gvfs-test.diff (147401 => 147402)

--- trunk/dports/devel/gvfs/files/patch-test-gvfs-test.diff	2016-04-03 00:42:23 UTC (rev 147401)
+++ trunk/dports/devel/gvfs/files/patch-test-gvfs-test.diff	2016-04-03 00:42:59 UTC (rev 147402)
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -62,7 +62,7 @@
  have_httpd = httpd_cmd is not None
  sshd_path = subprocess.check_output(['which', 'sshd'], universal_newlines=True).strip()