[104127] trunk/dports/devel/zeroc-ice35
blair at macports.org
blair at macports.org
Sat Mar 16 22:01:09 PDT 2013
Revision: 104127
https://trac.macports.org/changeset/104127
Author: blair at macports.org
Date: 2013-03-16 22:01:09 -0700 (Sat, 16 Mar 2013)
Log Message:
-----------
zeroc-ice35: new upstream 3.5.0 release.
Modified Paths:
--------------
trunk/dports/devel/zeroc-ice35/Portfile
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.include.TestCommon.h.diff
Added Paths:
-----------
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Freeze.complex.Scanner.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.deployer.run.py.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.replicaGroup.run.py.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff
Removed Paths:
-------------
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Buffer.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Network.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Service.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff
Modified: trunk/dports/devel/zeroc-ice35/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice35/Portfile 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/Portfile 2013-03-17 05:01:09 UTC (rev 104127)
@@ -4,10 +4,8 @@
PortSystem 1.0
name zeroc-ice35
-set real_version 3.5b
-version 0.0.${real_version}
-#set branch [join [lrange [split ${real_version} .] 0 1] .]
-set branch 3.5
+version 3.5.0
+set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers blair
conflicts zeroc-ice33 zeroc-ice34
@@ -37,31 +35,19 @@
homepage http://www.zeroc.com/
master_sites ${homepage}download/Ice/${branch}/
-distname Ice-${real_version}
-checksums sha1 1c40ca1152055ed824cec01bb4e25d7733812854 \
- sha256 223e48213b1a5f087c760a2937d54d2878d78dc0b50cc506806ade57609fb083
+distname Ice-${version}
+checksums sha1 8501afaf86c0d62192cfc1b83c338178f73e98e9 \
+ sha256 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575
patchfiles patch-ice.cpp.config.Make.rules.diff \
patch-ice.cpp.config.Make.rules.Darwin.diff \
- patch-ice.cpp.include.Ice.Buffer.h.diff \
- patch-ice.cpp.include.Ice.IconvStringConverter.h.diff \
- patch-ice.cpp.include.IceUtil.Mutex.h.diff \
- patch-ice.cpp.src.Freeze.MapDb.cpp.diff \
- patch-ice.cpp.src.Freeze.MapI.cpp.diff \
- patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff \
patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff \
- patch-ice.cpp.src.Ice.Network.cpp.diff \
- patch-ice.cpp.src.Ice.Service.cpp.diff \
- patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff \
- patch-ice.cpp.src.IceStorm.NodeI.cpp.diff \
- patch-ice.cpp.src.IceUtil.Cond.cpp.diff \
- patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff \
- patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff \
- patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff \
- patch-ice.cpp.src.Slice.FileTracker.cpp.diff \
+ patch-ice.cpp.test.Freeze.complex.Scanner.cpp.diff \
patch-ice.cpp.test.Ice.info.AllTests.cpp.diff \
patch-ice.cpp.test.IceGrid.admin.run.py.diff \
- patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff \
- patch-ice.cpp.test.include.TestCommon.h.diff
+ patch-ice.cpp.test.IceGrid.deployer.run.py.diff \
+ patch-ice.cpp.test.IceGrid.replicaGroup.run.py.diff \
+ patch-ice.cpp.test.include.TestCommon.h.diff \
+ patch-ice.scripts.TestUtil.py.diff
patch.pre_args -p1
platforms darwin
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -4,9 +4,9 @@
2) Do not build for both i386 and x86_64 since MacPorts' universal
configuration will specify which architectures to build for.
-diff -ru Ice-3.5b.orig/cpp/config/Make.rules.Darwin Ice-3.5b/cpp/config/Make.rules.Darwin
---- Ice-3.5b.orig/cpp/config/Make.rules.Darwin 2012-12-12 13:15:11.000000000 -0800
-+++ Ice-3.5b/cpp/config/Make.rules.Darwin 2012-12-13 09:18:35.000000000 -0800
+diff -ru Ice-3.5.0.orig/cpp/config/Make.rules.Darwin Ice-3.5.0/cpp/config/Make.rules.Darwin
+--- Ice-3.5.0.orig/cpp/config/Make.rules.Darwin 2013-03-11 08:19:46.000000000 -0700
++++ Ice-3.5.0/cpp/config/Make.rules.Darwin 2013-03-11 21:30:00.269042661 -0700
@@ -11,17 +11,11 @@
# This file is included by Make.rules when uname is Darwin.
#
@@ -14,7 +14,7 @@
-CXX = xcrun clang++
+CXX ?= xcrun clang++
- CXXFLAGS = -Wall -D_REENTRANT
+ CXXFLAGS = -Wall -Werror -D_REENTRANT
ifeq ($(OPTIMIZE),yes)
- #
@@ -26,7 +26,7 @@
CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS)
else
CXXFLAGS := $(CXXARCHFLAGS) -g $(CXXFLAGS)
-@@ -106,7 +100,7 @@
+@@ -72,7 +66,7 @@
ICEUTIL_OS_LIBS = -lpthread
ICE_OS_LIBS = -ldl
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,18 +1,18 @@
-diff -ru Ice-3.5b.orig/cpp/config/Make.rules Ice-3.5b/cpp/config/Make.rules
---- Ice-3.5b.orig/cpp/config/Make.rules 2012-12-12 13:15:13.000000000 -0800
-+++ Ice-3.5b/cpp/config/Make.rules 2012-12-12 23:16:29.000000000 -0800
-@@ -213,11 +213,11 @@
+diff -ru Ice-3.5.0.orig/cpp/config/Make.rules Ice-3.5.0/cpp/config/Make.rules
+--- Ice-3.5.0.orig/cpp/config/Make.rules 2013-03-11 08:19:48.000000000 -0700
++++ Ice-3.5.0/cpp/config/Make.rules 2013-03-11 21:37:08.888908977 -0700
+@@ -219,11 +219,11 @@
endif
ifneq ($(DB_HOME),)
- DB_FLAGS = -I$(DB_HOME)/include
+ DB_FLAGS = -I$(DB_HOME)/include/db46
ifeq ($(DB_LIBS),)
-- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx$(CPP11LIBSUFFIX)
-+ DB_LIBS = -L$(DB_HOME)/$(libsubdir)/db46 -ldb_cxx$(CPP11LIBSUFFIX)
+- DB_LIBS = -L$(DB_HOME)/$(libsubdir)$(cpp11suffix) -ldb_cxx
++ DB_LIBS = -L$(DB_HOME)/$(libsubdir)/db46$(cpp11suffix) -ldb_cxx
endif
-- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
-+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46)
+- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)$(cpp11suffix))
++ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46$(cpp11suffix))
else
ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
DB_FLAGS = -I/usr/include/db53
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Buffer.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Buffer.h.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Buffer.h.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,10 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/Buffer.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/Buffer.h 2012-03-04 20:14:52.000000000 +0100
-@@ -10,6 +10,7 @@
- #ifndef ICEE_BUFFER_H
- #define ICEE_BUFFER_H
-
-+#include <cstddef>
- #include <Ice/Config.h>
-
- namespace IceInternal
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,21 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/IconvStringConverter.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/IconvStringConverter.h 2012-03-04 20:14:52.000000000 +0100
-@@ -225,10 +225,16 @@
- template<typename charT> /*static*/ void
- IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
- {
-- int rs = iconv_close(cdp.first);
-+#ifndef NDEBUG
-+ int rs =
-+#endif
-+ iconv_close(cdp.first);
- assert(rs == 0);
-
-- rs = iconv_close(cdp.second);
-+#ifndef NDEBUG
-+ rs =
-+#endif
-+ iconv_close(cdp.second);
- assert(rs == 0);
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/IceUtil/Mutex.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/IceUtil/Mutex.h 2012-03-04 20:14:52.000000000 +0100
-@@ -251,8 +251,11 @@
- inline
- Mutex::~Mutex()
- {
-+#ifndef NDEBUG
- int rc = 0;
-- rc = pthread_mutex_destroy(&_mutex);
-+ rc =
-+#endif
-+ pthread_mutex_destroy(&_mutex);
- assert(rc == 0);
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Freeze/MapDb.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -229,7 +229,11 @@
- #ifndef NDEBUG
- bool inserted =
- #endif
-- _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
-+ _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
-+#ifndef NDEBUG
-+ .second
-+#endif
-+ ;
- assert(inserted);
-
- indexBase->_impl = indexI.release();
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,41 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Freeze/MapI.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Freeze/MapI.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -749,8 +749,11 @@
-
- try
- {
-+#ifndef NDEBUG
- int err;
-- err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
-+ err =
-+#endif
-+ _dbc->put(&dbKey, &dbValue, DB_CURRENT);
- assert(err == 0);
- }
- catch(const ::DbDeadlockException& dx)
-@@ -1023,7 +1026,11 @@
- #ifndef NDEBUG
- bool inserted =
- #endif
-- _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
-+ _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
-+#ifndef NDEBUG
-+ .second
-+#endif
-+ ;
- assert(inserted);
- indexBase->_map = this;
- }
-@@ -1360,8 +1367,11 @@
- try
- {
- u_int32_t count;
-+#ifndef NDEBUG
- int err;
-- err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
-+ err =
-+#endif
-+ _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
- assert(err == 0);
- break;
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Freeze/SharedDbEnv.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Freeze/SharedDbEnv.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -336,8 +336,11 @@
- // Remove from map
- //
-
-+#ifndef NDEBUG
- size_t one;
-- one = sharedDbEnvMap->erase(key);
-+ one =
-+#endif
-+ sharedDbEnvMap->erase(key);
- assert(one == 1);
-
- if(sharedDbEnvMap->size() == 0)
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -2,10 +2,10 @@
match the renamed Ice libraries for compatibility with xorg-libice's
libICE.*.
-diff -ru Ice-3.5b.orig/cpp/src/Ice/DynamicLibrary.cpp Ice-3.5b/cpp/src/Ice/DynamicLibrary.cpp
---- Ice-3.5b.orig/cpp/src/Ice/DynamicLibrary.cpp 2012-12-12 13:15:12.000000000 -0800
-+++ Ice-3.5b/cpp/src/Ice/DynamicLibrary.cpp 2012-12-13 19:04:42.000000000 -0800
-@@ -148,10 +148,15 @@
+diff -ru Ice-3.5.0.orig/cpp/src/Ice/DynamicLibrary.cpp Ice-3.5.0/cpp/src/Ice/DynamicLibrary.cpp
+--- Ice-3.5.0.orig/cpp/src/Ice/DynamicLibrary.cpp 2013-03-11 08:19:46.000000000 -0700
++++ Ice-3.5.0/cpp/src/Ice/DynamicLibrary.cpp 2013-03-11 21:57:17.560249335 -0700
+@@ -138,10 +138,15 @@
lib += ".dll";
#elif defined(__APPLE__)
@@ -21,7 +21,7 @@
}
#elif defined(__hpux)
lib += "lib" + libName;
-@@ -185,7 +190,10 @@
+@@ -175,7 +180,10 @@
//
if(!load(lib + ".dylib"))
{
@@ -33,7 +33,7 @@
if(!load(lib + ".so"))
{
errMsg += "; " + _err;
-@@ -195,7 +203,8 @@
+@@ -185,7 +193,8 @@
return 0;
}
}
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Network.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Network.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Network.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/Network.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/Network.cpp 2011-07-15 23:40:26.000000000 +0200
-@@ -715,7 +715,11 @@
- WSASetLastError(error);
- #else
- int error = errno;
-- if(close(fd) == SOCKET_ERROR)
-+ if(close(fd) == SOCKET_ERROR
-+# if defined(__FreeBSD__)
-+ && getSocketErrno() != ECONNRESET
-+# endif
-+ )
- {
- SocketException ex(__FILE__, __LINE__);
- ex.error = getSocketErrno();
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Service.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Service.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Service.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,32 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/Service.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/Service.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -2136,17 +2136,26 @@
- //
- // Associate stdin, stdout and stderr with /dev/null.
- //
-+#ifndef NDEBUG
- int fd;
-- fd = open("/dev/null", O_RDWR);
-+ fd =
-+#endif
-+ open("/dev/null", O_RDWR);
- assert(fd == 0);
- if(stdOut.empty())
- {
-- fd = dup2(0, 1);
-+#ifndef NDEBUG
-+ fd =
-+#endif
-+ dup2(0, 1);
- assert(fd == 1);
- }
- if(stdErr.empty())
- {
-- fd = dup2(1, 2);
-+#ifndef NDEBUG
-+ fd =
-+#endif
-+ dup2(1, 2);
- assert(fd == 2);
- }
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,16 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/AdminCallbackRouter.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/AdminCallbackRouter.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -49,7 +49,12 @@
- #ifndef NDEBUG
- bool inserted =
- #endif
-- _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con)).second;
-+ _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con))
-+#ifndef NDEBUG
-+ .second
-+#endif
-+ ;
-+
-
- assert(inserted == true);
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,14 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceStorm/NodeI.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceStorm/NodeI.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -18,11 +18,6 @@
- namespace
- {
-
--bool operator==(const GroupNodeInfo& info, int id)
--{
-- return info.id == id;
--}
--
- class CheckTask : public IceUtil::TimerTask
- {
- const NodeIPtr _node;
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceUtil/Cond.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceUtil/Cond.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -330,8 +330,11 @@
-
- IceUtil::Cond::~Cond()
- {
-+#ifndef NDEBUG
- int rc = 0;
-- rc = pthread_cond_destroy(&_cond);
-+ rc =
-+#endif
-+ pthread_cond_destroy(&_cond);
- assert(rc == 0);
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,21 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceUtil/CountDownLatch.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceUtil/CountDownLatch.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -44,10 +44,16 @@
- #ifdef _WIN32
- CloseHandle(_event);
- #else
-+#ifndef NDEBUG
- int rc = 0;
-- rc = pthread_mutex_destroy(&_mutex);
-+ rc =
-+#endif
-+ pthread_mutex_destroy(&_mutex);
- assert(rc == 0);
-- rc = pthread_cond_destroy(&_cond);
-+#ifndef NDEBUG
-+ rc =
-+#endif
-+ pthread_cond_destroy(&_cond);
- assert(rc == 0);
- #endif
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,13 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceUtil/FileUtil.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceUtil/FileUtil.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -26,6 +26,10 @@
- # include <dir.h>
- #endif
-
-+#ifdef __FreeBSD__
-+# include <unistd.h>
-+#endif
-+
- using namespace std;
-
- //
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,28 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceUtil/RecMutex.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceUtil/RecMutex.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -148,8 +148,11 @@
- IceUtil::RecMutex::~RecMutex()
- {
- assert(_count == 0);
-+#ifndef NDEBUG
- int rc = 0;
-- rc = pthread_mutex_destroy(&_mutex);
-+ rc =
-+#endif
-+ pthread_mutex_destroy(&_mutex);
- assert(rc == 0);
- }
-
-@@ -196,8 +199,11 @@
- {
- if(--_count == 0)
- {
-+#ifndef NDEBUG
- int rc = 0; // Prevent warnings when NDEBUG is defined.
-- rc = pthread_mutex_unlock(&_mutex);
-+ rc =
-+#endif
-+ pthread_mutex_unlock(&_mutex);
- assert(rc == 0);
- }
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,13 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Slice/FileTracker.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Slice/FileTracker.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -17,6 +17,10 @@
- # include <direct.h>
- #endif
-
-+#ifdef __FreeBSD__
-+# include <unistd.h>
-+#endif
-+
- using namespace std;
-
- Slice::FileException::FileException(const char* file, int line, const string& r) :
Added: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Freeze.complex.Scanner.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Freeze.complex.Scanner.cpp.diff (rev 0)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Freeze.complex.Scanner.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -0,0 +1,49 @@
+g++ 4.2.1 on Mac OS X 10.5 doesn't seem to honor the following line:
+
+# pragma GCC diagnostic warning "-Wunused-function"
+
+So the following error results:
+
+/usr/bin/g++-4.2 -c -I. -I../../include -I../../../include -g -O2 -DNDEBUG -Wall -Werror -D_REENTRANT Scanner.cpp
+cc1plus: warnings being treated as errors
+lex.yy.c:1129: warning: ?void yyunput(int, char*)? defined but not used
+make[3]: *** [Scanner.o] Error 1
+
+The patch only comments out the declaration and definition of yyunput,
+it doesn't comment out
+
+#define unput(c) yyunput( c, (yytext_ptr) )
+
+because if it is unused, then unput() should not be inadvertently
+used.
+
+
+diff -ru Ice-3.5.0.orig/cpp/test/Freeze/complex/Scanner.cpp Ice-3.5.0/cpp/test/Freeze/complex/Scanner.cpp
+--- Ice-3.5.0.orig/cpp/test/Freeze/complex/Scanner.cpp 2013-03-11 08:19:46.000000000 -0700
++++ Ice-3.5.0/cpp/test/Freeze/complex/Scanner.cpp 2013-03-14 19:43:54.497251598 -0700
+@@ -569,7 +569,9 @@
+ #endif
+ #endif
+
++#if 0
+ static void yyunput (int c,char *buf_ptr );
++#endif
+
+ #ifndef yytext_ptr
+ static void yy_flex_strncpy (char *,yyconst char *,int );
+@@ -1127,6 +1129,7 @@
+ return yy_is_jam ? 0 : yy_current_state;
+ }
+
++#if 0
+ static void yyunput (int c, register char * yy_bp )
+ {
+ register char *yy_cp;
+@@ -1163,6 +1166,7 @@
+ (yy_hold_char) = *yy_cp;
+ (yy_c_buf_p) = yy_cp;
+ }
++#endif
+
+ #ifndef YY_NO_INPUT
+ #ifdef __cplusplus
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,6 +1,7 @@
---- Ice-3.4.2.orig/cpp/test/Ice/info/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Ice/info/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -141,9 +141,11 @@
+diff -ru Ice-3.5.0.orig/cpp/test/Ice/info/AllTests.cpp Ice-3.5.0/cpp/test/Ice/info/AllTests.cpp
+--- Ice-3.5.0.orig/cpp/test/Ice/info/AllTests.cpp 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/cpp/test/Ice/info/AllTests.cpp 2013-03-11 22:34:18.777888068 -0700
+@@ -145,9 +145,11 @@
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
@@ -15,7 +16,7 @@
ostringstream os;
Ice::Context ctx = testIntf->getConnectionInfoAsContext();
-@@ -163,8 +165,11 @@
+@@ -167,8 +169,11 @@
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
Added: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.deployer.run.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.deployer.run.py.diff (rev 0)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.deployer.run.py.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -0,0 +1,15 @@
+diff -ru Ice-3.5.0.orig/cpp/test/IceGrid/deployer/run.py Ice-3.5.0/cpp/test/IceGrid/deployer/run.py
+--- Ice-3.5.0.orig/cpp/test/IceGrid/deployer/run.py 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/cpp/test/IceGrid/deployer/run.py 2013-03-16 20:28:41.401227641 -0700
+@@ -30,9 +30,9 @@
+ iceBox = os.path.join(os.getcwd(), "iceboxwrapper")
+ iceBoxWrapper = open(iceBox, "w")
+ if TestUtil.x64:
+- iceBoxWrapper.write("#!/bin/sh\narch -x86_64 " + TestUtil.getIceBox() + " \"$@\"\n")
++ iceBoxWrapper.write("#!/bin/sh\narch -x86_64 -ppc64 " + TestUtil.getIceBox() + " \"$@\"\n")
+ else:
+- iceBoxWrapper.write("#!/bin/sh\narch -i386 -x86_64 " + TestUtil.getIceBox() + " \"$@\"\n")
++ iceBoxWrapper.write("#!/bin/sh\narch -i386 -ppc -x86_64 -ppc64 " + TestUtil.getIceBox() + " \"$@\"\n")
+ iceBoxWrapper.close()
+ os.chmod(iceBox, 0o700)
+ else:
Added: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.replicaGroup.run.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.replicaGroup.run.py.diff (rev 0)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceGrid.replicaGroup.run.py.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -0,0 +1,15 @@
+diff -ru Ice-3.5.0.orig/cpp/test/IceGrid/replicaGroup/run.py Ice-3.5.0/cpp/test/IceGrid/replicaGroup/run.py
+--- Ice-3.5.0.orig/cpp/test/IceGrid/replicaGroup/run.py 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/cpp/test/IceGrid/replicaGroup/run.py 2013-03-16 21:18:49.495214526 -0700
+@@ -36,9 +36,9 @@
+ iceBox = os.path.join(os.getcwd(), "iceboxwrapper")
+ iceBoxWrapper = open(iceBox, "w")
+ if TestUtil.x64:
+- iceBoxWrapper.write("#!/bin/sh\narch -x86_64 " + TestUtil.getIceBox() + " \"$@\"\n")
++ iceBoxWrapper.write("#!/bin/sh\narch -x86_64 -ppc64 " + TestUtil.getIceBox() + " \"$@\"\n")
+ else:
+- iceBoxWrapper.write("#!/bin/sh\narch -i386 -x86_64 " + TestUtil.getIceBox() + " \"$@\"\n")
++ iceBoxWrapper.write("#!/bin/sh\narch -i386 -ppc -x86_64 -ppc64 " + TestUtil.getIceBox() + " \"$@\"\n")
+ iceBoxWrapper.close()
+ os.chmod(iceBox, 0o700)
+ else:
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,13 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/IceUtil/unicode/Client.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/IceUtil/unicode/Client.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -15,6 +15,10 @@
- # include <io.h>
- #endif
-
-+#ifdef __FreeBSD__
-+# include <unistd.h>
-+#endif
-+
- using namespace IceUtil;
- using namespace std;
-
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.include.TestCommon.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.include.TestCommon.h.diff 2013-03-16 23:39:57 UTC (rev 104126)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.include.TestCommon.h.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -1,8 +1,9 @@
---- Ice-3.4.2.orig/cpp/test/include/TestCommon.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/include/TestCommon.h 2012-03-04 20:14:53.000000000 +0100
-@@ -17,6 +17,22 @@
- #include <stdlib.h>
- #endif
+diff -ru Ice-3.5.0.orig/cpp/test/include/TestCommon.h Ice-3.5.0/cpp/test/include/TestCommon.h
+--- Ice-3.5.0.orig/cpp/test/include/TestCommon.h 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/cpp/test/include/TestCommon.h 2013-03-11 22:35:25.353825217 -0700
+@@ -25,6 +25,22 @@
+ std::cout << msg << std::flush;
+ }
+#if defined(__FreeBSD__)
+# include <sys/types.h>
@@ -21,5 +22,5 @@
+#endif
+
void
- inline testFailed(const char* expr, const char* file, unsigned int line)
+ inline println(const std::string& msg)
{
Added: trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff (rev 0)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff 2013-03-17 05:01:09 UTC (rev 104127)
@@ -0,0 +1,24 @@
+diff -ru Ice-3.5.0.orig/scripts/TestUtil.py Ice-3.5.0/scripts/TestUtil.py
+--- Ice-3.5.0.orig/scripts/TestUtil.py 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/scripts/TestUtil.py 2013-03-16 14:30:44.011852186 -0700
+@@ -914,12 +914,18 @@
+ arch = ""
+ if isDarwin() and config.lang == "cpp":
+ if x64:
+- arch = "arch -x86_64 "
++ if sys.byteorder == "little":
++ arch = "arch -x86_64 "
++ else:
++ arch = "arch -ppc64 "
+ else:
+ # We don't really know what architecture the binaries were
+ # built with, prefer 32 bits if --x64 is not set and if 32
+ # bits binaries aren't available, 64 bits will be used.
+- arch = "arch -i386 -x86_64 "
++ if sys.byteorder == "little":
++ arch = "arch -i386 -x86_64 "
++ else:
++ arch = "arch -ppc -ppc64 "
+
+ output = getStringIO()
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130316/863898f4/attachment-0001.html>
More information about the macports-changes
mailing list