Ticket #55791: Portfile.diff

Portfile

@@ -1 +1 @@
 # -*- 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
-#PortGroup           active_variants 1.1
+PortGroup           active_variants 1.1
 PortGroup           python 1.0
 
 name                py-omniORBpy
 version             4.2.2
+python.versions     27 36
+python.default_version 36
 categories-append   devel
 license             LGPL-2.1
 platforms           darwin
@@ -34 +36 @@
 # and revert to values compatible with a make environment.
 # Ugly but it works.
 
-python.versions     27
-
 if {${name} ne ${subport}} {
     depends_lib-append  port:omniORB
 
     # omniORB is not universal
     universal_variant   no
 
-    # omniORB @4.2.0_1 uses Python 2.7 unconditionally.
-    #require_active_variants omniORB python${python.version}
+    # The omniORB @4.2.0_1 port (and earlier) used Python 2.7 unconditionally.
+    require_active_variants omniORB python${python.version}
 
     patchfiles          patch-dir.mk
 
@@ -75 +75 @@
         depends_lib-append      path:lib/libssl.dylib:openssl
     }
 
+    post-destroot {
+        if {${python.version} != 27} {
+            # create a directory under /opt/local/Library/Frameworks/Python.framework/
+            file mkdir ${destroot}${python.pkgd}
+            # remove only the lowest-level directory to allow a directory copy...
+            file delete ${destroot}${python.pkgd}
+            file rename [glob ${destroot}${prefix}/lib/python*/site-packages] ${destroot}${python.pkgd}
+            # omniORB already installs an empty __init__.py
+            file delete [glob ${destroot}${python.pkgd}/omniidl_be/__init__.py]
+            file delete [glob ${destroot}${python.pkgd}/omniidl_be/__pycache__/__init__*.pyc]
+        }
+    }
+
     livecheck.type      none
 } else {
     livecheck.type      regex