<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/9de3c7a356d994bd08f8f538b4205a75ce5acfe2">https://github.com/macports/macports-ports/commit/9de3c7a356d994bd08f8f538b4205a75ce5acfe2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9de3c7a356d994bd08f8f538b4205a75ce5acfe2
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 30 09:29:55 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    camlimages: update version 4.2.6->5.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    CamlImages has changed its build method from oamke to dune (jbuilder).
</span>---
 ocaml/camlimages/Portfile                      | 62 +++++++++-----------------
 ocaml/camlimages/files/patch-rgb_location.diff | 13 ++++++
 2 files changed, 35 insertions(+), 40 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/Portfile b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0061617..a46d920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,10 @@
</span> PortSystem          1.0
 PortGroup           active_variants 1.1
 PortGroup           bitbucket 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           ocaml 1.1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup     camlspotter camlimages 4.2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup     camlspotter camlimages 5.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          ocaml devel graphics
 license             {LGPL-2 Permissive}
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,53 +19,34 @@ homepage            http://gallium.inria.fr/camlimages/
</span> 
 platforms           darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  f33df37a3803cd33cffec0845d5e266225e1b1a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e64a5ab0ee7612b7cad5335cedd6d37b46469cc4169d8cc2ebb0dcb069c03042 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    846615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ocaml.build_type    dune
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:ocaml-findlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:omake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  04b9ede7129304c5b69fcd99835c8f72490216ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  30b7d2043c180e950e8a0a96f5569b8932615c3b992a73cb79540098b4e36ac1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    845096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-rgb_location.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" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/config/ciconfig.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:freetype \
</span>                     port:ghostscript \
                     port:giflib \
                     port:jpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:lablgtk2 \
</span>                     port:libpng \
                     port:libexif \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:ocaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:ocaml-configurator \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:ocaml-cppo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:rgb \
</span>                     port:tiff \
                     port:xpm
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ld_archflags -m32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ld_archflags -m64
</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;'>-configure.cmd       omake --configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      --verbose INCLUDES="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    LDFLAGS='${configure.ldflags} ${configure.ld_archflags}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CFLAGS='${configure.cflags} ${configure.cc_archflags}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CC=${configure.cc} CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    SUPPORT_LABLGTK2=fals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           omake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          --verbose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args       ${build.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set ocaml_destdir "${destroot}[exec ocamlfind printconf destdir]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${ocaml_destdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.env    OCAMLFIND_DESTDIR=${ocaml_destdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    OCAMLFIND_LDCONF=ignore
</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 lablgtk2 description {add support for GTK 2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:lablgtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.args-replace    SUPPORT_LABLGTK2=false \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          SUPPORT_LABLGTK2=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.args-replace SUPPORT_LABLGTK2=false \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          SUPPORT_LABLGTK2=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # camlimages builds differently depending on graph variant of findlib
 variant graph description {add support for the graph library} {
     require_active_variants ocaml-findlib graph
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/files/patch-rgb_location.diff b/ocaml/camlimages/files/patch-rgb_location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2f0ce1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/camlimages/files/patch-rgb_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/ciconfig.ml.orig        2018-04-01 21:53:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/ciconfig.ml     2019-12-30 08:34:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,9 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let rgb_txt = find_file "rgb.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    [ "/etc/X11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ; "/usr/share/X11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ; "/usr/X11/share/X11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    [ "__MACPORTS_PREFIX__/share/X11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let xs =
</span></pre><pre style='margin:0'>

</pre>