[110462] trunk/dports/devel/zeroc-ice33
blair at macports.org
blair at macports.org
Sat Aug 31 00:55:01 PDT 2013
Revision: 110462
https://trac.macports.org/changeset/110462
Author: blair at macports.org
Date: 2013-08-31 00:55:01 -0700 (Sat, 31 Aug 2013)
Log Message:
-----------
zeroc-ice33: patch DynamicLibrary.cpp to find modules starting with ZerocIce.
Modified Paths:
--------------
trunk/dports/devel/zeroc-ice33/Portfile
Added Paths:
-----------
trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff
Modified: trunk/dports/devel/zeroc-ice33/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 07:54:57 UTC (rev 110461)
+++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 07:55:01 UTC (rev 110462)
@@ -4,7 +4,7 @@
name zeroc-ice33
version 3.3.1
-revision 1
+revision 2
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers blair
@@ -41,6 +41,7 @@
rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5
patchfiles patch-ice.cpp.config.Make.rules.diff \
patch-ice.cpp.config.Make.rules.Darwin.diff \
+ patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff \
patch-ice.cpp.src.IceSSL.Instance.cpp.diff \
patch-ice.cpp.src.Slice.Preprocessor.cpp.diff \
patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \
@@ -64,6 +65,10 @@
ui_debug ${cmd}
system ${cmd}
+ set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff"
+ ui_debug ${cmd}
+ system ${cmd}
+
set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.IceSSL.Instance.cpp.diff"
ui_debug ${cmd}
system ${cmd}
Copied: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (from rev 110447, trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff)
===================================================================
--- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (rev 0)
+++ trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2013-08-31 07:55:01 UTC (rev 110462)
@@ -0,0 +1,34 @@
+diff -ru Ice-3.3.1.orig/cpp/src/Ice/DynamicLibrary.cpp Ice-3.3.1/cpp/src/Ice/DynamicLibrary.cpp
+--- Ice-3.3.1.orig/cpp/src/Ice/DynamicLibrary.cpp 2009-03-20 10:52:13.000000000 -0700
++++ Ice-3.3.1/cpp/src/Ice/DynamicLibrary.cpp 2013-08-30 22:34:55.000000000 -0700
+@@ -95,12 +95,18 @@
+ # endif
+ 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())
+@@ -128,7 +134,10 @@
+
+ if(!load(lib))
+ {
+- return 0;
++ if (!load(libZeroc))
++ {
++ return 0;
++ }
+ }
+
+ return getSymbol(funcName);
Property changes on: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff:96570-97031
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130831/41261607/attachment.html>
More information about the macports-changes
mailing list