Revision: 110489 https://trac.macports.org/changeset/110489 Author: blair@macports.org Date: 2013-08-31 10:28:11 -0700 (Sat, 31 Aug 2013) Log Message: ----------- py-zeroc-ice34: follow up to r110485: support new shared library names. Revision Links: -------------- https://trac.macports.org/changeset/110485 Modified Paths: -------------- trunk/dports/python/py-zeroc-ice34/Portfile trunk/dports/python/py-zeroc-ice34/files/patch-py.config.Make.rules.Darwin.diff Modified: trunk/dports/python/py-zeroc-ice34/Portfile =================================================================== --- trunk/dports/python/py-zeroc-ice34/Portfile 2013-08-31 17:22:53 UTC (rev 110488) +++ trunk/dports/python/py-zeroc-ice34/Portfile 2013-08-31 17:28:11 UTC (rev 110489) @@ -5,7 +5,7 @@ name py-zeroc-ice34 version 3.4.2 -revision 3 +revision 4 set branch [join [lrange [split ${version} .] 0 1] .] categories-append devel maintainers blair @@ -66,8 +66,19 @@ reinplace "s/-O2/-g -O2/" ${build.dir}/config/Make.rules.Darwin # Prevent name conflicts between libICE.* from xorg-libice and - # libIce.* from this port by renaming libIce.* to libZeroCIce.*. - reinplace "s/-lIce /-lZeroCIce /" \ + # 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] { + # 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} + + # Restore the name of the Python binding shared library. + reinplace -E {s/ZerocIcePy/IcePy/g} ${f} + } + reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} \ ${build.dir}/config/Make.rules \ ${build.dir}/config/Make.rules.Darwin } Modified: trunk/dports/python/py-zeroc-ice34/files/patch-py.config.Make.rules.Darwin.diff =================================================================== --- trunk/dports/python/py-zeroc-ice34/files/patch-py.config.Make.rules.Darwin.diff 2013-08-31 17:22:53 UTC (rev 110488) +++ trunk/dports/python/py-zeroc-ice34/files/patch-py.config.Make.rules.Darwin.diff 2013-08-31 17:28:11 UTC (rev 110489) @@ -1,6 +1,6 @@ -diff -ru ../Ice-3.3.1.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin ---- ../Ice-3.3.1.orig/py/config/Make.rules.Darwin 2009-03-20 10:52:15.000000000 -0700 -+++ ./py/config/Make.rules.Darwin 2009-04-05 02:43:03.000000000 -0700 +diff -ru ../Ice-3.4.2.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin +--- ../Ice-3.4.2.orig/py/config/Make.rules.Darwin 2011-06-15 12:44:00.000000000 -0700 ++++ ./py/config/Make.rules.Darwin 2013-08-30 21:45:20.000000000 -0700 @@ -18,7 +18,7 @@ ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0) $(error Unable to find Python framework See config/Make.rules.Darwin) @@ -19,12 +19,9 @@ CXXFLAGS = -ftemplate-depth-128 -Wall -D_REENTRANT -@@ -46,6 +46,6 @@ - mkshlib = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4) - +@@ -48,4 +48,4 @@ BASELIBS = -lIceUtil -lpthread --LIBS = -lIce $(BASELIBS) -+LIBS = -lZeroCIce $(BASELIBS) + LIBS = -lIce $(BASELIBS) -PLATFORM_HAS_READLINE := no +PLATFORM_HAS_READLINE := yes