Revision: 110447 https://trac.macports.org/changeset/110447 Author: blair@macports.org Date: 2013-08-30 22:36:12 -0700 (Fri, 30 Aug 2013) Log Message: ----------- zeroc-ice34: add currently unused patch. This may be used in the future, I'm committing it now so it can be 'svn copy' to zeroc-ice33. Added Paths: ----------- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff Copied: trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (from rev 110442, trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff) =================================================================== --- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (rev 0) +++ trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2013-08-31 05:36:12 UTC (rev 110447) @@ -0,0 +1,34 @@ +diff -ru Ice-3.4.2.orig/cpp/src/Ice/DynamicLibrary.cpp Ice-3.4.2/cpp/src/Ice/DynamicLibrary.cpp +--- Ice-3.4.2.orig/cpp/src/Ice/DynamicLibrary.cpp 2011-06-15 12:43:58.000000000 -0700 ++++ Ice-3.4.2/cpp/src/Ice/DynamicLibrary.cpp 2013-08-30 22:10:32.000000000 -0700 +@@ -112,12 +112,18 @@ + + lib += ".dll"; + #elif defined(__APPLE__) ++ // Look for libZeroc... to handle the MacPorts ++ // s/libIce/libZerocIce/ rename. ++ string libZeroc = lib; + lib = "lib" + libName; ++ libZeroc += "libZeroc" + libName; + if(!version.empty()) + { + lib += "." + version; ++ libZeroc += "." + version; + } + lib += ".dylib"; ++ libZeroc += ".dylib"; + #elif defined(__hpux) + lib = "lib" + libName; + if(!version.empty()) +@@ -145,7 +151,10 @@ + + if(!load(lib)) + { +- return 0; ++ if (!load(libZeroc)) ++ { ++ return 0; ++ } + } + + return getSymbol(funcName);