<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/7d3a12d43619f4e0c722ba16f7c08c6b38dd6626">https://github.com/macports/macports-ports/commit/7d3a12d43619f4e0c722ba16f7c08c6b38dd6626</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7d3a12d43619f4e0c722ba16f7c08c6b38dd6626
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Tue Oct 9 11:27:52 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> diffuse: remove obsolete python2.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><span style='display:block; white-space:pre;color:#404040;'> - set pythonbin explicitly
</span><span style='display:block; white-space:pre;color:#404040;'> - use python PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize checksums
</span>---
devel/diffuse/Portfile | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/diffuse/Portfile b/devel/diffuse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9254393..8f8d7e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/diffuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/diffuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span>
name diffuse
version 0.4.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-prepend devel
</span> platforms darwin
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,40 +20,29 @@ long_description Diffuse is a small and simple text merge tool \
</span> homepage http://diffuse.sourceforge.net
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 473f7e82f57cc3a5ce0378eea8aede19a3f2a9df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c424ba8e48a86d0eeab2b51b15bb6f81dd23e95d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c424ba8e48a86d0eeab2b51b15bb6f81dd23e95d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 557966
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonexec ""
</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 {Use python26} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py26-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonexec ${prefix}/bin/python2.6
</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 python27 conflicts python26 description {Use python27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonexec ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python26]} {
</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;'>+depends_lib-append port:py${python.version}-pygtk
</span>
use_configure no
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${pythonexec}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${python.bin}|g" \
</span> ${worksrcpath}/src/usr/bin/diffuse
}
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ${pythonexec} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W "${worksrcpath}" "${python.bin} \
</span> ./install.py \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pythonbin=${python.bin} \
</span> --prefix=${prefix} \
--destdir=${destroot} \
--sysconfdir=${prefix}/etc"
</pre><pre style='margin:0'>
</pre>