<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/b764324e5f6027f294cb03414234549ccc1c5584">https://github.com/macports/macports-ports/commit/b764324e5f6027f294cb03414234549ccc1c5584</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b764324e5f6027f294cb03414234549ccc1c5584
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Sun Mar 18 14:49:50 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    omniORB: Add python27 and python36 variants
</span><span style='display:block; white-space:pre;color:#404040;'>     - Fix python files install location
</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/55790
</span>---
 devel/omniORB/Portfile | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/omniORB/Portfile b/devel/omniORB/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1369879..b3faffa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/omniORB/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/omniORB/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,6 @@ long_description    omniORB is a robust high performance CORBA ORB for C++ and \
</span> homepage            http://omniorb.sourceforge.net/
 
 conflicts_build     ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:python27
</span> 
 master_sites        sourceforge:project/omniorb/omniORB/omniORB-${version}/
 use_bzip2           yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +31,6 @@ post-patch {
</span>         ${worksrcpath}/mk/beforeauto.mk.in
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python    ${prefix}/bin/python2.7
</span> configure.args      CC="${configure.cc}" \
                     CXX="${configure.cxx}" \
                     CCFLAGS="[get_canonical_archflags cc]" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,14 +42,45 @@ if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
</span>     configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# force a global variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 description {Build Python 2.7 IDL support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.python            ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework        ${frameworks_dir}/Python.framework/Versions/2.7/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.pkg_config_path   ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes "Install py27-omniORBpy for omniORBpy."
</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;'>+variant python36 conflicts python27 description {Build Python 3.6 IDL support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.python            ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework        ${frameworks_dir}/Python.framework/Versions/3.6/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.pkg_config_path   ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes "Install py36-omniORBpy for omniORBpy."
</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;'>+if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants +python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ssl description {Enable SSL support} {
     configure.args-append   --with-openssl
     depends_lib-append      path:lib/libssl.dylib:openssl
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Install py27-omniORBpy for omniORBpy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # omniORB installs into /opt/local/lib/python3.6/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # but omniORBpy installs into /opt/local/Library/Frameworks/Python.framework/Versions/X.Y/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # so adjust locations for this package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file mkdir [file normalize ${destroot}${python_framework}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file rename [glob ${destroot}${prefix}/lib/python*] ${destroot}${python_framework}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 livecheck.type      regex
 livecheck.url       http://omniorb.sourceforge.net/
</pre><pre style='margin:0'>

</pre>