[49193] trunk/dports/devel/ice-cpp

[blair at macports.org]

Revision: 49193
          http://trac.macports.org/changeset/49193
Author:   blair at macports.org
Date:     2009-04-05 03:11:38 -0700 (Sun, 05 Apr 2009)
Log Message:
-----------
Update to 3.3.1.  Remove the protobuf-patch-0.1.0.gz and
patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff patches as
they are now in 3.3.1.

Modified Paths:
--------------
    trunk/dports/devel/ice-cpp/Portfile

Removed Paths:
-------------
    trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2009-04-05 09:45:26 UTC (rev 49192)
+++ trunk/dports/devel/ice-cpp/Portfile	2009-04-05 10:11:38 UTC (rev 49193)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		ice-cpp
-version		3.3.0
-revision	3
+version		3.3.1
 categories	devel
 maintainers	blair
 description	Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -31,7 +30,6 @@
 
 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 \
 		sourceforge:mcpp
 
 set mcpp_version 2.7
@@ -43,22 +41,16 @@
 		${mcpp_dist}:mcpp
 patchfiles	patch-ice.cpp.config.Make.rules.diff \
 		patch-ice.cpp.config.Make.rules.Darwin.diff \
-		patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff \
 		patch-mcpp-${mcpp_version}-1.diff \
-		patch-mcpp-${mcpp_version}-2.diff \
-		protobuf-patch-0.1.0.gz:ice-protobuf
+		patch-mcpp-${mcpp_version}-2.diff
 checksums	${ice_dist} \
-			md5 0500306d9cdbc0fbb553fbb529de557a \
-			sha1 b599c3a4d1d3006b868bf2cbcd8e2a2d4575fb22 \
-			rmd160 e85b37c93f12d9ae97c6b7b2f64f506fa051e4f8 \
+			md5 1f37dfcec4662fcde030553fb447d064 \
+			sha1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa \
+			rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5 \
 		${mcpp_dist} \
 			md5 14f9e4155aeb5812fc3ced6345caee02 \
 			sha1 3bb1c2a2f0fae9c73c2c4edaf98354b2140f4f53 \
-			rmd160 0ff924d66c383dcdd092df0f7e165a7f59a8754a \
-		protobuf-patch-0.1.0.gz \
-			md5 d5ac6485fd89c540fc9e3912f9595d58 \
-			sha1sum 0f9d2e2c1c1601695339b4f621e18f40563e3fa0 \
-			rmd160 9494f3f763c473b1ed0742eda49ae9dde18bea01
+			rmd160 0ff924d66c383dcdd092df0f7e165a7f59a8754a
 platforms	darwin
 
 depends_lib	port:libiconv \
@@ -84,14 +76,6 @@
 	ui_debug ${cmd}
 	system ${cmd}
 
-	set cmd "cd ${workpath}/Ice-${version} && patch -p0 < ${filespath}/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff"
-	ui_debug ${cmd}
-	system ${cmd}
-
-	set cmd "cd ${workpath}/Ice-${version} && gzcat ${distpath}/protobuf-patch-0.1.0.gz | patch -p0"
-	ui_debug ${cmd}
-	system ${cmd}
-
 	reinplace "s/-O2/-g -O2/" ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
 
 	# It appears that the 10.4 and 10.5 installed versions of

Deleted: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff	2009-04-05 09:45:26 UTC (rev 49192)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff	2009-04-05 10:11:38 UTC (rev 49193)
@@ -1,14 +0,0 @@
---- cpp/src/Ice/ConnectRequestHandler.cpp
-+++ cpp/src/Ice/ConnectRequestHandler.cpp
-@@ -212,7 +212,10 @@ ConnectRequestHandler::abortBatchRequest()
- Ice::ConnectionI*
- ConnectRequestHandler::sendRequest(Outgoing* out)
- {
--    if(!getConnection(true)->sendRequest(out, _compress, _response) || _response)
-+    // Must be called first, _compress might not be initialized before this returns.
-+    Ice::ConnectionIPtr connection = getConnection(true);
-+    assert(connection);
-+    if(!connection->sendRequest(out, _compress, _response) || _response)
-     {
-         return _connection.get(); // The request has been sent or we're expecting a response.
-     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090405/1272decf/attachment.html>