Modified: svn:mergeinfo

Modified: trunk/dports/gnome/gedit/Portfile (147402 => 147403)

--- trunk/dports/gnome/gedit/Portfile	2016-04-03 00:42:59 UTC (rev 147402)
+++ trunk/dports/gnome/gedit/Portfile	2016-04-03 00:43:49 UTC (rev 147403)
@@ -3,9 +3,10 @@
 
 PortSystem          1.0
 PortGroup           active_variants 1.1
+PortGroup           gobject_introspection 1.0
 
 name                gedit
-version             3.18.3
+version             3.20.1
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         GNOME editor.
@@ -18,8 +19,8 @@
 
 use_xz              yes
 
-checksums           rmd160  06442911c6030a0ea551cdebcb243fb052e6ae8c \
-                    sha256  6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7
+checksums           rmd160  69f9d81d26ff4a1a41d6f0ec2c043f22951af9f8 \
+                    sha256  9a47e3073f844b67d7358f5a43c71ab04b442b70fcd3c629da77879e9a0c1dc4
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -38,12 +39,14 @@
                     port:libpeas \
                     port:libsoup \
                     port:libxml2 \
-                    port:enchant \
+                    port:gspell \
                     port:iso-codes \
                     port:vala
 
 depends_run         port:gnome-themes-standard
 
+gobject_introspection yes
+
 patchfiles          patch-configure.ac.diff
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
@@ -71,6 +74,14 @@
     configure.args-replace    --disable-python --enable-python
 }
 
+variant python35 conflicts description {Use python 3.5} {
+    depends_lib-append        port:py35-gobject3
+    configure.python          ${prefix}/bin/python3.5
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/3.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+    configure.args-replace    --disable-python --enable-python
+}
+
 variant quartz {}
 
 if {[variant_isset quartz]} {
@@ -84,7 +95,9 @@
     depends_run-append      port:yelp
 }
 
-default_variants    +python34
+if {![variant_isset python35]} {
+    default_variants    +python34
+}
 
 notes               "For extra functionality install gedit-plugins"
 

Modified: trunk/dports/gnome/gedit/files/patch-configure.ac.diff (147402 => 147403)

--- trunk/dports/gnome/gedit/files/patch-configure.ac.diff	2016-04-03 00:42:59 UTC (rev 147402)
+++ trunk/dports/gnome/gedit/files/patch-configure.ac.diff	2016-04-03 00:43:49 UTC (rev 147403)
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2015-07-20 08:37:46.000000000 -0700
 +++ configure.ac	2015-07-20 21:40:49.000000000 -0700
-@@ -177,8 +177,9 @@
+@@ -176,8 +176,9 @@
  
  IT_PROG_INTLTOOL([0.50.1])