<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3014d6ecb631f751d94066d5a6e34d2cb9e282d7">https://github.com/macports/macports-ports/commit/3014d6ecb631f751d94066d5a6e34d2cb9e282d7</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 3014d6e tao: Support Sierra and daemondo - Remove unused patchfiles
</span>3014d6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3014d6ecb631f751d94066d5a6e34d2cb9e282d7
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Wed Dec 27 14:40:29 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> tao: Support Sierra and daemondo
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove unused patchfiles
</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/55466
</span>---
devel/tao/Portfile | 33 ++--------------------
devel/tao/files/org.macports.tao_cosnaming.plist | 19 -------------
.../patch-ace-config-macosx-mountainlion.h.diff | 4 ---
.../files/patch-ace-config-macosx-sierra.h.diff | 11 ++++++++
...keinclude-platform_macosx_mountainlion.GNU.diff | 4 ---
5 files changed, 14 insertions(+), 57 deletions(-)
<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 5f8a4b1..b0f1b8d 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;'>@@ -12,6 +12,7 @@ PortSystem 1.0
</span> name tao
set name_package ACE+TAO
version 6.4.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> distname ${name_package}-${version}
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +42,8 @@ worksrcdir ACE_wrappers
</span>
patch.pre_args -p1
patchfiles patch-ace-config.h.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ace-config-macosx-sierra.h.diff \
</span> patch-include-makeinclude-platform_macros.GNU.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-include-makeinclude-platform_macosx_elcapitan.GNU.diff
</span>
checksums rmd160 2f1c9feee9744c64c0f8e1f866c841c40fedc986 \
sha256 7b71f06a2d92c45989886877ca301cf5ac263d23d40f82d5b19af4a5d6775fe9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,10 +80,6 @@ set subdirs { ace ACEXML ASNMP Kokyu apps netsvcs TAO/TAO_IDL TAO/tao TA
</span>
add_users ${taouser} group=${taouser} realname=TAO\ Server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/org.macports.${taodaemon}.plist ${worksrcpath}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@MACOSX@|${os.name}|g" \
${worksrcpath}/ace/config.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,18 +120,9 @@ variant ssl description {Enable SSL} {
</span> }
variant server description {Enable CosNaming server} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "patching org.macports.${taodaemon}.plist"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/org.macports.${taodaemon}.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@USER@|${taouser}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/org.macports.${taodaemon}.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@DAEMON@|${taodaemon}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/org.macports.${taodaemon}.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> startupitem.create yes
startupitem.name ${taodaemon}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable ${prefix}/bin/${taodaemon} -ORBListenEndpoints iiop://:2809
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,25 +150,10 @@ destroot {
</span> destroot.dir ${worksrcpath}/${subdir}
command_exec destroot
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${daemondir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/org.macports.${taodaemon}.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${daemondir}/org.macports.${taodaemon}.plist
</span> # Files required to build CosEvent classes but not installed
copy ${worksrcpath}/TAO/orbsvcs/orbsvcs/ESF ${destroot}/${prefix}/include/orbsvcs/ESF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch {[file delete -force ${daemondir}/org.macports.${taodaemon}.plist]}
</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;'>-pre-deactivate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch {system "launchctl unload ${daemondir}/org.macports.${taodaemon}.plist"}
</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> livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex "ACE\\+TAO-(\[0-9.\]+\[0-9\]+)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/org.macports.tao_cosnaming.plist b/devel/tao/files/org.macports.tao_cosnaming.plist
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d7f9b2d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/org.macports.tao_cosnaming.plist
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<?xml version='1.0' encoding='UTF-8'?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.apple.com/DTDs/PropertyList-1.0.dtd" >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<plist version='1.0'>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>Label</key><string>org.macports.@DAEMON@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@PREFIX@/bin/@DAEMON@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>-ORBListenEndpoints</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>iiop://:2809</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>Debug</key><false/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>Disabled</key><true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>KeepAlive</key><true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>StandardOutPath</key><string>@PREFIX@/var/log/tao/@DAEMON@.log</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<key>UserName</key><string>@USER@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-ace-config-macosx-mountainlion.h.diff b/devel/tao/files/patch-ace-config-macosx-mountainlion.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d43a84..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/patch-ace-config-macosx-mountainlion.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/ace/config-macosx-mountainlion.h 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/ace/config-macosx-mountainlion.h 2012-02-10 20:59:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ace/config-macosx-lion.h"
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..241080f
</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-ace-config-macosx-sierra.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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;'>+@@ -3,4 +3,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ace/config-macosx-elcapitan.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ACE_LACKS_CLOCKID_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ACE_LACKS_CLOCK_MONOTONIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ACE_LACKS_CLOCK_REALTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // ACE_CONFIG_MACOSX_SIERRA_H
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/files/patch-include-makeinclude-platform_macosx_mountainlion.GNU.diff b/devel/tao/files/patch-include-makeinclude-platform_macosx_mountainlion.GNU.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 024b58c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/files/patch-include-makeinclude-platform_macosx_mountainlion.GNU.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ACE_wrappers.orig/include/makeinclude/platform_macosx_mountainlion.GNU 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ACE_wrappers/include/makeinclude/platform_macosx_mountainlion.GNU 2012-02-10 22:47:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include $(ACE_ROOT)/include/makeinclude/platform_macosx_lion.GNU
</span></pre><pre style='margin:0'>
</pre>