Modified: trunk/dports/python/py-zeroc-ice33/Portfile (110437 => 110438)
--- trunk/dports/python/py-zeroc-ice33/Portfile 2013-08-31 04:12:25 UTC (rev 110437)
+++ trunk/dports/python/py-zeroc-ice33/Portfile 2013-08-31 04:12:35 UTC (rev 110438)
@@ -82,8 +82,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-ice33/files/patch-py.config.Make.rules.Darwin.diff (110437 => 110438)
--- trunk/dports/python/py-zeroc-ice33/files/patch-py.config.Make.rules.Darwin.diff 2013-08-31 04:12:25 UTC (rev 110437)
+++ trunk/dports/python/py-zeroc-ice33/files/patch-py.config.Make.rules.Darwin.diff 2013-08-31 04:12:35 UTC (rev 110438)
@@ -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
++++ ./py/config/Make.rules.Darwin 2013-08-30 21:01:15.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