Ticket #35818: patch-omniORB-pyomniORB-4.2.0.diff

devel/omniORB/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                omniORB
-version             4.1.6
-revision            2
+version             4.2.0
 categories          devel
 platforms           darwin
 # executables are GPL, libs are LGPL
@@ -20 +19 @@
 homepage            http://omniorb.sourceforge.net/
 master_sites        sourceforge:omniorb
 
-checksums           rmd160  a0ba42721a1932d29abeb37dff0dc3ea7a9ddce6 \
-                    sha256  749c5e615130c804e40f4028104c1f98469613ff32a7f81562d06e669ba0b2c1
+checksums           rmd160  0f9c18c95df9718d3a3b960cf24e1732a851a23d \
+                    sha256  74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc
 
 use_bzip2           yes
 

python/py-omniORBpy/Portfile

@@ -5 +5 @@
 PortGroup           python 1.0
 
 name                py-omniORBpy
-version             3.6
-revision            0
+version             4.2.0
 categories-append   devel
 license             LGPL-2.1
 platforms           darwin
@@ -24 +23 @@
 
 distname            omniORBpy-${version}
 
-checksums           rmd160  96b73cfcac7f2b8df2894c93b3e422bd85412251 \
-                    sha256  b845eef13b56dfb47c98d65636ede5155ed4b84b2a64e35831b94668878af7c7
+checksums           rmd160  4359c1723126e74f06fadf9f24bc884819de7f85 \
+                    sha256  c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e
 
 use_bzip2           yes
 
@@ -36 +35 @@
 # Ugly but it works.
 
 python.versions     24 25 26 27
-python.default_version 24
+python.default_version 27
 
 if {${name} ne ${subport}} {
+
+    PortGroup           active_variants 1.1
+    require_active_variants omniORB python${python.version}
     notes \
 "${name} must be compatible with the corresponding omniORB installation.
 Ensure that the same python version has been specified for the omniORB variant."
@@ -48 +50 @@
 
     patchfiles          patch-dir.mk
 
+    use_configure       yes
+
+    # Exactly the same as the post-patch for omniORB
     post-patch {
-        # python libraries (PYTHON_PREFIX)
+        reinplace "s|\\(\$(CXXLINKOPTIONS)\\)|\\1 [get_canonical_archflags cc]|g" \
+            ${worksrcpath}/mk/beforeauto.mk.in
+
+        # reinplace "s|,prefix=\'\$PYTHON_PREFIX\'||g" ${worksrcpath}/configure
         reinplace "s|get_python_lib(0,\[^)\]*)|get_python_lib()|g" \
             ${worksrcpath}/configure
-        # compiled libraries to support python (PYTHON_EXEC_PREFIX)
+        # reinplace "s|,prefix=\'\$PYTHON_EXEC_PREFIX\'||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"
+        }
     }
 
-    use_configure       yes
+    configure.args-append PYTHON=${python.bin}
 
     build.type          gnu
     build.cmd           make