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

blair at macports.org blair at macports.org
Wed Jun 9 08:38:34 PDT 2010


Revision: 68660
          http://trac.macports.org/changeset/68660
Author:   blair at macports.org
Date:     2010-06-09 08:38:29 -0700 (Wed, 09 Jun 2010)
Log Message:
-----------
New upstream 3.4.1 version of Ice.  Remove all the patches and
reinplaces that are in the new release.

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

Removed Paths:
-------------
    trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
    trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
    trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Instance.cpp.diff

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2010-06-09 14:15:43 UTC (rev 68659)
+++ trunk/dports/devel/ice-cpp/Portfile	2010-06-09 15:38:29 UTC (rev 68660)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            ice-cpp
-version         3.4.0
-revision        2
+version         3.4.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      devel
 maintainers     blair
@@ -35,14 +34,11 @@
 
 distname        Ice-${version}
 patchfiles      patch-ice.cpp.config.Make.rules.diff \
-                patch-ice.cpp.config.Make.rules.Darwin.diff \
-                patch-ice.cpp.src.Ice.Instance.cpp.diff \
-                745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt \
-                747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
+                patch-ice.cpp.config.Make.rules.Darwin.diff
 patch.pre_args  -p1
-checksums       md5 998b10627ade020cb00f5beb73efc0e0 \
-                sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \
-                rmd160 e874749f8d7d1916c1e3b19c006a7f2216e10f53
+checksums       md5 3aae42aa47dec74bb258c1a1b2847a1a \
+                sha1 f3ae394146a36fa6453dc69e80d2ab6ab30f4d9a \
+                rmd160 aa756a14421e084336dcecdcbb977aa98c5e1283
 platforms       darwin
 
 depends_lib     port:libiconv \
@@ -55,23 +51,9 @@
 build.dir       ${worksrcpath}/cpp
 
 post-patch {
-        # Remove this reinplace when 3.4.1 is released.
-        reinplace "s/nodarwing/nodarwin/" \
-                ${worksrcpath}/scripts/TestUtil.py
-
         reinplace "s/-O2/-g -O2/" \
                 ${build.dir}/config/Make.rules.Darwin
 
-        # To prevent a compilation failure by picking up header files
-        # from an older installed version of Ice, put the $(CPPFLAGS)
-        # before $(READLINE_FLAGS).
-        reinplace "s|\$\(READLINE_FLAGS\) \$\(CPPFLAGS\)|\$\(CPPFLAGS\) \$\(READLINE_FLAGS\)|" \
-                ${build.dir}/demo/Freeze/library/Makefile \
-                ${build.dir}/demo/Freeze/phonebook/Makefile \
-                ${build.dir}/demo/book/evictor_filesystem/Makefile \
-                ${build.dir}/demo/book/lifecycle/Makefile \
-                ${build.dir}/demo/book/map_filesystem/Makefile
-
         # It appears that the 10.4 and 10.5 installed versions of
         # ${prefix}/include/iconv.h have different definitions of
         # the inbuf parameter to iconv(), one is 'const char* * inbuf'

Deleted: trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
===================================================================
--- trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt	2010-06-09 14:15:43 UTC (rev 68659)
+++ trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt	2010-06-09 15:38:29 UTC (rev 68660)
@@ -1,49 +0,0 @@
-diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
-index 22355fe..4e68b64 100644
---- a/cpp/src/slice2cpp/Gen.cpp
-+++ b/cpp/src/slice2cpp/Gen.cpp
-@@ -6629,21 +6629,34 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
-     {
-         return false;
-     }
--    H.zeroIndent();
--    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
--    H << nl << "#else";
--    H.restoreIndent();
--    H << nl << "namespace Ice" << nl << '{';
-+    if(UnitPtr::dynamicCast(m->container()))
-+    {
-+        //
-+        // Only emit this for the top-level module.
-+        //
-+        H << sp;
-+        H.zeroIndent();
-+        H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-+        H << nl << "#else";
-+        H.restoreIndent();
-+        H << nl << "namespace Ice" << nl << '{';
-+    }
-     return true;
- }
- 
- void
--Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr&)
-+Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m)
- {
--    H << nl << '}';
--    H.zeroIndent();
--    H << nl << "#endif";
--    H.restoreIndent();
-+    if(UnitPtr::dynamicCast(m->container()))
-+    {
-+        //
-+        // Only emit this for the top-level module.
-+        //
-+        H << nl << '}';
-+        H.zeroIndent();
-+        H << nl << "#endif";
-+        H.restoreIndent();
-+    }
- }
- 
- bool

