Ticket #35823: Portfile.diff

Portfile

@@ -5 +5 @@
 
 name                omniORB
 version             4.1.6
-revision            0
+revision            1
 categories          devel
 platforms           darwin
 # executables are GPL, libs are LGPL
@@ -28 +28 @@
 patchfiles          src_tool_omniidl_cxx_cccp_config-darwin.h.diff \
                     include_omniORB4_CORBA_sysdep.h.diff
 
-# Universal variant broken since 4.1.6
+# The universal variant has been broken for several years (at least version 4.1.4)
 universal_variant   no
 
-configure.args      --with-omniORB-config="${prefix}/etc/omniORB.cfg" \
+notes \
+"To install omniORBpy use the port pyXX_omniORBpy
+corresponding to the matching python variant selected here."
+
+configure.args      CC="${configure.cc}" \
+                    CXX="${configure.cxx}" \
+                    CCFLAGS="[get_canonical_archflags cc]" \
+                    EXTRA_GCC_CXXFLAGS="[get_canonical_archflags cc]" \
+                    --with-omniORB-config="${prefix}/etc/omniORB.cfg" \
                     --with-omniNames-logdir="${prefix}/var"
+configure.args-delete --disable-dependency-tracking
 
 if {$build_arch == "x86_64" && ${os.platform} == "darwin"} {
     configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
 }
 
+pre-patch {
+    reinplace "s|-bind_at_load||g" \
+        ${worksrcpath}/mk/beforeauto.mk.in
+    ui_debug "archflags cc are [get_canonical_archflags cc]"
+    ui_debug "archflags cxx are [get_canonical_archflags cxx]"
+}
+
 post-patch {
-    reinplace "s|,prefix=\'\$PYTHON_PREFIX\'||g" ${worksrcpath}/configure
-    reinplace "s|,prefix=\'\$PYTHON_EXEC_PREFIX\'||g" ${worksrcpath}/configure
+    reinplace "s|\\(\$(CXXLINKOPTIONS)\\)|\\1 [get_canonical_archflags cc]|g" \
+        ${worksrcpath}/mk/beforeauto.mk.in
+
+    reinplace "s|get_python_lib(0,\[^)\]*)|get_python_lib()|g" \
+        ${worksrcpath}/configure
+    reinplace "s|get_python_lib(1,\[^)\]*)|get_python_lib()|g" \
+        ${worksrcpath}/configure
     if {[variant_isset universal]} {
-        system "cd ${worksrcpath} && ed - ./include/omniconfig.h.in < ${filespath}/include_omniconfig.h.in.ed"
+#         system "cd ${worksrcpath} && ed - ./include/omniconfig.h.in < ${filespath}/include_omniconfig.h.in.ed"
     }
 }
 
 if {[variant_isset universal]} {
-    patchfiles-append mk_beforeauto.mk.in.diff
+    # patchfiles-append mk_beforeauto.mk.in.diff
     post-configure {
-        system "cd ${worksrcpath} && ed - ./include/omniORB4/acconfig.h < ${filespath}/include_omniORB4_acconfig.h.ed"
+#         system "cd ${worksrcpath} && ed - ./include/omniORB4/acconfig.h < ${filespath}/include_omniORB4_acconfig.h.ed"
     }
 }
 
+# Need an empty universal variant defined to get the correct set of -arch arguments
+variant universal {}
+
 variant ssl description {Enable SSL support} {
     configure.args-append   --with-openssl
     depends_lib-append      port:openssl
 }
 
-if { ![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
-    default_variants        +python27
+if {![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
+    default_variants        +python24
 }
 
 variant python24 description {Enable python support with python 2.4} {
+    notes-append "For this omniORB variant install py24-omniORBpy"
     depends_lib-append      port:python24
     configure.python        ${prefix}/bin/python2.4
 }
 
 variant python25 description {Enable python support with python 2.5} {
+    notes-append "For this omniORB variant install py25-omniORBpy"
     depends_lib-append      port:python25
     configure.python        ${prefix}/bin/python2.5
 }
 
 variant python26 description {Enable python support with python 2.6} {
+    notes-append "For this omniORB variant install py26-omniORBpy"
     depends_lib-append      port:python26
     configure.python        ${prefix}/bin/python2.6
 }
 
 variant python27 description {Enable python support with python 2.7} {
+    notes-append "For this omniORB variant install py27-omniORBpy"
     depends_lib-append      port:python27
     configure.python        ${prefix}/bin/python2.7
 }