Revision: 90176 http://trac.macports.org/changeset/90176 Author: stromnov@macports.org Date: 2012-02-24 23:28:46 -0800 (Fri, 24 Feb 2012) Log Message: ----------- omniORB: update to version 4.1.6 (#33226) Modified Paths: -------------- trunk/dports/devel/omniORB/Portfile Added Paths: ----------- trunk/dports/devel/omniORB/files/include_omniORB4_CORBA_sysdep.h.diff Modified: trunk/dports/devel/omniORB/Portfile =================================================================== --- trunk/dports/devel/omniORB/Portfile 2012-02-25 06:34:45 UTC (rev 90175) +++ trunk/dports/devel/omniORB/Portfile 2012-02-25 07:28:46 UTC (rev 90176) @@ -4,7 +4,7 @@ PortSystem 1.0 name omniORB -version 4.1.4 +version 4.1.6 revision 0 categories devel platforms darwin @@ -19,12 +19,17 @@ homepage http://omniorb.sourceforge.net/ master_sites sourceforge:omniorb -checksums md5 1f6070ff9b6339876976d61981eeaa6a \ - sha1 7150d999bcef10c6c3cb24725386497c3f338aa1 \ - rmd160 b84131230c59b1cef8f714ff1545e44f6779ade1 +checksums rmd160 a0ba42721a1932d29abeb37dff0dc3ea7a9ddce6 \ + sha256 749c5e615130c804e40f4028104c1f98469613ff32a7f81562d06e669ba0b2c1 -patchfiles src_tool_omniidl_cxx_cccp_config-darwin.h.diff +use_bzip2 yes +patchfiles src_tool_omniidl_cxx_cccp_config-darwin.h.diff \ + include_omniORB4_CORBA_sysdep.h.diff + +# Universal variant broken since 4.1.6 +universal_variant no + configure.args --with-omniORB-config="${prefix}/etc/omniORB.cfg" \ --with-omniNames-logdir="${prefix}/var" @@ -52,8 +57,8 @@ depends_lib-append port:openssl } -if { ![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26]} { - default_variants +python26 +if { ![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} { + default_variants +python27 } variant python24 description {Enable python support with python 2.4} { @@ -71,6 +76,11 @@ configure.python ${prefix}/bin/python2.6 } +variant python27 description {Enable python support with python 2.7} { + depends_lib-append port:python27 + configure.python ${prefix}/bin/python2.7 +} + platform darwin 8 { # needs -Xarch universal_variant no Added: trunk/dports/devel/omniORB/files/include_omniORB4_CORBA_sysdep.h.diff =================================================================== --- trunk/dports/devel/omniORB/files/include_omniORB4_CORBA_sysdep.h.diff (rev 0) +++ trunk/dports/devel/omniORB/files/include_omniORB4_CORBA_sysdep.h.diff 2012-02-25 07:28:46 UTC (rev 90176) @@ -0,0 +1,14 @@ +--- include/omniORB4/CORBA_sysdep.h.orig 2012-02-25 11:18:32.000000000 +0400 ++++ include/omniORB4/CORBA_sysdep.h 2012-02-25 11:19:03.000000000 +0400 +@@ -231,6 +231,11 @@ + #endif + + ++#if defined(__clang__) ++# define OMNI_NO_INLINE_FRIENDS ++#endif ++ ++ + // + // Windows DLL hell + //