<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f82c2a53748c3f0f592cd08a4d768aa8f5a9b58f">https://github.com/macports/macports-ports/commit/f82c2a53748c3f0f592cd08a4d768aa8f5a9b58f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f82c2a53748c3f0f592cd08a4d768aa8f5a9b58f
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Tue Oct 9 15:08:16 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> zim: remove Python 2.6 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add modeline
</span>---
editors/zim/Portfile | 43 ++++++++++++++-----------------------------
1 file changed, 14 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/zim/Portfile b/editors/zim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c05ae94..00a4db0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/zim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/zim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup python 1.0
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,48 +28,31 @@ distname zim-${version}
</span> checksums rmd160 49d1d483942736c26db6a9ba55e09b12cb297416 \
sha256 b37cef3d4906aa263abccb1493929a7ea6b9e8d11a50ed92cd437e8f93ffabbd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.link_binaries no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:desktop-file-utils
</span>
set app.icon icons/zim48.png
set app.executable ${workpath}/zim-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.link_binaries no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.bindir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:py${python.version}-gobject \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pygtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-xdg
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python26 description {Configure to use Python version 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.bindir ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-gobject \
</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-xdg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir-append --install-data=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --skip-xdg-cmd
</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;'>-variant python26 conflicts python27 description {Configure to use Python version 2.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.bindir ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py26-gobject \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py26-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py26-xdg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir-append --install-data=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --skip-xdg-cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python26] && ![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir-append --install-data=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --skip-xdg-cmd
</span>
pre-destroot {
xinstall -m 755 ${filespath}/zim ${destroot}${prefix}/bin
reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/bin/zim
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PYTHON_BINDIR__|${python.bindir}|g" ${destroot}${prefix}/bin/zim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PYTHON_BINDIR__|${python.prefix}/bin|g" ${destroot}${prefix}/bin/zim
</span> file copy ${filespath}/zim-app ${workpath}/zim-app
reinplace "s|__PREFIX__|${prefix}|g" ${workpath}/zim-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PYTHON_BINDIR__|${python.bindir}|g" ${workpath}/zim-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PYTHON_BINDIR__|${python.prefix}/bin|g" ${workpath}/zim-app
</span> }
post-activate {
</pre><pre style='margin:0'>
</pre>