Revision: 110485 https://trac.macports.org/changeset/110485 Author: blair@macports.org Date: 2013-08-31 10:07:12 -0700 (Sat, 31 Aug 2013) Log Message: ----------- zeroc-ice34: follow zeroc-ice35: rename libIce* to libZerocIce*. This makes the two ports consistent in the names they use for the shared libraries. Modified Paths: -------------- trunk/dports/devel/zeroc-ice34/Portfile Modified: trunk/dports/devel/zeroc-ice34/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice34/Portfile 2013-08-31 17:05:46 UTC (rev 110484) +++ trunk/dports/devel/zeroc-ice34/Portfile 2013-08-31 17:07:12 UTC (rev 110485) @@ -5,7 +5,7 @@ name zeroc-ice34 version 3.4.2 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers blair @@ -74,6 +74,7 @@ patch-ice.cpp.src.Glacier2.RequestQueue.h.diff \ patch-ice.cpp.src.Glacier2.RouterI.cpp.diff \ patch-ice.cpp.src.Ice.ConnectionI.cpp.diff \ + patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff \ patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff \ patch-ice.cpp.src.Ice.LocalObject.cpp.diff \ patch-ice.cpp.src.Ice.Network.cpp.diff \ @@ -154,12 +155,18 @@ } # Prevent name conflicts between libICE.* from xorg-libice and - # libIce.* from this port by renaming libIce.* to libZeroCIce.*. - reinplace "s/,Ice/,ZeroCIce/" ${build.dir}/src/Ice/Makefile - reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin + # libIce.* from this port by renaming libIce.* to libZerocIce.*. + # For consistency, rename Ice's other shared libraries. foreach f [exec find ${build.dir} -name Makefile] { - reinplace "s/-lIce /-lZeroCIce /" ${f} + # To prevent replacements on slice2freeze's --dict argument, + # match exactly on a , or a ) that follows ,Ice\w*, e.g.: + # $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq + reinplace -E {s/,Ice([[:alnum:]]*[,)])/,ZerocIce\1/} ${f} + reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} ${f} } + reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} \ + ${build.dir}/config/Make.rules \ + ${build.dir}/config/Make.rules.Darwin } use_configure no