<pre style='margin:0'>
Eric Le Lay (elelay) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e80bec0273eea0f31a6416c2a3b0d3353b6a1c4d">https://github.com/macports/macports-ports/commit/e80bec0273eea0f31a6416c2a3b0d3353b6a1c4d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e80bec0  meld: update to 3.18.0 (python3)
</span>e80bec0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e80bec0273eea0f31a6416c2a3b0d3353b6a1c4d
</span>Author: Eric Le Lay <elelay@macports.org>
AuthorDate: Sat Oct 14 16:07:12 2017 +0200

<span style='display:block; white-space:pre;color:#404040;'>    meld: update to 3.18.0 (python3)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - adopt it
</span><span style='display:block; white-space:pre;color:#404040;'>    - move yelp dependency to variant
</span><span style='display:block; white-space:pre;color:#404040;'>    - make an application
</span><span style='display:block; white-space:pre;color:#404040;'>    closes: https://trac.macports.org/ticket/55092
</span>---
 textproc/meld/Portfile | 54 ++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/meld/Portfile b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34f9b2a..c52ffb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem              1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup               python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup               app 1.0
</span> 
 name                    meld
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version                 1.8.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                 3.18.0
</span> categories              textproc devel
 license                 GPL-2+
 platforms               darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers             nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers             @elelay openmaintainer
</span> homepage                http://meldmerge.org/
 description             Visual diff and merge tool.
 long_description        Meld is a visual diff and merge tool. You can compare \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,36 +23,41 @@ long_description        Meld is a visual diff and merge tool. You can compare \
</span> master_sites            gnome:sources/${name}/[join [lrange [split $version .] 0 1] .]
 use_xz                  yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  7c981c08a015a1a0706cbe98416a25e0963af0cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  af96682b8f4bf3ad4221c853b1516218d62a17ff43c38f4a83e7e8ac6736e8a5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  04a24763fd112b787824145cd18eff48faeb63bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e
</span> 
 depends_build           port:intltool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:shared-mime-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:rarian \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py27-pygtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py27-gobject \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py27-pygtksourceview
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions         36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version  36
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# yelp is required to display help files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see #55092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent running gtk-update-icon-cache and glib-compile-schema during install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd            "${python.bin} setup.py [python_get_defaults setup_args] --no-update-icon-cache --no-compile-schemas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# install everything under prefix, except libraries, that go under Library/Frameworks/Python...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir        "--prefix=${prefix} --install-lib=[python_get_defaults pkgd] --root=${destroot}"
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run             port:yelp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/INSTALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|#! /usr/bin/env python|#! ${prefix}/bin/python2.7|" ${worksrcpath}/bin/meld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure           no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args              PYTHON=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:gtksourceview3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-gobject3
</span> 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/scrollkeeper-update"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/HighContrast"
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# yelp is a heavy dependency (webkit2-gtk3, gstreamer, etc.) so only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# require it as an option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant help description {Meld user manual (requires yelp)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_run-append port:yelp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "${prefix}/bin/scrollkeeper-update"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon                data/icons/hicolor/scalable/apps/meld.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable          "${prefix}/bin/meld"
</span></pre><pre style='margin:0'>

</pre>