From c1436fa4e5e34530cd4ca97f9d1796dd47f64d19 Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sun, 23 Sep 2012 14:45:33 +0000
Subject: 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)
---
 .../ice/files/patch-cpp-src-slice2freezej-Main.cpp | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp

(limited to 'devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp')

diff --git a/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp b/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp
new file mode 100644
index 000000000000..7612dccad7a6
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp
@@ -0,0 +1,55 @@
+--- cpp.orig/src/slice2freezej/Main.cpp	2011-06-15 21:43:58.000000000 +0200
++++ cpp/src/slice2freezej/Main.cpp	2012-09-10 11:43:58.000000000 +0200
+@@ -26,7 +26,7 @@ using namespace IceUtilInternal;
+ namespace
+ {
+ 
+-IceUtil::Mutex* mutex = 0;
++IceUtil::Mutex* mtx = 0;
+ bool interrupted = false;
+ 
+ class Init
+@@ -35,13 +35,13 @@ public:
+ 
+     Init()
+     {
+-        mutex = new IceUtil::Mutex;
++        mtx = new IceUtil::Mutex;
+     }
+ 
+     ~Init()
+     {
+-        delete mutex;
+-        mutex = 0;
++        delete mtx;
++        mtx = 0;
+     }
+ };
+ 
+@@ -52,7 +52,7 @@ Init init;
+ void
+ interruptedCallback(int signal)
+ {
+-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mutex);
++    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mtx);
+ 
+     interrupted = true;
+ }
+@@ -1828,7 +1828,7 @@ compile(int argc, char* argv[])
+         }
+ 
+         {
+-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
++            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
+ 
+             if(interrupted)
+             {
+@@ -1923,7 +1923,7 @@ compile(int argc, char* argv[])
+     u->destroy();
+ 
+     {
+-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
++        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
+ 
+         if(interrupted)
+         {
-- 
cgit v1.2.3