[110436] trunk/dports/devel/zeroc-ice33/Portfile
blair at macports.org
blair at macports.org
Fri Aug 30 21:11:59 PDT 2013
Revision: 110436
https://trac.macports.org/changeset/110436
Author: blair at macports.org
Date: 2013-08-30 21:11:59 -0700 (Fri, 30 Aug 2013)
Log Message:
-----------
zeroc-ice33: follow zeroc-ice35: libIce* to libZerocIce*.
This makes the two ports consistent in the names they use for the
shared libraries.
Modified Paths:
--------------
trunk/dports/devel/zeroc-ice33/Portfile
Modified: trunk/dports/devel/zeroc-ice33/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 03:56:14 UTC (rev 110435)
+++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 04:11:59 UTC (rev 110436)
@@ -106,12 +106,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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130830/5499baf5/attachment.html>
More information about the macports-changes
mailing list