<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/94ae5a1b2ca64dd426bd7cd8ac6bfa5de3cc102d">https://github.com/macports/macports-ports/commit/94ae5a1b2ca64dd426bd7cd8ac6bfa5de3cc102d</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 94ae5a1  ace, tao: update to 6.5.2
</span>94ae5a1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 94ae5a1b2ca64dd426bd7cd8ac6bfa5de3cc102d
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Sep 23 15:37:04 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    ace, tao: update to 6.5.2
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Update homepage
</span><span style='display:block; white-space:pre;color:#404040;'>    * Add support for Mojave
</span><span style='display:block; white-space:pre;color:#404040;'>    * Livecheck does not work from two URLs at the same time
</span><span style='display:block; white-space:pre;color:#404040;'>    * Fixes for universal builds
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/56699
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/56700
</span>---
 devel/ace/Portfile                                 | 45 ++++++----------
 devel/ace/files/patch-ace-config.h.diff            |  4 +-
 devel/ace/files/patch-archflags.diff               | 63 ++++++++++++++++++++++
 ...ch-include-makeinclude-platform_macros.GNU.diff |  4 +-
 devel/tao/Portfile                                 | 40 ++++++--------
 .../files/patch-ace-config-macosx-sierra.h.diff    |  4 +-
 devel/tao/files/patch-ace-config.h.diff            |  4 +-
 devel/tao/files/patch-archflags.diff               | 63 ++++++++++++++++++++++
 ...ch-include-makeinclude-platform_macros.GNU.diff |  4 +-
 9 files changed, 167 insertions(+), 64 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ace/Portfile b/devel/ace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb1d0ae..f527782 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                ace
 set name_package    ACE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             6.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             6.5.2
</span> distname            ${name_package}-${version}
 categories          devel
 maintainers         {gmail.com:tlockhart1976 @lockhart} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ long_description    The ADAPTIVE Communication Environment (ACE) is a freely ava
</span> 
 conflicts           tao
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://www.cs.wustl.edu/~schmidt/ACE.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            http://www.dre.vanderbilt.edu/~schmidt/ACE.html
</span> master_sites        http://download.dre.vanderbilt.edu/previous_versions
 
 universal_variant   yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,15 +34,15 @@ use_bzip2           yes
