Changes from the PR:

. fix built using Clang in C++11 mode and libc++ (-std=c++11
-stdlib=libc++);
. incorporate a patch that fixes an assert bug in IceStrom;
. adopt new-style options;

While I'm here:
. adopt new-style headers;
. remove indefinite article form COMMENT;
. remove library versions from LIB_DEPENDS.

PR:		ports/171643
Submitted by:	Michael Gmelin <freebsd@grem.de> (maintainer)

1 files changed, 46 insertions, 0 deletions

diff --git a/devel/ice/files/patch-cpp-src-slice2java-Main.cpp b/devel/ice/files/patch-cpp-src-slice2java-Main.cpp
new file mode 100644
index 000000000000..9b05b32e4621
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-slice2java-Main.cpp
@@ -0,0 +1,46 @@
+--- cpp.orig/src/slice2java/Main.cpp	2011-06-15 21:43:58.000000000 +0200
++++ cpp/src/slice2java/Main.cpp	2012-09-10 11:43:58.000000000 +0200
+@@ -23,7 +23,7 @@ using namespace Slice;
+ namespace
+ {
+ 
+-IceUtil::Mutex* mutex = 0;
++IceUtil::Mutex* mtx = 0;
+ bool interrupted = false;
+ 
+ class Init
+@@ -32,13 +32,13 @@ public:
+ 
+     Init()
+     {
+-        mutex = new IceUtil::Mutex;
++        mtx = new IceUtil::Mutex;
+     }
+ 
+     ~Init()
+     {
+-        delete mutex;
+-        mutex = 0;
++        delete mtx;
++        mtx = 0;
+     }
+ };
+ 
+@@ -49,7 +49,7 @@ Init init;
+ void
+ interruptedCallback(int signal)
+ {
+-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
++    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
+ 
+     interrupted = true;
+ }
+@@ -356,7 +356,7 @@ compile(int argc, char* argv[])
+         }
+ 
+         {
+-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
++            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
+ 
+             if(interrupted)
+             {