Revision: 147311 https://trac.macports.org/changeset/147311 Author: devans@macports.org Date: 2016-04-01 14:25:13 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: gvfs, update to version 1.28.0, add variants +python34 +python35, default +python34. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff Property Changed: ---------------- users/devans/GNOME-3/stable/dports/devel/gvfs/ Property changes on: users/devans/GNOME-3/stable/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/unstable/dports/devel/gvfs:118152-120100,123992-125723,128305-134374,143561-147065 Modified: users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile 2016-04-01 21:20:26 UTC (rev 147310) +++ users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile 2016-04-01 21:25:13 UTC (rev 147311) @@ -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: users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff =================================================================== --- users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff 2016-04-01 21:20:26 UTC (rev 147310) +++ users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff 2016-04-01 21:25:13 UTC (rev 147311) @@ -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()