<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/ab2c84c93203767ce96ab0c89288f8ea17a75700">https://github.com/macports/macports-ports/commit/ab2c84c93203767ce96ab0c89288f8ea17a75700</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 ab2c84c  oce: update version 0.17.2->0.18.3
</span>ab2c84c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ab2c84c93203767ce96ab0c89288f8ea17a75700
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jul 28 20:37:41 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    oce: update version 0.17.2->0.18.3
</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/56427
</span>---
 graphics/oce/Portfile                              | 45 +++++-----------------
 .../files/patch-src-OSD-OSD_Chronometer.cxx.diff   | 13 -------
 2 files changed, 10 insertions(+), 48 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/oce/Portfile b/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd11062..215c2c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup                   cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup                   cmake 1.1
</span> PortGroup                   github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup                tpaviot oce 0.17.2 OCE-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup                tpaviot oce 0.18.3 OCE-
</span> set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  graphics
 platforms                   darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,25 +15,17 @@ description                 Open CASCADE Community Edition
</span> 
 long_description            ${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums                   rmd160  0894502fe6dec7dc6be566dddc00bc0914e0b9a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  e73f1cb3bfd087abb903296944ea159d51266748a6b05162d0ee927ec3bb40cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums                   rmd160  3bfe060893dca29baefd70d88b05098f9457ee20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  792ec7d735f1e8ffb9db4bf20fc724c6ec2d2a435aa78e5df795c36fb0f360a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    24636499
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append          port:freetype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable redundant definitions provided by OS time.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {16 <= ${os.major}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append       patch-src-OSD-OSD_Chronometer.cxx.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OCE is the Open CASCADE Community Edition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts                   opencascade
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# tell CMake to build in a build directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir               ${workpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir                   ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file mkdir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args         ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append          port:freetype
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append       -DOCE_INSTALL_PREFIX:PATH=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append       -DOCE_INSTALL_PREFIX:PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DOCE_INSTALL_CMAKE_DATA_DIR:PATH=${prefix}/lib/cmake/${subport}
</span> 
 variant test description {Build and run unit testing framework} {
     configure.args-append   -DOCE_TESTING:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,20 +53,3 @@ variant gl2ps description {Build with gl2ps support} {
</span>     depends_lib-append      port:gl2ps
     configure.args-append   -DOCE_WITH_GL2PS:BOOL=ON
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # modify installation paths relative to ${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|\\\${SELF_DIR}/../../../../include/oce|${prefix}/include/oce|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/OCE.framework/Versions/${branch}/Resources/OCEConfig.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|^get.*_IMPORT_PREFIX.*CMAKE.*|set(_IMPORT_PREFIX \\\"${prefix}\\\")|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/OCE.framework/Versions/${branch}/Resources/OCE-libraries.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace {/^get.*_IMPORT_PREFIX.*/d} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/OCE.framework/Versions/${branch}/Resources/OCE-libraries.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # installing OCE.framework in ${prefix} violates the layout of the ports-filesystems!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # move it to ${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    move ${destroot}${prefix}/OCE.framework \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${frameworks_dir}/OCE.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff b/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 438f431..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/OSD/OSD_Chronometer.cxx.orig       2016-06-02 07:18:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/OSD/OSD_Chronometer.cxx    2016-10-16 16:56:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,10 +51,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "gettime_osx.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</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;'>- //function : GetProcessCPU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //purpose  :
</span></pre><pre style='margin:0'>

</pre>