Modified: svn:mergeinfo

Modified: users/devans/GNOME-3/stable/dports/gnome/totem/Portfile (147326 => 147327)

--- users/devans/GNOME-3/stable/dports/gnome/totem/Portfile	2016-04-01 22:22:36 UTC (rev 147326)
+++ users/devans/GNOME-3/stable/dports/gnome/totem/Portfile	2016-04-01 22:24:55 UTC (rev 147327)
@@ -5,8 +5,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                totem
-version             3.18.1
-revision            1
+version             3.20.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 # also has an exception allowing use of non-GPL-compatible plugins
@@ -27,8 +26,8 @@
 
 use_xz              yes
 
-checksums           rmd160  1ba1d59cb76d1948b471143a8e7dd2c0cf343bdb \
-                    sha256  d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2
+checksums           rmd160  0701be8d90a5ff54422c3f4299ee3a9298d27e8a \
+                    sha256  077b429054434418a311d6d5e38b35a4ee3716938451f326f519a373c87303df
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -38,8 +37,7 @@
                     port:gnome-common \
                     port:gtk-doc \
                     port:autoconf \
-                    port:automake \
-                    port:intltool
+                    port:automake
 
 depends_lib         port:desktop-file-utils \
                     port:gnome-desktop \
@@ -67,11 +65,12 @@
 depends_run         port:gnome-themes-standard \
                     port:yelp
 
-patchfiles          patch-vala-cflags.diff
+patchfiles          patch-vala-cflags.diff \
+                    patch-autogen.sh.diff
 
 gobject_introspection yes
 
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+# reconfigure using autogen.sh for intltool 0.51 compatibility
 
 configure.cmd       ./autogen.sh
 
@@ -96,7 +95,7 @@
     depends_lib-append        port:nautilus
 }
 
-variant python27 conflicts python34 description {Use python 2.7} {
+variant python27 conflicts python34 python35 description {Use python 2.7} {
     configure.python          ${prefix}/bin/python2.7
     depends_lib-append        port:py27-gobject3 port:py27-pylint
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
@@ -105,7 +104,7 @@
     configure.args-replace    --disable-python --enable-python
 }
 
-variant python34 conflicts python27 description {Use python 3.4} {
+variant python34 conflicts python27 python35 description {Use python 3.4} {
     configure.python          ${prefix}/bin/python3.4
     depends_lib-append        port:py34-gobject3 port:py34-pylint
     set python_framework      ${frameworks_dir}/Python.framework/Versions/3.4
@@ -114,7 +113,16 @@
     configure.args-replace    --disable-python --enable-python
 }
 
-if {![variant_isset python27]} {
+variant python35 conflicts python27 python34 description {Use python 3.5} {
+    configure.python          ${prefix}/bin/python3.5
+    depends_lib-append        port:py34-gobject3 port:py35-pylint
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/3.4
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+    configure.env              PATH=${python_framework}/bin:$env(PATH)
+    configure.args-replace    --disable-python --enable-python
+}
+
+if {![variant_isset python27] && ![variant_isset python35]} {
     default_variants    +python34
 }