</span> 
 worksrcdir          ACE_wrappers
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args      -p1
</span> patchfiles          patch-ace-config.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-include-makeinclude-platform_macros.GNU.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-archflags.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  0b8a65df846331bec1d69ce781d22508cf67f37f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  0f8121a8e3f49e217644a353d439d148f1d6fe52487ae6bd80572a2bb4f30ca4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    8381452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  20c75a6e764d4896f946e35350c1b579c6537c07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  f0393d6df25ee92e0cbc6539c68ccf122caae0ffd5ae9a786163403bb2306cc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    8074873
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set os.name "sierra"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set os.name "highsierra"
</span> array set os.names {
      7  panther
      8  tiger
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,7 @@ array set os.names {
</span>     15  elcapitan
     16  sierra
     17  highsierra
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    18  mojave
</span> }
 foreach {key value} [array get os.names]  {
     if {${key} == ${os.major}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,32 +71,16 @@ post-patch {
</span>     reinplace "s|@MACOSX@|${os.name}|g" \
         ${worksrcpath}/ace/config.h \
         ${worksrcpath}/include/makeinclude/platform_macros.GNU
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@CFLAGS@@|[get_canonical_archflags cc]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@LDFLAGS@@|[get_canonical_archflags ld] -stdlib=${configure.cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@CXXFLAGS@@|[get_canonical_archflags cc] -stdlib=${configure.cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span> }
 
 depends_lib-append  path:bin/perl:perl5
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc setuniversalflags {fname cxxflags ldflags} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set apat "-arch \[ \]*\[a-z\]\[_a-z0-9\]*"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[file exists ${fname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|^\\(\[ \]*FLAGS_C_CC\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${cxxflags}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${fname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|^\\(\[ \]*LDFLAGS\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${ldflags}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${fname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_warn "File ${fname} not found for patching"
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_info "patching platform_macros.GNU"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|buildbits=64|buildbits=universal|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/include/makeinclude/platform_macros.GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        setuniversalflags ${worksrcpath}/include/makeinclude/platform_macosx_${os.name}.GNU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${configure.universal_cxxflags} ${configure.universal_ldflags}
</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;'>-
</span> variant ssl description {Enable SSL} {
     depends_lib-append path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ace/files/patch-ace-config.h.diff b/devel/ace/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a835d31..f769c00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ace/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ace/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/ace/config.h 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/ace/config.h      2012-02-10 20:59:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ace/config.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ace/config.h
</span> @@ -0,0 +1,8 @@
 +// ACE_LACKS_CLOCKID_T and ACE_LACKS_CLOCK_MONOTONIC were needed sometime before Mountain Lion
 +// but are not needed for Sierra. Do not yet have info for releases in between.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ace/files/patch-archflags.diff b/devel/ace/files/patch-archflags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3d4903c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ace/files/patch-archflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_common.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,6 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS         += -flat_namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(universal),1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  CFLAGS += -arch i386 -arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS += -arch i386 -arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += @@CFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += @@LDFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FLAGS_C_CC += @@CXXFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_lion.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_lion.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,27 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSLIB?=$(ACE_ROOT)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),universal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq (,$(buildbits))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC:=clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX:=clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_NDDS_FLAGS=-ppPath cpp-4.2 -I.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_snowleopard.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_snowleopard.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,17 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),universal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_NDDS_FLAGS="-ppPath cpp-4.2 -I."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ace/files/patch-include-makeinclude-platform_macros.GNU.diff b/devel/ace/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 81399fc..1b32372 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ace/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ace/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/include/makeinclude/platform_macros.GNU      1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/include/makeinclude/platform_macros.GNU   2012-02-10 22:47:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macros.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macros.GNU
</span> @@ -0,0 +1,12 @@
 +buildbits=64
 +universal=0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/Portfile b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2c42e7..6e593dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortSystem          1.0
</span> 
 name                tao
 set name_package    ACE+TAO
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             6.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             6.5.2
</span> distname            ${name_package}-${version}
 categories          devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,8 @@ long_description    The ACE ORB (TAO) is a real-time implementation of CORBA bui
</span> 
 conflicts           ace
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://www.cs.wustl.edu/~schmidt/TAO.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        http://download.dre.vanderbilt.edu/previous_versions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ftp://download.dre.vanderbilt.edu/previous_versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            http://www.dre.vanderbilt.edu/~schmidt/TAO.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        http://download.dre.vanderbilt.edu/previous_versions
</span> 
 universal_variant   yes
 default_variants    +server
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,16 +38,16 @@ use_bzip2           yes
</span> 
 worksrcdir          ACE_wrappers
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args      -p1
</span> patchfiles          patch-ace-config.h.diff \
                     patch-ace-config-macosx-sierra.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-include-makeinclude-platform_macros.GNU.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-archflags.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  011c4bce5cde3cf0fa617133b18b31ee465318ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5d0592e0d06bcdc79bf59372ea6302a1ccc72fc3c733de5f738dfc0c83f1c6c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    23464186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5f2877aa12727ec1f8b26c9965c0e6b97158f44d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  033e4d119db3f3a5da98dbfc0754b02e2dbe73b17c2927c95711d8b15f4cc86f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    21636691
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set os.name "sierra"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set os.name "highsierra"
</span> array set os.names {
      7  panther
      8  tiger
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +60,7 @@ array set os.names {
</span>     15  elcapitan
     16  sierra
     17  highsierra
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    18  mojave
</span> }
 foreach {key value} [array get os.names]  {
     if {${key} == ${os.major}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,26 +80,18 @@ post-patch {
</span>     reinplace "s|@MACOSX@|${os.name}|g" \
         ${worksrcpath}/ace/config.h \
         ${worksrcpath}/include/makeinclude/platform_macros.GNU
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@CFLAGS@@|[get_canonical_archflags cc]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@LDFLAGS@@|[get_canonical_archflags ld] -stdlib=${configure.cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@CXXFLAGS@@|[get_canonical_archflags cc] -stdlib=${configure.cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/include/makeinclude/platform_macosx_common.GNU
</span> }
 
 depends_lib-append  path:bin/perl:perl5 \
                     port:tcl \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_info "patching platform_macros.GNU"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|buildbits=64|buildbits=universal|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/include/makeinclude/platform_macros.GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set apat "-arch \[ \]*\[a-z\]\[_a-z0-9\]*"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|${apat}\\(\[ \]*${apat}\\)*|${configure.universal_cxxflags}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_info "patching platform_macosx_snowleopard.GNU"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|${apat}\\(\[ \]*${apat}\\)*|${configure.universal_cxxflags}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/include/makeinclude/platform_macosx_snowleopard.GNU
</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;'>-
</span> variant ssl description {Enable SSL} {
     depends_lib-append path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-ace-config-macosx-sierra.h.diff b/devel/tao/files/patch-ace-config-macosx-sierra.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 241080f..ccc836b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/patch-ace-config-macosx-sierra.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/files/patch-ace-config-macosx-sierra.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers/ace/config-macosx-sierra.h.orig   2017-09-07 00:02:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/ace/config-macosx-sierra.h        2017-09-17 12:47:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ace/config-macosx-sierra.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ace/config-macosx-sierra.h
</span> @@ -3,4 +3,8 @@
  
  #include "ace/config-macosx-elcapitan.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-ace-config.h.diff b/devel/tao/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a835d31..f769c00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/files/patch-ace-config.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/ace/config.h 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/ace/config.h      2012-02-10 20:59:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ace/config.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ace/config.h
</span> @@ -0,0 +1,8 @@
 +// ACE_LACKS_CLOCKID_T and ACE_LACKS_CLOCK_MONOTONIC were needed sometime before Mountain Lion
 +// but are not needed for Sierra. Do not yet have info for releases in between.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-archflags.diff b/devel/tao/files/patch-archflags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3d4903c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/files/patch-archflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_common.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,6 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS         += -flat_namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(universal),1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  CFLAGS += -arch i386 -arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS += -arch i386 -arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += @@CFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += @@LDFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FLAGS_C_CC += @@CXXFLAGS@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_lion.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_lion.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,27 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSLIB?=$(ACE_ROOT)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),universal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq (,$(buildbits))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC:=clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX:=clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_NDDS_FLAGS=-ppPath cpp-4.2 -I.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macosx_snowleopard.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macosx_snowleopard.GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,17 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(buildbits),universal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FLAGS_C_CC += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  LDFLAGS    += -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLATFORM_NDDS_FLAGS="-ppPath cpp-4.2 -I."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff b/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 72c2635..22d2255 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/include/makeinclude/platform_macros.GNU      1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/include/makeinclude/platform_macros.GNU   2012-02-10 22:47:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/makeinclude/platform_macros.GNU.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/makeinclude/platform_macros.GNU
</span> @@ -0,0 +1,13 @@
 +buildbits=64
 +universal=0
</pre><pre style='margin:0'>

</pre>