Modified: trunk/dports/devel/omniORB/Portfile (77463 => 77464)

--- trunk/dports/devel/omniORB/Portfile	2011-03-31 15:28:55 UTC (rev 77463)
+++ trunk/dports/devel/omniORB/Portfile	2011-03-31 17:38:18 UTC (rev 77464)
@@ -18,14 +18,26 @@
                     sha1    7150d999bcef10c6c3cb24725386497c3f338aa1 \
                     rmd160  b84131230c59b1cef8f714ff1545e44f6779ade1
 
+patchfiles          src_tool_omniidl_cxx_cccp_config-darwin.h.diff
+
 configure.args      --with-omniORB-config="${prefix}/etc/omniORB.cfg" \
                     --with-omniNames-logdir="${prefix}/var"
 
 post-patch {
     reinplace "s|,prefix=\'\$PYTHON_PREFIX\'||g" ${worksrcpath}/configure
     reinplace "s|,prefix=\'\$PYTHON_EXEC_PREFIX\'||g" ${worksrcpath}/configure
+    if {[variant_isset universal]} {
+        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
+    post-configure {
+        system "cd ${worksrcpath} && ed - ./include/omniORB4/acconfig.h < ${filespath}/include_omniORB4_acconfig.h.ed"
+    }
+}
+
 variant ssl description {Enable SSL support} {
     configure.args-append   --with-openssl
     depends_lib-append      port:openssl
@@ -50,6 +62,11 @@
     configure.python        ${prefix}/bin/python2.6
 }
 
+platform darwin 8 {
+    # needs -Xarch
+    universal_variant no
+}
+
 livecheck.type      regex
 livecheck.url       http://omniorb.sourceforge.net/releases/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"