[79714] trunk/dports/devel
blair at macports.org
blair at macports.org
Thu Jun 23 14:47:14 PDT 2011
Revision: 79714
http://trac.macports.org/changeset/79714
Author: blair at macports.org
Date: 2011-06-23 14:47:12 -0700 (Thu, 23 Jun 2011)
Log Message:
-----------
ice-python: restore by reverse merging r79695. Suggested by jmr
since a 32-bit Python 2.4 does provide a Framework build.
Revision Links:
--------------
http://trac.macports.org/changeset/79695
Added Paths:
-----------
trunk/dports/devel/ice-python/
trunk/dports/devel/ice-python/Portfile
trunk/dports/devel/ice-python/files/
trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff
trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff
Removed Paths:
-------------
trunk/dports/devel/ice-python/Portfile
trunk/dports/devel/ice-python/files/
trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff
trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff
Deleted: trunk/dports/devel/ice-python/Portfile
===================================================================
--- trunk/dports/devel/ice-python/Portfile 2011-06-23 18:32:11 UTC (rev 79694)
+++ trunk/dports/devel/ice-python/Portfile 2011-06-23 21:47:12 UTC (rev 79714)
@@ -1,121 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-
-name ice-python
-version 3.4.1
-revision 1
-set branch [join [lrange [split ${version} .] 0 1] .]
-categories devel python
-maintainers blair
-description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
-
-long_description \
- The Internet Communications Engine (Ice) is a modern alternative to \
- object middleware such as CORBA or COM/DCOM/COM+, with support for \
- C++, C#, Java, PHP, Python, Ruby and Visual Basic. \
- Ice consists of the following packages. \
- Slice: The Specification Language for Ice. Slice establishes a \
- contract between clients and servers, and is also used to describe \
- persistent data. \
- Slice Compilers: Slice specifications are compiled into various \
- programming languages. Ice supports C++, Java, C#, Visual Basic, PHP, \
- Python and Ruby. Ice clients and servers work together, regardless \
- of the programming language. \
- Ice: The Ice core library manages all the communication tasks using a \
- highly efficient protocol (including protocol compression and support \
- for both TCP and UDP), provides a flexible thread pool for \
- multi-threaded servers. \
- This Port provides the Python bindings that sit on top of the C++ \
- Ice C++ runtime libraries.
-
-homepage http://www.zeroc.com/
-master_sites ${homepage}download/Ice/${branch}/
-dist_subdir ice-cpp
-distname Ice-${version}
-patchfiles patch-py.config.Make.rules.Darwin.diff \
- patch-py.modules.IcePy.Operation.cpp.diff
-checksums md5 3aae42aa47dec74bb258c1a1b2847a1a \
- sha1 f3ae394146a36fa6453dc69e80d2ab6ab30f4d9a \
- rmd160 aa756a14421e084336dcecdcbb977aa98c5e1283
-platforms darwin
-
-depends_lib port:python24 \
- port:ice-cpp
-
-build.dir ${worksrcpath}/py
-
-post-patch {
- 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 /" \
- ${build.dir}/config/Make.rules
- reinplace "s/-lIce /-lZeroCIce /" \
- ${build.dir}/config/Make.rules.Darwin
-}
-
-use_configure no
-
-build.target prefix="${prefix}" \
- CC="${configure.cc}" \
- CXX="${configure.cxx}" \
- ICE_HOME="${prefix}" \
- PYTHON_HOME="${prefix}/Library/Frameworks/Python.framework/Versions/2.4" \
- PYTHON_VERSION=python2.4 \
- OPTIMIZE="yes" \
- all
-
-test.run yes
-test.env ICE_HOME=${prefix}
-test.cmd ${prefix}/bin/python2.4
-test.target allTests.py
-
-destroot.target prefix="${destroot}${prefix}" \
- CC="${configure.cc}" \
- CXX="${configure.cxx}" \
- ICE_HOME="${prefix}" \
- PYTHON_HOME="${prefix}/Library/Frameworks/Python.framework/Versions/2.4" \
- PYTHON_VERSION=python2.4 \
- OPTIMIZE="yes" \
- install
-
-post-destroot {
- set sharedir ${destroot}${prefix}/share
- set docdir ${sharedir}/doc/${name}
-
- delete ${destroot}${prefix}/slice
-
- xinstall -m 755 -d ${docdir}
-
- file mkdir ${destroot}${prefix}/lib/python2.4
- file rename ${destroot}${prefix}/python ${destroot}${prefix}/lib/python2.4/site-packages
-
- set cmd "${prefix}/bin/python2.4 \
- ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/compileall.py \
- ${destroot}${prefix}/lib/python2.4/site-packages"
- ui_debug ${cmd}
- system ${cmd}
-
- set cmd "${prefix}/bin/python2.4 -O \
- ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/compileall.py \
- ${destroot}${prefix}/lib/python2.4/site-packages"
- ui_debug ${cmd}
- system ${cmd}
-
- file rename ${destroot}${prefix}/ICE_LICENSE ${docdir}
- file rename ${destroot}${prefix}/LICENSE ${docdir}
- foreach f {CHANGES RELEASE_NOTES} {
- file copy ${worksrcpath}/${f} ${docdir}
- }
- file copy ${build.dir}/INSTALL ${docdir}
-
- if {[variant_isset demo_source_code]} {
- file copy ${build.dir}/demo ${docdir}
- }
-}
-
-variant demo_source_code description {Install demonstration Python code} {
-}
Copied: trunk/dports/devel/ice-python/Portfile (from rev 79694, trunk/dports/devel/ice-python/Portfile)
===================================================================
--- trunk/dports/devel/ice-python/Portfile (rev 0)
+++ trunk/dports/devel/ice-python/Portfile 2011-06-23 21:47:12 UTC (rev 79714)
@@ -0,0 +1,121 @@
+# $Id$
+
+PortSystem 1.0
+
+name ice-python
+version 3.4.1
+revision 1
+set branch [join [lrange [split ${version} .] 0 1] .]
+categories devel python
+maintainers blair
+description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
+
+long_description \
+ The Internet Communications Engine (Ice) is a modern alternative to \
+ object middleware such as CORBA or COM/DCOM/COM+, with support for \
+ C++, C#, Java, PHP, Python, Ruby and Visual Basic. \
+ Ice consists of the following packages. \
+ Slice: The Specification Language for Ice. Slice establishes a \
+ contract between clients and servers, and is also used to describe \
+ persistent data. \
+ Slice Compilers: Slice specifications are compiled into various \
+ programming languages. Ice supports C++, Java, C#, Visual Basic, PHP, \
+ Python and Ruby. Ice clients and servers work together, regardless \
+ of the programming language. \
+ Ice: The Ice core library manages all the communication tasks using a \
+ highly efficient protocol (including protocol compression and support \
+ for both TCP and UDP), provides a flexible thread pool for \
+ multi-threaded servers. \
+ This Port provides the Python bindings that sit on top of the C++ \
+ Ice C++ runtime libraries.
+
+homepage http://www.zeroc.com/
+master_sites ${homepage}download/Ice/${branch}/
+dist_subdir ice-cpp
+distname Ice-${version}
+patchfiles patch-py.config.Make.rules.Darwin.diff \
+ patch-py.modules.IcePy.Operation.cpp.diff
+checksums md5 3aae42aa47dec74bb258c1a1b2847a1a \
+ sha1 f3ae394146a36fa6453dc69e80d2ab6ab30f4d9a \
+ rmd160 aa756a14421e084336dcecdcbb977aa98c5e1283
+platforms darwin
+
+depends_lib port:python24 \
+ port:ice-cpp
+
+build.dir ${worksrcpath}/py
+
+post-patch {
+ 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 /" \
+ ${build.dir}/config/Make.rules
+ reinplace "s/-lIce /-lZeroCIce /" \
+ ${build.dir}/config/Make.rules.Darwin
+}
+
+use_configure no
+
+build.target prefix="${prefix}" \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ ICE_HOME="${prefix}" \
+ PYTHON_HOME="${prefix}/Library/Frameworks/Python.framework/Versions/2.4" \
+ PYTHON_VERSION=python2.4 \
+ OPTIMIZE="yes" \
+ all
+
+test.run yes
+test.env ICE_HOME=${prefix}
+test.cmd ${prefix}/bin/python2.4
+test.target allTests.py
+
+destroot.target prefix="${destroot}${prefix}" \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ ICE_HOME="${prefix}" \
+ PYTHON_HOME="${prefix}/Library/Frameworks/Python.framework/Versions/2.4" \
+ PYTHON_VERSION=python2.4 \
+ OPTIMIZE="yes" \
+ install
+
+post-destroot {
+ set sharedir ${destroot}${prefix}/share
+ set docdir ${sharedir}/doc/${name}
+
+ delete ${destroot}${prefix}/slice
+
+ xinstall -m 755 -d ${docdir}
+
+ file mkdir ${destroot}${prefix}/lib/python2.4
+ file rename ${destroot}${prefix}/python ${destroot}${prefix}/lib/python2.4/site-packages
+
+ set cmd "${prefix}/bin/python2.4 \
+ ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/compileall.py \
+ ${destroot}${prefix}/lib/python2.4/site-packages"
+ ui_debug ${cmd}
+ system ${cmd}
+
+ set cmd "${prefix}/bin/python2.4 -O \
+ ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/compileall.py \
+ ${destroot}${prefix}/lib/python2.4/site-packages"
+ ui_debug ${cmd}
+ system ${cmd}
+
+ file rename ${destroot}${prefix}/ICE_LICENSE ${docdir}
+ file rename ${destroot}${prefix}/LICENSE ${docdir}
+ foreach f {CHANGES RELEASE_NOTES} {
+ file copy ${worksrcpath}/${f} ${docdir}
+ }
+ file copy ${build.dir}/INSTALL ${docdir}
+
+ if {[variant_isset demo_source_code]} {
+ file copy ${build.dir}/demo ${docdir}
+ }
+}
+
+variant demo_source_code description {Install demonstration Python code} {
+}
Deleted: 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 2011-06-23 18:32:11 UTC (rev 79694)
+++ trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff 2011-06-23 21:47:12 UTC (rev 79714)
@@ -1,30 +0,0 @@
-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)
-
--CXX = c++
-+CXX ?= c++
-
- CXXFLAGS = -ftemplate-depth-128 -Wall -D_REENTRANT
-
-@@ -46,6 +46,6 @@
- mkshlib = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4)
-
- BASELIBS = -lIceUtil -lpthread
--LIBS = -lIce $(BASELIBS)
-+LIBS = -lZeroCIce $(BASELIBS)
-
--PLATFORM_HAS_READLINE := no
-+PLATFORM_HAS_READLINE := yes
Copied: trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff (from rev 79694, 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 (rev 0)
+++ trunk/dports/devel/ice-python/files/patch-py.config.Make.rules.Darwin.diff 2011-06-23 21:47:12 UTC (rev 79714)
@@ -0,0 +1,30 @@
+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)
+
+-CXX = c++
++CXX ?= c++
+
+ CXXFLAGS = -ftemplate-depth-128 -Wall -D_REENTRANT
+
+@@ -46,6 +46,6 @@
+ mkshlib = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4)
+
+ BASELIBS = -lIceUtil -lpthread
+-LIBS = -lIce $(BASELIBS)
++LIBS = -lZeroCIce $(BASELIBS)
+
+-PLATFORM_HAS_READLINE := no
++PLATFORM_HAS_READLINE := yes
Deleted: trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff
===================================================================
--- trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff 2011-06-23 18:32:11 UTC (rev 79694)
+++ trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff 2011-06-23 21:47:12 UTC (rev 79714)
@@ -1,13 +0,0 @@
-diff -ru ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp ./py/modules/IcePy/Operation.cpp
---- ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp 2010-06-03 09:48:35.000000000 -0700
-+++ ./py/modules/IcePy/Operation.cpp 2011-01-18 10:55:11.000000000 -0800
-@@ -3668,7 +3668,8 @@
- }
- }
-
-- __checkMode(op->mode, current.mode);
-+ // See http://www.zeroc.com/forums/help-center/5210-ice_ping-marshalexception-refreshsession-python.html#post22745 .
-+ // __checkMode(op->mode, current.mode);
-
- UpcallPtr up = new TypedUpcall(op, cb, current.adapter->getCommunicator());
- up->dispatch(_servant, inParams, current);
Copied: trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff (from rev 79694, trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff)
===================================================================
--- trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff (rev 0)
+++ trunk/dports/devel/ice-python/files/patch-py.modules.IcePy.Operation.cpp.diff 2011-06-23 21:47:12 UTC (rev 79714)
@@ -0,0 +1,13 @@
+diff -ru ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp ./py/modules/IcePy/Operation.cpp
+--- ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp 2010-06-03 09:48:35.000000000 -0700
++++ ./py/modules/IcePy/Operation.cpp 2011-01-18 10:55:11.000000000 -0800
+@@ -3668,7 +3668,8 @@
+ }
+ }
+
+- __checkMode(op->mode, current.mode);
++ // See http://www.zeroc.com/forums/help-center/5210-ice_ping-marshalexception-refreshsession-python.html#post22745 .
++ // __checkMode(op->mode, current.mode);
+
+ UpcallPtr up = new TypedUpcall(op, cb, current.adapter->getCommunicator());
+ up->dispatch(_servant, inParams, current);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110623/73cf0b50/attachment-0001.html>
More information about the macports-changes
mailing list