Deleted: trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
===================================================================
--- trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt	2010-06-09 14:15:43 UTC (rev 68659)
+++ trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt	2010-06-09 15:38:29 UTC (rev 68660)
@@ -1,15 +0,0 @@
-diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
-index 998dd7e..ea80897 100644
---- a/cpp/src/slice2cpp/Gen.cpp
-+++ b/cpp/src/slice2cpp/Gen.cpp
-@@ -354,6 +354,10 @@ Slice::Gen::generate(const UnitPtr& p)
-         {
-             H << "\n#include <Ice/Stream.h>";
-         }
-+        else
-+        {
-+            H << "\n#include <Ice/StreamF.h>";
-+        }
-     }
- 
-     if(_checksum)

Deleted: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Instance.cpp.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Instance.cpp.diff	2010-06-09 14:15:43 UTC (rev 68659)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Instance.cpp.diff	2010-06-09 15:38:29 UTC (rev 68660)
@@ -1,115 +0,0 @@
-diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
-index 8f80123..be22705 100644
---- a/cpp/src/Ice/Instance.cpp
-+++ b/cpp/src/Ice/Instance.cpp
-@@ -71,6 +71,9 @@ namespace
- IceUtil::Mutex* staticMutex = 0;
- bool oneOffDone = false;
- int instanceCount = 0;
-+#ifndef _WIN32
-+struct sigaction oldAction;
-+#endif
- bool printProcessIdDone = false;
- string identForOpenlog;
- 
-@@ -870,8 +873,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
-                 action.sa_handler = SIG_IGN;
-                 sigemptyset(&action.sa_mask);
-                 action.sa_flags = 0;
--                sigaction(SIGPIPE, &action, 0);
--                
-+                sigaction(SIGPIPE, &action, &oldAction);
-                 if(_initData.properties->getPropertyAsInt("Ice.UseSyslog") > 0)
-                 {
-                     identForOpenlog = _initData.properties->getProperty("Ice.ProgramName");
-@@ -1051,12 +1053,8 @@ IceInternal::Instance::~Instance()
- #endif
-         
- #ifndef _WIN32
--        struct sigaction action;
--        action.sa_handler = SIG_DFL;
--        sigemptyset(&action.sa_mask);
--        action.sa_flags = 0;
--        sigaction(SIGPIPE, &action, 0);
--        
-+        sigaction(SIGPIPE, &oldAction, 0);
-+
-         if(!identForOpenlog.empty())
-         {
-             closelog();
-diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
-index fcc2203..c20cfe8 100644
---- a/cpp/test/Ice/interceptor/Client.cpp
-+++ b/cpp/test/Ice/interceptor/Client.cpp
-@@ -15,6 +15,14 @@
- #include <AMDInterceptorI.h>
- #include <iostream>
- 
-+#ifndef _WIN32
-+//
-+// SIGPIPE test
-+//
-+#   include <signal.h>
-+#endif
-+
-+
- using namespace std;
- 
- class Client : public Ice::Application
-@@ -29,16 +37,55 @@ private:
-     int runAmd(const Test::MyObjectPrx&, const AMDInterceptorIPtr&); 
- };
- 
-+#ifndef _WIN32
-+void testAction(int)
-+{
-+    test(false);
-+}
-+#endif
-+
- int
- main(int argc, char* argv[])
- {
-+#ifndef _WIN32
-+//
-+// Set SIGPIPE action
-+//
-+    struct sigaction action;
-+    action.sa_handler = &testAction;
-+    sigemptyset(&action.sa_mask);
-+    action.sa_flags = 0;
-+    sigaction(SIGPIPE, &action, 0);
-+#endif
-+
-     Client app;
--    return app.main(argc, argv);
-+    int result = app.main(argc, argv);
-+
-+#ifndef _WIN32
-+//
-+// Check SIGPIPE was properly reset to old action
-+//
-+    struct sigaction newAction;
-+    sigaction(SIGPIPE, 0, &newAction);
-+    test(action.sa_handler == &testAction);
-+#endif
-+
-+    return result;
- }
- 
- int
- Client::run(int, char*[])
- {
-+
-+#ifndef _WIN32
-+//
-+// Check SIGPIPE is now SIG_IGN
-+//
-+    struct sigaction action;
-+    sigaction(SIGPIPE, 0, &action);
-+    test(action.sa_handler == SIG_IGN);
-+#endif
-+
-     //
-     // Create OA and servants  
-     //  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100609/73497664/attachment.html>


More information about the macports-changes mailing list