[73677] trunk/dports/devel

[blair at macports.org]

Revision: 73677
          http://trac.macports.org/changeset/73677
Author:   blair at macports.org
Date:     2010-11-20 22:39:27 -0800 (Sat, 20 Nov 2010)
Log Message:
-----------
Add a port for Ice 3.3.1, copied from ice-cpp at 67663, with a few
modifications for it to compile.  It needed a patch to handle
SSL_get_current_cipher()'s new return type.

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

Added Paths:
-----------
    trunk/dports/devel/ice33-cpp/
    trunk/dports/devel/ice33-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff

Modified: trunk/dports/devel/ice33-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2010-05-15 17:05:30 UTC (rev 67663)
+++ trunk/dports/devel/ice33-cpp/Portfile	2010-11-21 06:39:27 UTC (rev 73677)
@@ -2,12 +2,12 @@
 
 PortSystem 1.0
 
-name            ice-cpp
+name            ice33-cpp
 version         3.3.1
-revision        5
 categories      devel
 maintainers     blair
 description     Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
+conflicts       ice-cpp
 
 long_description \
         The Internet Communications Engine (Ice) is a modern alternative to \
@@ -34,10 +34,12 @@
 
 set ice_dist    Ice-${version}${extract.suffix}
 
+dist_subdir     ice-cpp
 distname        Ice-${version}
 distfiles       ${ice_dist}
 patchfiles      patch-ice.cpp.config.Make.rules.diff \
                 patch-ice.cpp.config.Make.rules.Darwin.diff \
+                patch-ice.cpp.src.IceSSL.Instance.cpp.diff \
                 patch-ice.cpp.src.slice2html.Gen.diff \
                 patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
 checksums       ${ice_dist} \
@@ -62,6 +64,10 @@
         ui_debug ${cmd}
         system ${cmd}
 
+        set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.IceSSL.Instance.cpp.diff"
+        ui_debug ${cmd}
+        system ${cmd}
+
         set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2html.Gen.diff"
         ui_debug ${cmd}
         system ${cmd}

Added: trunk/dports/devel/ice33-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff
===================================================================
--- trunk/dports/devel/ice33-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/ice33-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff	2010-11-21 06:39:27 UTC (rev 73677)
@@ -0,0 +1,12 @@
+diff -ru ../Ice-3.3.1.orig/cpp/src/IceSSL/Instance.cpp ./cpp/src/IceSSL/Instance.cpp
+--- ../Ice-3.3.1.orig/cpp/src/IceSSL/Instance.cpp	2009-03-20 10:52:14.000000000 -0700
++++ ./cpp/src/IceSSL/Instance.cpp	2010-11-20 21:36:36.000000000 -0800
+@@ -989,7 +989,7 @@
+ {
+     Trace out(_logger, _securityTraceCategory);
+     out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
+-    SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
++    const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
+     if(!cipher)
+     {
+         out << "unknown cipher\n";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101120/18c60b43/attachment.html>