<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/4ab11a55ac44bf72ed241d161a4663ad7b7df99b">https://github.com/macports/macports-ports/commit/4ab11a55ac44bf72ed241d161a4663ad7b7df99b</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 4ab11a5  ocaml-labltk: ensure MacPorts' tcl/tk is found
</span>4ab11a5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4ab11a55ac44bf72ed241d161a4663ad7b7df99b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 25 23:52:56 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    ocaml-labltk: ensure MacPorts' tcl/tk is found
</span>---
 graphics/ocaml-labltk/Portfile                   |  8 ++++++-
 graphics/ocaml-labltk/files/patch-configure.diff | 29 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocaml-labltk/Portfile b/graphics/ocaml-labltk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbe59f8..390817c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocaml-labltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ocaml-labltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ name                ocaml-labltk
</span> # there is a newer version, but it only works for ocaml 4.06
 # warning: master_sites may change for each version update
 version             8.06.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          graphics devel ml
 license             {LGPL-2.1 OpenSSLException}
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,12 @@ platforms           darwin
</span> checksums           rmd160  c77826d6fc658756a25a52d9930e5edc0fa19b65 \
                     sha256  b6b7076f6a2a7b2f63095013cb4e37a1f2a6eb3d4abb57dbb1b8cff1ae4c6ae6
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# in searching for headers and libraries, search ${prefix} first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append  port:tk
 
 configure.pre_args  -libdir ${prefix}/lib/ocaml \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,4 +48,3 @@ pre-destroot {
</span> destroot.target     install
 destroot.destdir    BINDIR=${destroot}${prefix}/bin \
                     LIBDIR=${destroot}${prefix}/lib/ocaml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocaml-labltk/files/patch-configure.diff b/graphics/ocaml-labltk/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a3bf10b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ocaml-labltk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-07-18 20:52:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure      2017-11-25 23:46:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tcl_version=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   for tk_incs in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "-I__MACPORTS_PREFIX__/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "-I/opt/local/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "-I/sw/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "-I/usr/pkg/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     tkinclude="$tk_x11_include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi  
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   case "$tkinclude" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  -I/opt/local/include*) tklibdir="/opt/local/lib" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  -I__MACPORTS_PREFIX__/include*) tklibdir="__MACPORTS_PREFIX__/lib" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   -I/usr/local/include*) tklibdir="/usr/local/lib" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   -I/sw/include*) tklibdir="/sw/lib" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   -I/usr/pkg/include*) tklibdir="/usr/pkg/lib" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     inf "Tcl/Tk libraries found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     has_tk=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    for tklibdir in "/usr/local/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    for tklibdir in "__MACPORTS_PREFIX__/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if test $found = no &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          sh ./hasgot -L$tklibdir $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid
</span></pre><pre style='margin:0'>

</pre>