[49200] trunk/dports/devel/ice-python
blair at macports.org
blair at macports.org
Sun Apr 5 03:13:01 PDT 2009
Revision: 49200
http://trac.macports.org/changeset/49200
Author: blair at macports.org
Date: 2009-04-05 03:13:01 -0700 (Sun, 05 Apr 2009)
Log Message:
-----------
New upstream 3.3.1 release.
Remove the protobuf-patch-0.1.0.gz patch is this is now in 3.3.1.
Prevent name conflicts between libICE.* from xorg-libice and libIce.*
from this port by renaming libIce.* to libZeroCIce.*.
Rename patch-config.TestUtil.py.diff to patch-scripts.TestUtil.py.diff
to reflect the file's new location.
Modified Paths:
--------------
trunk/dports/devel/ice-python/Portfile
trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff
Added Paths:
-----------
trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff
Removed Paths:
-------------
trunk/dports/devel/ice-python/files/patch-config.TestUtil.py.diff
Modified: trunk/dports/devel/ice-python/Portfile
===================================================================
--- trunk/dports/devel/ice-python/Portfile 2009-04-05 10:12:51 UTC (rev 49199)
+++ trunk/dports/devel/ice-python/Portfile 2009-04-05 10:13:01 UTC (rev 49200)
@@ -3,8 +3,7 @@
PortSystem 1.0
name ice-python
-version 3.3.0
-revision 2
+version 3.3.1
categories devel python
maintainers blair
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -29,22 +28,16 @@
Ice C++ runtime libraries.
homepage http://www.zeroc.com/
-master_sites http://www.zeroc.com/download/Ice/3.3/:ice \
- http://www.zeroc.com/download/Protobuf/0.1/:ice-protobuf
+master_sites http://www.zeroc.com/download/Ice/3.3/:ice
dist_subdir ice-cpp
distname Ice-${version}
distfiles ${distname}${extract.suffix}:ice
patchfiles patch-py.config.Make.rules.Darwin.diff \
- patch-config.TestUtil.py.diff \
- protobuf-patch-0.1.0.gz:ice-protobuf
+ patch-scripts.TestUtil.py.diff
checksums Ice-${version}.tar.gz \
- md5 0500306d9cdbc0fbb553fbb529de557a \
- sha1 b599c3a4d1d3006b868bf2cbcd8e2a2d4575fb22 \
- rmd160 e85b37c93f12d9ae97c6b7b2f64f506fa051e4f8 \
- protobuf-patch-0.1.0.gz \
- md5 d5ac6485fd89c540fc9e3912f9595d58 \
- sha1sum 0f9d2e2c1c1601695339b4f621e18f40563e3fa0 \
- rmd160 9494f3f763c473b1ed0742eda49ae9dde18bea01
+ md5 1f37dfcec4662fcde030553fb447d064 \
+ sha1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa \
+ rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5
platforms darwin
depends_lib port:python24 \
@@ -54,8 +47,12 @@
reinplace "s/-O2/-g -O2/" \
${workpath}/Ice-${version}/py/config/Make.rules.Darwin
- reinplace "s#python Client.py#${prefix}/bin/python2.4 Client.py#" \
- ${worksrcpath}/py/test/Slice/keyword/run.py
+ # Prevent name conflicts between libICE.* from xorg-libice and
+ # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
+ reinplace "s/-lIce /-lZeroCIce /" \
+ ${workpath}/Ice-${version}/py/config/Make.rules
+ reinplace "s/-lIce /-lZeroCIce /" \
+ ${workpath}/Ice-${version}/py/config/Make.rules.Darwin
}
use_configure no
Deleted: trunk/dports/devel/ice-python/files/patch-config.TestUtil.py.diff
===================================================================
--- trunk/dports/devel/ice-python/files/patch-config.TestUtil.py.diff 2009-04-05 10:12:51 UTC (rev 49199)
+++ trunk/dports/devel/ice-python/files/patch-config.TestUtil.py.diff 2009-04-05 10:13:01 UTC (rev 49200)
@@ -1,28 +0,0 @@
-diff -ru ../Ice-3.3.0.orig/config/TestUtil.py ./config/TestUtil.py
---- ../Ice-3.3.0.orig/config/TestUtil.py 2008-05-16 10:24:00.000000000 -0700
-+++ ./config/TestUtil.py 2008-05-28 14:39:16.000000000 -0700
-@@ -838,7 +838,7 @@
- print >>output, "-Djava.net.preferIPv4Stack=true",
- print >>output, exe,
- elif config.lang == "py":
-- print >>output, "python", exe,
-+ print >>output, sys.executable, exe,
- elif config.lang == "php" and config.type == "client":
- print >>output, phpCmd, "-c tmp.ini -f", exe, " -- ",
- else:
-@@ -923,13 +923,13 @@
-
- global keepGoing
- if script:
-- print "if ! python %s %s; then" % (os.path.join(dir, "run.py"), args)
-+ print "if ! %s %s %s; then" % (sys.executable, os.path.join(dir, "run.py"), args)
- print " echo 'test in %s failed'" % os.path.abspath(dir)
- if not keepGoing:
- print " exit 1"
- print "fi"
- else:
-- status = os.system("python " + os.path.join(dir, "run.py " + args))
-+ status = os.system(sys.executable + " " + os.path.join(dir, "run.py " + args))
-
- if status:
- if(num > 0):
Modified: trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff 2009-04-05 10:12:51 UTC (rev 49199)
+++ trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff 2009-04-05 10:13:01 UTC (rev 49200)
@@ -1,21 +1,30 @@
-diff -ru ../Ice-3.3.0.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin
---- ../Ice-3.3.0.orig/py/config/Make.rules.Darwin 2008-05-16 10:24:03.000000000 -0700
-+++ ./py/config/Make.rules.Darwin 2008-05-28 14:48:28.000000000 -0700
-@@ -23,9 +23,9 @@
- endif
+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
+@@ -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)
+ endif
+- PYTHON_LIBS = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python
++ PYTHON_LIBS = $(PYTHON_HOME)/Python
+ else
+ PYTHON_HOME = /System/Library/Frameworks/Python.framework/Versions/Current
+ PYTHON_LIBS = -framework Python
+@@ -26,7 +26,7 @@
PYTHON_INCLUDE_DIR = $(PYTHON_HOME)/include/$(PYTHON_VERSION)
--PYTHON_LIBS = -F$(PYTHON_HOME) -framework Python
-+PYTHON_LIBS = $(PYTHON_HOME)/Python
-
+
-CXX = c++
+CXX ?= c++
CXXFLAGS = -ftemplate-depth-128 -Wall -D_REENTRANT
-@@ -47,4 +47,4 @@
+@@ -46,6 +46,6 @@
+ mkshlib = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4)
+
BASELIBS = -lIceUtil -lpthread
- LIBS = -lIce $(BASELIBS)
+-LIBS = -lIce $(BASELIBS)
++LIBS = -lZeroCIce $(BASELIBS)
-PLATFORM_HAS_READLINE := no
+PLATFORM_HAS_READLINE := yes
Copied: trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff (from rev 49199, trunk/dports/devel/ice-python/files/patch-config.TestUtil.py.diff)
===================================================================
--- trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff (rev 0)
+++ trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff 2009-04-05 10:13:01 UTC (rev 49200)
@@ -0,0 +1,28 @@
+diff -ru ../Ice-3.3.1.orig/scripts/TestUtil.py ./scripts/TestUtil.py
+--- ../Ice-3.3.1.orig/scripts/TestUtil.py 2009-03-20 10:52:15.000000000 -0700
++++ ./scripts/TestUtil.py 2009-04-05 01:51:26.000000000 -0700
+@@ -727,7 +727,7 @@
+ print >>output, "-Djava.net.preferIPv4Stack=true",
+ print >>output, exe,
+ elif config.lang == "py":
+- print >>output, "python", exe,
++ print >>output, sys.executable, exe,
+ elif config.lang == "php" and config.type == "client":
+ print >>output, phpCmd, "-c tmp.ini -f", exe, " -- ",
+ elif config.lang == "cpp" and config.valgrind:
+@@ -1186,13 +1186,13 @@
+
+ global keepGoing
+ if script:
+- print "if ! python %s %s; then" % (os.path.join(dir, "run.py"), args)
++ print "if ! %s %s %s; then" % (sys.executable, os.path.join(dir, "run.py"), args)
+ print " echo 'test in %s failed'" % os.path.abspath(dir)
+ if not keepGoing:
+ print " exit 1"
+ print "fi"
+ else:
+- status = os.system("python " + os.path.join(dir, "run.py " + args))
++ status = os.system(sys.executable + " " + os.path.join(dir, "run.py " + args))
+
+ if status:
+ if(num > 0):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090405/4fd423fb/attachment.html>
More information about the macports-changes
mailing list