<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ed01cbd8ca17659e5f47dbc888c1b175e0e1f0f">https://github.com/macports/macports-ports/commit/6ed01cbd8ca17659e5f47dbc888c1b175e0e1f0f</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 6ed01cb tk: whitespace changes only
</span>6ed01cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ed01cbd8ca17659e5f47dbc888c1b175e0e1f0f
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Thu May 25 02:07:03 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> tk: whitespace changes only
</span>---
x11/tk/Portfile | 74 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 40 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8333f0..064b740 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,23 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name tk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Tcl/Tk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Tcl Tool Kit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.tcl.tk/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is Tk version ${version}, a GUI toolkit for Tcl. The best way to get \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- started with Tcl is to read ``Tcl and the Tk Toolkit'' by John K. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/tcl/Tcl/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir tcltk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.6.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Tcl/Tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Tcl Tool Kit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.tcl.tk/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description This is Tk version ${version}, a GUI toolkit for Tcl. The best way to get \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ started with Tcl is to read ``Tcl and the Tk Toolkit'' by John K. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/tcl/Tcl/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir tcltk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}${version}-src
</span>
# suck in Tcl as well so we can use it internally.
distfiles-append tcl${version}-src${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,16 +29,15 @@ checksums tk${version}-src.tar.gz \
</span> rmd160 2386a69eb841f8af51c1b124f68e0b812a225cca \
sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
# force usage of MacPorts Tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:Xft2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXScrnSaver \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXScrnSaver
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}${version}/unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}${version}/unix
</span>
patch.dir ${workpath}/${name}${version}
patchfiles patch-unix-Makefile.in.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,16 +58,23 @@ post-destroot {
</span> }
if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-64bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-64bit
</span> }
if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >= 10} {
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:Xft2 port:xorg-libXScrnSaver port:fontconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXScrnSaver
</span> # tk.h still includes and uses types from X11/Xlib.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-delete -lfontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lfontconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-aqua
</span> post-destroot {
delete ${destroot}${prefix}/include/X11
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,8 +93,9 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append tcl_cv_type_64bit="long long"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcl_cv_type_64bit="long long"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {Tcl/Tk (\d+(?:\.\d+)*)</a>}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {Tcl/Tk (\d+(?:\.\d+)*)</a>}
</span></pre><pre style='margin:0'>
</pre>