<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/453df368d934751552c56808c037452432777665">https://github.com/macports/macports-ports/commit/453df368d934751552c56808c037452432777665</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 453df368d934751552c56808c037452432777665
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Sep 18 06:24:58 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> tcl/tk: install private header files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/17189
</span>---
lang/tcl/Portfile | 4 ++++
x11/tk/Portfile | 21 ++++++---------------
2 files changed, 10 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/tcl/Portfile b/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9530b93..8ef047d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name tcl
version 8.6.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> # Tk (x11/tk) port depends on this version
categories lang
license Tcl/Tk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +38,9 @@ post-configure {
</span> reinplace -E {s|-arch [^ ]+||g} ${worksrcpath}/tclConfig.sh
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/17189
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-private-headers
</span> destroot.destdir INSTALL_ROOT=${destroot}
post-destroot {
ln -s tclsh8.6 ${destroot}${prefix}/bin/tclsh
<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 86f814f..685f5da 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;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name tk
version 8.6.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories x11
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,17 +21,9 @@ master_sites sourceforge:project/tcl/Tcl/${version}
</span> dist_subdir tcltk
distname ${name}${version}-src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# suck in Tcl as well so we can use it internally.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append tcl${version}-src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums tk${version}-src.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8a900988a01aa267e8c23681dfab926e36c1caa9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8a900988a01aa267e8c23681dfab926e36c1caa9 \
</span> sha256 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4319854 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tcl${version}-src.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 53723adf560606dc0403af568b6fc0d27a4fd93d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9793786
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4319854
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,14 +39,13 @@ patch.dir ${workpath}/${name}${version}
</span> patchfiles patch-macosx-tkMacOSXXStubs.c.diff \
patch-unix-Makefile.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --mandir=${prefix}/share/man --with-tcl=${prefix}/lib
configure.cppflags -I${workpath}/tcl${version}/generic
configure.ldflags -L${worksrcpath} -L${prefix}/lib -lfontconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/17189
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-private-headers
</span> destroot.destdir INSTALL_ROOT=${destroot}
post-destroot {
ln -s wish8.6 ${destroot}${prefix}/bin/wish
</pre><pre style='margin:0'>
</pre>