<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/ae81c904577fa847e68fb24969fd03d2f0b57cb7">https://github.com/macports/macports-ports/commit/ae81c904577fa847e68fb24969fd03d2f0b57cb7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ae81c904577fa847e68fb24969fd03d2f0b57cb7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 3 12:54:40 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    ocaml-labltk: update version 8.06.5->8.06.7
</span>---
 graphics/ocaml-labltk/Portfile                   | 20 +++++------
 graphics/ocaml-labltk/files/patch-configure.diff | 46 +++++++++++++++++-------
 2 files changed, 42 insertions(+), 24 deletions(-)

<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 ca1c478..f87e483 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;'>@@ -1,11 +1,11 @@
</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
 PortSystem          1.0
 PortGroup           ocaml 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           github 1.0
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        garrigue labltk 8.06.7
</span> name                ocaml-labltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# warning: master_sites may change for each version update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             8.06.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          graphics devel ocaml
 license             {LGPL-2.1 OpenSSLException}
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,16 +15,13 @@ long_description    LablTk is an interface to the Tcl/Tk GUI framework. It \
</span>                     safe way. A legacy Camltk interface is included. The \
                     OCamlBrowser library viewer is also part of this project.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            labltk-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage            https://garrigue.github.io/labltk/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://forge.ocamlcore.org/frs/download.php/1764
</span> 
 platforms           darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  1927fc13439bfeaec4e37c5c28adfd75ad9ccf6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  92ff3358cd28d6b0c60d17367a875cd895741dbebae20ba310ee4d1e7c31fd71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    370149
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  75066326b578a48c141da8e3a3a228b7aa2920d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  9345472103c8a85099a02532925b7562ec057940eba7540779c85124157adfa8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    370977
</span> 
 # in searching for headers and libraries, search ${prefix} first
 patchfiles-append   patch-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,5 +44,6 @@ pre-destroot {
</span> }
 
 build.target-append opt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir    BINDIR=${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    LIBDIR=${destroot}${prefix}/lib/ocaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir    INSTALLDIR=${destroot}${prefix}/lib/ocaml/labltk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    INSTALLBINDIR=${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    STUBLIBDIR=${destroot}${prefix}/lib/ocaml/stublibs
</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><span style='display:block; white-space:pre;color:#808080;'>index a3bf10b..4286064 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocaml-labltk/files/patch-configure.diff
</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;'>@@ -1,29 +1,49 @@
</span> --- configure.orig        2017-07-18 20:52:12.000000000 -0700
 +++ configure  2017-11-25 23:46:25.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,22 +174,8 @@
</span>    tcl_version=''
    tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
    for tk_incs in \
 -    "-I/usr/local/include" \
<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;'>+-    "-I/usr/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/X11/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/include/tcl8.6 -I/usr/include/tk8.6" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/include/tcl8.5 -I/usr/include/tk8.5" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/include/tcl8.4 -I/usr/include/tk8.4" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/include/tcl8.3 -I/usr/include/tk8.3" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "-I/usr/include/tcl8.2 -I/usr/include/tk8.2"
</span> +    "-I__MACPORTS_PREFIX__/include" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     "-I/opt/local/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     "-I/sw/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     "-I/usr/pkg/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "-I/usr/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   do if test -z "$tcl_version"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     tk_defs="$tk_incs"
</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;'>+@@ -224,11 +210,7 @@
</span>      tkinclude="$tk_x11_include"
    fi  
    case "$tkinclude" in
 -  -I/opt/local/include*) tklibdir="/opt/local/lib" ;;
<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;'>+-  -I/usr/X11/include*) tklibdir="/usr/X11/lib" ;;
</span> +  -I__MACPORTS_PREFIX__/include*) tklibdir="__MACPORTS_PREFIX__/lib" ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   -I/usr/local/include*) tklibdir="/usr/local/lib" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   -I/sw/include*) tklibdir="/sw/lib" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   -I/usr/pkg/include*) tklibdir="/usr/pkg/lib" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     inf "Tcl/Tk libraries found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if test -n "$tklibdir"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     case "$system" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,7 +252,7 @@
</span>    else
      has_tk=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>--    for tklibdir in "/usr/local/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    for tklibdir in "__MACPORTS_PREFIX__/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     for tklibdir in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      "/usr/local/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib"  "/usr/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      "__MACPORTS_PREFIX__/lib" "/usr/lib";
</span>      do
<span style='display:block; white-space:pre;background:#ffe0e0;'>-       if test $found = no &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if test $has_tk = false &&
</span>           sh ./hasgot -L$tklibdir $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid
</pre><pre style='margin:0'>

</pre>