[100487] trunk/dports/devel
blair at macports.org
blair at macports.org
Thu Dec 13 21:57:58 PST 2012
Revision: 100487
https://trac.macports.org/changeset/100487
Author: blair at macports.org
Date: 2012-12-13 21:57:58 -0800 (Thu, 13 Dec 2012)
Log Message:
-----------
zeroc-ice35: new port for Ice 3.5b based off zeroc-ice34.
Notable changes:
- All shared libaries are renamed s/^lib/libZeroc/, not just libIce.
This requires the new patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff.
- Patches now in 3.5b or patches that are not necessary for Mac OS X,
e.g. for FreeBSD, that do not apply cleanly, are removed.
- Some other patches are refreshed.
Modified Paths:
--------------
trunk/dports/devel/zeroc-ice33/Portfile
trunk/dports/devel/zeroc-ice34/Portfile
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
Added Paths:
-----------
trunk/dports/devel/zeroc-ice35/
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff
Removed Paths:
-------------
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.allTests.py.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.README.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Freeze.Map.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ObjectF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Proxy.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ProxyF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Stream.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.StreamF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Object.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Stream.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.properties.run.py.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff
trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff
Modified: trunk/dports/devel/zeroc-ice33/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice33/Portfile 2012-12-14 05:43:51 UTC (rev 100486)
+++ trunk/dports/devel/zeroc-ice33/Portfile 2012-12-14 05:57:58 UTC (rev 100487)
@@ -7,7 +7,7 @@
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers blair
-conflicts zeroc-ice34
+conflicts zeroc-ice34 zeroc-ice35
license GPL-2
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
Modified: trunk/dports/devel/zeroc-ice34/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice34/Portfile 2012-12-14 05:43:51 UTC (rev 100486)
+++ trunk/dports/devel/zeroc-ice34/Portfile 2012-12-14 05:57:58 UTC (rev 100487)
@@ -8,7 +8,7 @@
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers blair
-conflicts zeroc-ice33
+conflicts zeroc-ice33 zeroc-ice35
license GPL-2
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
Modified: trunk/dports/devel/zeroc-ice35/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice34/Portfile 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/Portfile 2012-12-14 05:57:58 UTC (rev 100487)
@@ -3,12 +3,14 @@
PortSystem 1.0
-name zeroc-ice34
-version 3.4.2
-set branch [join [lrange [split ${version} .] 0 1] .]
+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
categories devel
maintainers blair
-conflicts zeroc-ice33
+conflicts zeroc-ice33 zeroc-ice34
license GPL-2
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -35,89 +37,31 @@
homepage http://www.zeroc.com/
master_sites ${homepage}download/Ice/${branch}/
-distname Ice-${version}
-checksums md5 e97672eb4a63c6b8dd202d0773e19dc7 \
- sha1 8c84d6e3b227f583d05e08251e07047e6c3a6b42 \
- rmd160 7ce680a4eb5fa9d0bb6f8b8910e267dfc2373d75
+distname Ice-${real_version}
+checksums sha1 1c40ca1152055ed824cec01bb4e25d7733812854 \
+ sha256 223e48213b1a5f087c760a2937d54d2878d78dc0b50cc506806ade57609fb083
patchfiles patch-ice.cpp.config.Make.rules.diff \
patch-ice.cpp.config.Make.rules.Darwin.diff \
- patch-ice.cpp.allTests.py.diff \
- patch-ice.cpp.demo.IceGrid.secure.README.diff \
- patch-ice.cpp.demo.IceGrid.secure.application.xml.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.admin.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.client.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.master.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.node.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.registry.diff \
- patch-ice.cpp.demo.IceGrid.secure.config.slave.diff \
- patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff \
- patch-ice.cpp.include.Freeze.Map.h.diff \
patch-ice.cpp.include.Ice.Buffer.h.diff \
- patch-ice.cpp.include.Ice.ConnectionIF.h.diff \
patch-ice.cpp.include.Ice.IconvStringConverter.h.diff \
- patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff \
- patch-ice.cpp.include.Ice.LocalObjectF.h.diff \
- patch-ice.cpp.include.Ice.ObjectF.h.diff \
- patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff \
- patch-ice.cpp.include.Ice.Proxy.h.diff \
- patch-ice.cpp.include.Ice.ProxyF.h.diff \
- patch-ice.cpp.include.Ice.Stream.h.diff \
- patch-ice.cpp.include.Ice.StreamF.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.Glacier2.Blobject.cpp.diff \
- patch-ice.cpp.src.Glacier2.Blobject.h.diff \
- patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff \
- patch-ice.cpp.src.Glacier2.RequestQueue.h.diff \
- patch-ice.cpp.src.Glacier2.RouterI.cpp.diff \
- patch-ice.cpp.src.Ice.ConnectionI.cpp.diff \
- patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff \
- patch-ice.cpp.src.Ice.LocalObject.cpp.diff \
+ patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff \
patch-ice.cpp.src.Ice.Network.cpp.diff \
- patch-ice.cpp.src.Ice.Object.cpp.diff \
- patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff \
- patch-ice.cpp.src.Ice.PropertyNames.cpp.diff \
- patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff \
patch-ice.cpp.src.Ice.Service.cpp.diff \
- patch-ice.cpp.src.Ice.Stream.cpp.diff \
patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff \
- patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff \
- patch-ice.cpp.src.IceGrid.Internal.ice.diff \
- patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff \
- patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff \
- patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff \
- patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff \
- patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff \
- patch-ice.cpp.src.IceGrid.SessionI.h.diff \
- patch-ice.cpp.src.IceSSL.Instance.cpp.diff \
- patch-ice.cpp.src.IceSSL.InstanceF.h.diff \
- patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff \
- patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff \
- patch-ice.cpp.src.IceSSL.Util.cpp.diff \
- patch-ice.cpp.src.IceSSL.UtilF.h.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.CtrlCHandler.cpp.diff \
patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff \
patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff \
- patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff \
patch-ice.cpp.src.Slice.FileTracker.cpp.diff \
- patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \
- patch-ice.cpp.src.slice2cs.Gen.cpp.diff \
- patch-ice.cpp.src.slice2java.Gen.cpp.diff \
- patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff \
- patch-ice.cpp.test.Ice.background.EndpointI.h.diff \
- patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff \
patch-ice.cpp.test.Ice.info.AllTests.cpp.diff \
- patch-ice.cpp.test.Ice.properties.run.py.diff \
patch-ice.cpp.test.IceGrid.admin.run.py.diff \
patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff \
- patch-ice.cpp.test.Slice.keyword.Client.cpp.diff \
- patch-ice.cpp.test.include.TestCommon.h.diff \
- patch-ice.scripts.TestUtil.py.diff
+ patch-ice.cpp.test.include.TestCommon.h.diff
patch.pre_args -p1
platforms darwin
@@ -151,12 +95,18 @@
}
# Prevent name conflicts between libICE.* from xorg-libice and
- # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
- reinplace "s/,Ice/,ZeroCIce/" ${build.dir}/src/Ice/Makefile
- reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+ # libIce.* from this port by renaming libIce.* to libZerocIce.*.
+ # For consistency, rename Ice's other shared libraries.
foreach f [exec find ${build.dir} -name Makefile] {
- reinplace "s/-lIce /-lZeroCIce /" ${f}
+ # To prevent replacements on slice2freeze's --dict argument,
+ # match exactly on a , or a ) that follows ,Ice\w*, e.g.:
+ # $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq
+ reinplace -E {s/,Ice([[:alnum:]]*[,)])/,ZerocIce\1/} ${f}
+ reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} ${f}
}
+ reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} \
+ ${build.dir}/config/Make.rules \
+ ${build.dir}/config/Make.rules.Darwin
}
use_configure no
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.allTests.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.allTests.py.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.allTests.py.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,30 +0,0 @@
---- Ice-3.4.2.orig/cpp/allTests.py 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/allTests.py 2012-03-04 20:14:52.000000000 +0100
-@@ -25,6 +25,7 @@
- # List of all basic tests.
- #
- tests = [
-+
- ("IceUtil/condvar", ["once", "win32only"]),
- ("IceUtil/thread", ["once"]),
- ("IceUtil/unicode", ["once"]),
-@@ -62,7 +63,7 @@
- ("Ice/servantLocator", ["core"]),
- ("Ice/interceptor", ["core"]),
- ("Ice/stringConverter", ["core"]),
-- ("Ice/udp", ["core"]),
-+ ("Ice/udp", ["core", "nofreebsdjail"]),
- ("Ice/defaultServant", ["core"]),
- ("Ice/defaultValue", ["core"]),
- ("Ice/invoke", ["core", "novc6"]),
-@@ -106,8 +107,8 @@
- #
- if TestUtil.isWin32() or os.getuid() == 0:
- tests += [
-- ("IceUtil/priority", ["core", "nodarwin"]),
-- ("Ice/threadPoolPriority", ["core", "nodarwin"])
-+ ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
-+ ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd"])
- ]
-
- if __name__ == "__main__":
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,18 +1,37 @@
-diff -ru Ice-3.4.0.orig/cpp/config/Make.rules.Darwin Ice-3.4.0/cpp/config/Make.rules.Darwin
---- Ice-3.4.0.orig/cpp/config/Make.rules.Darwin 2010-02-25 07:55:41.000000000 -0800
-+++ Ice-3.4.0/cpp/config/Make.rules.Darwin 2010-05-18 10:43:17.000000000 -0700
-@@ -11,7 +11,7 @@
+Changes:
+
+1) Allow environment to set CXX.
+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
+@@ -11,17 +11,11 @@
# This file is included by Make.rules when uname is Darwin.
#
--CXX = c++
-+CXX ?= c++
+-CXX = xcrun clang++
++CXX ?= xcrun clang++
CXXFLAGS = -Wall -D_REENTRANT
-@@ -88,4 +88,4 @@
+ ifeq ($(OPTIMIZE),yes)
+- #
+- # By default we build binaries with both architectures when optimization is enabled.
+- #
+- ifeq ($(CXXARCHFLAGS),)
+- CXXARCHFLAGS := -arch i386 -arch x86_64
+- endif
+ CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS)
+ else
+ CXXFLAGS := $(CXXARCHFLAGS) -g $(CXXFLAGS)
+@@ -106,7 +100,7 @@
ICEUTIL_OS_LIBS = -lpthread
ICE_OS_LIBS = -ldl
-PLATFORM_HAS_READLINE := no
+PLATFORM_HAS_READLINE := yes
+
+ #
+ # QT is used only for the deprecated IceGrid and IceStorm SQL plugins
Modified: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.config.Make.rules.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,16 +1,18 @@
-diff -ru Ice-3.4.0.orig/cpp/config/Make.rules Ice-3.4.0/cpp/config/Make.rules
---- Ice-3.4.0.orig/cpp/config/Make.rules 2010-02-25 07:55:46.000000000 -0800
-+++ Ice-3.4.0/cpp/config/Make.rules 2010-05-18 10:43:54.000000000 -0700
-@@ -188,9 +188,9 @@
- ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
+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 @@
+ endif
ifneq ($(DB_HOME),)
-- DB_FLAGS = -I$(DB_HOME)/include
-- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
-- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
-+ DB_FLAGS = -I$(DB_HOME)/include/db46
-+ DB_LIBS = -L$(DB_HOME)/$(libsubdir)/db46 -ldb_cxx
-+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46)
+- 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)
+ endif
+- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
++ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46)
else
- ifeq ($(shell if [ -d /usr/include/db48 -a -d /usr/$(libsubdir)/db48 ] ; then echo yes; fi), yes)
- DB_FLAGS = -I/usr/include/db48
+ 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.demo.IceGrid.secure.README.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.README.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.README.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/README 2011-06-15 21:44:00.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/README 2012-03-04 19:55:44.000000000 +0100
-@@ -31,9 +31,10 @@
- the filesystem permissions to restrict access to the certificate.
-
- Once the certificates are generated, you can start the IceGrid
--registry, node, and Glacier2 router:
-+registries, node, and Glacier2 router:
-
--$ icegridregistry --Ice.Config=config.registry
-+$ icegridregistry --Ice.Config=config.master
-+$ icegridregistry --Ice.Config=config.slave
- $ icegridnode --Ice.Config=config.node
- $ glacier2router --Ice.Config=config.glacier2
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,13 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/application.xml 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/application.xml 2012-03-04 19:55:44.000000000 +0100
-@@ -20,8 +20,8 @@
- <property name="IceSSL.DefaultDir" value="certs"/>
-
- <property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
-- <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
-- <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
-+ <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
-+ <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
- </properties>
-
- <node name="Node">
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.admin 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.admin 2012-03-04 19:55:44.000000000 +0100
-@@ -14,7 +14,7 @@
- # SSL Configuration
- #
- IceSSL.DefaultDir=certs
--IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="Glacier2"
-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Glacier2"
-
- # C++ configuration
- Ice.Plugin.IceSSL.cpp=IceSSL:createIceSSL
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.client 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.client 2012-03-04 19:55:44.000000000 +0100
-@@ -1,7 +1,7 @@
- #
- # The IceGrid locator proxy.
- #
--Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061
-+Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061:tcp -p 14061
-
- #
- # Trace properties.
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,64 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
-@@ -0,0 +1,61 @@
-+#
-+# The IceGrid instance name.
-+#
-+IceGrid.InstanceName=DemoIceGrid
-+
-+#
-+# IceGrid registry configuration.
-+#
-+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
-+IceGrid.Registry.Server.Endpoints=ssl -t 10000
-+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
-+IceGrid.Registry.Data=db/master
-+
-+#
-+# Ensure that nodes and slaves connecting to this registry have a name
-+# matching the certificate CN.
-+#
-+IceGrid.Registry.RequireNodeCertCN=1
-+IceGrid.Registry.RequireReplicaCertCN=1
-+
-+#
-+# IceGrid admin clients must use a secure connection to connect to the
-+# registry or use Glacier2.
-+#
-+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
-+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-+
-+#
-+# IceGrid SQL configuration if using SQL database.
-+#
-+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
-+#IceGrid.SQL.DatabaseType=QSQLITE
-+#IceGrid.SQL.DatabaseName=db/master/Registry.db
-+
-+#
-+# Trace properties.
-+#
-+Ice.ProgramName=Master
-+IceGrid.Registry.Trace.Node=2
-+IceGrid.Registry.Trace.Replica=2
-+
-+#
-+# SSL Configuration
-+#
-+Ice.Plugin.IceSSL=IceSSL:createIceSSL
-+IceSSL.DefaultDir=certs
-+IceSSL.CertAuthFile=ca_cert.pem
-+IceSSL.CertFile=master_cert.pem
-+IceSSL.KeyFile=master_key.pem
-+
-+#
-+# Don't require certificates. This is useful for admin clients that don't
-+# use certificate but still need to establish a secure connection for the
-+# username/password authentication
-+#
-+IceSSL.VerifyPeer=1
-+
-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,19 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.node 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.node 2012-03-04 19:55:44.000000000 +0100
-@@ -1,7 +1,7 @@
- #
- # The IceGrid locator proxy.
- #
--Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
-+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
-
- #
- # IceGrid node configuration.
-@@ -26,5 +26,5 @@
- IceSSL.CertFile=node_cert.pem
- IceSSL.KeyFile=node_key.pem
-
--IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
--IceSSL.TrustOnly.Server=CN="IceGrid Registry"
-+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
-+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,57 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.registry 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.registry 2012-03-04 19:55:44.000000000 +0100
-@@ -1,54 +0,0 @@
--#
--# The IceGrid instance name.
--#
--IceGrid.InstanceName=DemoIceGrid
--
--#
--# IceGrid registry configuration.
--#
--IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
--IceGrid.Registry.Server.Endpoints=ssl -t 10000
--IceGrid.Registry.Internal.Endpoints=ssl -t 10000
--IceGrid.Registry.Data=db/registry
--
--#
--# IceGrid admin clients must use a secure connection to connect to the
--# registry or use Glacier2.
--#
--IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
--IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
--
--#
--# IceGrid SQL configuration if using SQL database.
--#
--#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
--#IceGrid.SQL.DatabaseType=QSQLITE
--#IceGrid.SQL.DatabaseName=db/registry/Registry.db
--
--#
--# Trace properties.
--#
--Ice.ProgramName=Registry
--IceGrid.Registry.Trace.Node=2
--IceGrid.Registry.Trace.Replica=2
--
--#
--# SSL Configuration
--#
--Ice.Plugin.IceSSL=IceSSL:createIceSSL
--IceSSL.DefaultDir=certs
--IceSSL.CertAuthFile=ca_cert.pem
--IceSSL.CertFile=registry_cert.pem
--IceSSL.KeyFile=registry_key.pem
--
--#
--# Don't require certificates. This is useful for admin clients that don't
--# use certificate but still need to establish a secure connection for the
--# username/password authentication
--#
--IceSSL.VerifyPeer=1
--
--IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
--IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
--IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
--IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,69 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
-@@ -0,0 +1,66 @@
-+#
-+# The IceGrid locator proxy.
-+#
-+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
-+
-+#
-+# The IceGrid instance name.
-+#
-+IceGrid.InstanceName=DemoIceGrid
-+
-+#
-+# IceGrid registry configuration.
-+#
-+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
-+IceGrid.Registry.Server.Endpoints=ssl -t 10000
-+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
-+IceGrid.Registry.Data=db/slave
-+IceGrid.Registry.ReplicaName=Slave
-+
-+#
-+# Ensure that nodes connecting to this registry have a name matching
-+# the certificate CN.
-+#
-+IceGrid.Registry.RequireNodeCertCN=1
-+
-+#
-+# IceGrid admin clients must use a secure connection to connect to the
-+# registry or use Glacier2.
-+#
-+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
-+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-+
-+#
-+# IceGrid SQL configuration if using SQL database.
-+#
-+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
-+#IceGrid.SQL.DatabaseType=QSQLITE
-+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
-+
-+#
-+# Trace properties.
-+#
-+Ice.ProgramName=Slave
-+IceGrid.Registry.Trace.Node=2
-+IceGrid.Registry.Trace.Replica=2
-+
-+#
-+# SSL Configuration
-+#
-+Ice.Plugin.IceSSL=IceSSL:createIceSSL
-+IceSSL.DefaultDir=certs
-+IceSSL.CertAuthFile=ca_cert.pem
-+IceSSL.CertFile=slave_cert.pem
-+IceSSL.KeyFile=slave_key.pem
-+
-+#
-+# Don't require certificates. This is useful for admin clients that don't
-+# use certificate but still need to establish a secure connection for the
-+# username/password authentication
-+#
-+IceSSL.VerifyPeer=1
-+
-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
-+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,14 +0,0 @@
---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/makecerts.py 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/makecerts.py 2012-03-04 19:55:44.000000000 +0100
-@@ -44,8 +44,9 @@
- print
- print
-
--createCertificate("registry", "IceGrid Registry")
--createCertificate("node", "IceGrid Node")
-+createCertificate("master", "Master")
-+createCertificate("slave", "Slave")
-+createCertificate("node", "Node")
- createCertificate("glacier2", "Glacier2")
- createCertificate("server", "Server")
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Freeze.Map.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Freeze.Map.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Freeze.Map.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Freeze/Map.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Freeze/Map.h 2012-03-04 20:14:52.000000000 +0100
-@@ -426,7 +426,7 @@
-
- ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) :
- _helper(IteratorHelper::create(mapHelper, true)),
-- _communicator(_communicator),
-+ _communicator(communicator),
- _refValid(false)
- {
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/ConnectionIF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/ConnectionIF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -17,13 +17,13 @@
- {
-
- class ConnectionI;
-+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
-
- }
-
- namespace IceInternal
- {
-
--ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
-
- enum AsyncStatus
- {
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/IncomingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/IncomingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -28,12 +28,6 @@
-
- class AMD_Object_ice_invoke;
- class AMD_Array_Object_ice_invoke;
--
--}
--
--namespace IceInternal
--{
--
- ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
- ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/LocalObjectF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/LocalObjectF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -18,12 +18,6 @@
- {
-
- class LocalObject;
--
--}
--
--namespace IceInternal
--{
--
- ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
-
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ObjectF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.ObjectF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ObjectF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,22 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/ObjectF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/ObjectF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -17,19 +17,8 @@
- {
-
- class Object;
--
--}
--
--namespace IceInternal
--{
--
- ICE_API IceUtil::Shared* upCast(::Ice::Object*);
-
--}
--
--namespace Ice
--{
--
- typedef IceInternal::Handle< Object > ObjectPtr;
-
- void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/OutgoingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/OutgoingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -19,13 +19,13 @@
-
- class AsyncResult;
- typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
-+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
-
- }
-
- namespace IceInternal
- {
-
--ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
-
- class OutgoingAsync;
- ICE_API IceUtil::Shared* upCast(OutgoingAsync*);
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Proxy.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.Proxy.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Proxy.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,56 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/Proxy.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/Proxy.h 2012-03-04 20:14:52.000000000 +0100
-@@ -38,6 +38,8 @@
-
- class Locator;
- class Router;
-+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
-+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
-
- }
-
-@@ -46,8 +48,6 @@
- namespace IceInternal
- {
-
--ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
--ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
-
- class LocalExceptionWrapper;
-
-@@ -1172,7 +1172,7 @@
-
- TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
- {
-- checkCallback(instance, cb || excb != 0);
-+ this->checkCallback(instance, cb || excb != 0);
- }
- };
-
-@@ -1188,7 +1188,7 @@
-
- TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
- {
-- checkCallback(instance, cb || excb != 0);
-+ this->checkCallback(instance, cb || excb != 0);
- }
- };
-
-@@ -1209,7 +1209,7 @@
- OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
- CallbackNC<T>(instance, excb, sentcb), response(cb)
- {
-- checkCallback(instance, cb != 0 || excb != 0);
-+ this->checkCallback(instance, cb != 0 || excb != 0);
- }
-
- virtual void __completed(const ::Ice::AsyncResultPtr& result) const
-@@ -1254,7 +1254,7 @@
- OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
- Callback<T, CT>(instance, excb, sentcb), response(cb)
- {
-- checkCallback(instance, cb != 0 || excb != 0);
-+ this->checkCallback(instance, cb != 0 || excb != 0);
- }
-
- virtual void __completed(const ::Ice::AsyncResultPtr& result) const
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ProxyF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.ProxyF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.ProxyF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,76 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/ProxyF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/ProxyF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -22,6 +22,11 @@
- {
-
- class Object;
-+inline ::IceProxy::Ice::Object*
-+upCast(::IceProxy::Ice::Object* o)
-+{
-+ return o;
-+}
-
- }
-
-@@ -34,6 +39,11 @@
- {
-
- class Object;
-+inline ::IceDelegate::Ice::Object*
-+upCast(::IceDelegate::Ice::Object* o)
-+{
-+ return o;
-+}
-
- }
-
-@@ -47,6 +57,12 @@
-
- class Object;
-
-+inline ::IceDelegateM::Ice::Object*
-+upCast(::IceDelegateM::Ice::Object* o)
-+{
-+ return o;
-+}
-+
- }
-
- }
-@@ -58,36 +74,12 @@
- {
-
- class Object;
--
--}
--
--}
--
--namespace IceInternal
--{
--
--inline ::IceProxy::Ice::Object*
--upCast(::IceProxy::Ice::Object* o)
--{
-- return o;
--}
--
--inline ::IceDelegate::Ice::Object*
--upCast(::IceDelegate::Ice::Object* o)
--{
-- return o;
--}
--
- inline ::IceDelegateD::Ice::Object*
- upCast(::IceDelegateD::Ice::Object* o)
- {
- return o;
- }
-
--inline ::IceDelegateM::Ice::Object*
--upCast(::IceDelegateM::Ice::Object* o)
--{
-- return o;
- }
-
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Stream.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.Stream.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.Stream.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,79 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/Stream.h 2012-03-04 20:14:52.000000000 +0100
-@@ -17,6 +17,12 @@
- #include <Ice/Proxy.h>
- #include <IceUtil/Shared.h>
-
-+namespace IceInternal
-+{
-+ // Forward declaration required for writer specializations.
-+ void delegateThrowMarshalException(const char*, int, const ::std::string&);
-+}
-+
- namespace Ice
- {
-
-@@ -45,9 +51,6 @@
- StreamTraitTypeUnknown
- };
-
--// Forward declaration required for writer specializations.
--class MarshalException;
--
- //
- // Base trait template. This doesn't actually do anything -- we just
- // use it as a template that we can specialize.
-@@ -542,7 +545,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Byte>(v));
- }
-@@ -558,7 +561,7 @@
- inS->read(val);
- if(val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
-@@ -573,7 +576,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Short>(v));
- }
-@@ -589,7 +592,7 @@
- inS->read(val);
- if(val < 0 || val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
-@@ -603,7 +606,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Int>(v));
- }
-@@ -619,7 +622,7 @@
- inS->read(val);
- if(val < 0 || val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.StreamF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.include.Ice.StreamF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.include.Ice.StreamF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/include/Ice/StreamF.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/include/Ice/StreamF.h 2012-03-04 20:14:52.000000000 +0100
-@@ -19,12 +19,6 @@
-
- class InputStream;
- class OutputStream;
--
--}
--
--namespace IceInternal
--{
--
- ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
- ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,18 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Glacier2/Blobject.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Glacier2/Blobject.cpp 2012-03-04 19:39:27.000000000 +0100
-@@ -171,6 +171,15 @@
- }
-
- void
-+Glacier2::Blobject::destroy()
-+{
-+ if(_requestQueue)
-+ {
-+ _requestQueue->destroy();
-+ }
-+}
-+
-+void
- Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB,
- const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams, const Current& current)
- {
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Glacier2/Blobject.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Glacier2/Blobject.h 2012-03-04 19:39:27.000000000 +0100
-@@ -24,6 +24,8 @@
- Blobject(const InstancePtr&, const Ice::ConnectionPtr&, const Ice::Context&);
- virtual ~Blobject();
-
-+ void destroy();
-+
- protected:
-
- void invoke(Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&,
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,74 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Glacier2/RequestQueue.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Glacier2/RequestQueue.cpp 2012-03-04 19:39:27.000000000 +0100
-@@ -185,7 +185,8 @@
- _callback(newCallback_Object_ice_invoke(this, &RequestQueue::response, &RequestQueue::exception,
- &RequestQueue::sent)),
- _flushCallback(newCallback_Connection_flushBatchRequests(this, &RequestQueue::exception, &RequestQueue::sent)),
-- _pendingSend(false)
-+ _pendingSend(false),
-+ _destroyed(false)
- {
- }
-
-@@ -241,6 +242,37 @@
- }
-
- void
-+Glacier2::RequestQueue::destroy()
-+{
-+ IceUtil::Mutex::Lock lock(*this);
-+
-+ _destroyed = true;
-+
-+ //
-+ // Although the session has been destroyed, we cannot destroy this queue
-+ // until all requests have completed.
-+ //
-+ if(_requests.empty())
-+ {
-+ destroyInternal();
-+ }
-+}
-+
-+void
-+Glacier2::RequestQueue::destroyInternal()
-+{
-+ //
-+ // Must be called with the mutex locked.
-+ //
-+
-+ //
-+ // Remove cyclic references.
-+ //
-+ const_cast<Ice::Callback_Object_ice_invokePtr&>(_callback) = 0;
-+ const_cast<Ice::Callback_Connection_flushBatchRequestsPtr&>(_flushCallback) = 0;
-+}
-+
-+void
- Glacier2::RequestQueue::flush()
- {
- assert(_connection);
-@@ -289,6 +321,11 @@
- _pendingSendRequest = 0;
- }
- }
-+
-+ if(_destroyed && _requests.empty())
-+ {
-+ destroyInternal();
-+ }
- }
-
- void
-@@ -312,6 +349,11 @@
- }
- }
- _requests.clear();
-+
-+ if(_destroyed)
-+ {
-+ destroyInternal();
-+ }
- }
-
- void
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,23 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Glacier2/RequestQueue.h 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Glacier2/RequestQueue.h 2012-03-04 19:39:27.000000000 +0100
-@@ -65,8 +65,12 @@
- bool addRequest(const RequestPtr&);
- void flushRequests(std::set<Ice::ObjectPrx>&);
-
-+ void destroy();
-+
- private:
-
-+ void destroyInternal();
-+
- void flush();
- void flush(std::set<Ice::ObjectPrx>&);
-
-@@ -83,6 +87,7 @@
- std::deque<RequestPtr> _requests;
- bool _pendingSend;
- RequestPtr _pendingSendRequest;
-+ bool _destroyed;
- };
- typedef IceUtil::Handle<RequestQueue> RequestQueuePtr;
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,15 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Glacier2/RouterI.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Glacier2/RouterI.cpp 2012-03-04 19:39:27.000000000 +0100
-@@ -98,6 +98,12 @@
- _session->destroy_async(amiCB);
- }
- }
-+
-+ _clientBlobject->destroy();
-+ if(_serverBlobject)
-+ {
-+ _serverBlobject->destroy();
-+ }
- }
-
- ObjectPrx
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,27 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/ConnectionI.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/ConnectionI.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -31,7 +31,7 @@
- using namespace Ice;
- using namespace IceInternal;
-
--Ice::LocalObject* IceInternal::upCast(ConnectionI* p) { return p; }
-+Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
-
- namespace
- {
-@@ -600,6 +600,7 @@
- }
- catch(const LocalException& ex)
- {
-+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
- setState(StateClosed, ex);
- assert(_exception.get());
- _exception->ice_throw();
-@@ -971,6 +972,7 @@
- }
- catch(const Ice::LocalException& ex)
- {
-+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
- setState(StateClosed, ex);
- assert(_exception.get());
- _exception->ice_throw();
Added: 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 (rev 0)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -0,0 +1,45 @@
+In addition looking for plugins named lib*, look for libZeroc* to
+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 @@
+
+ lib += ".dll";
+ #elif defined(__APPLE__)
++ // Look for libZeroc... to handle the MacPorts
++ // s/libIce/libZerocIce/ rename.
++ string libZeroc = lib;
+ lib += "lib" + libName;
++ libZeroc += "libZeroc" + libName;
+ if(!version.empty())
+ {
+ lib += "." + version;
++ libZeroc += "." + version;
+ }
+ #elif defined(__hpux)
+ lib += "lib" + libName;
+@@ -185,7 +190,10 @@
+ //
+ if(!load(lib + ".dylib"))
+ {
+- string errMsg = _err;
++ string errMsg = _err;
++ if(!load(libZeroc + ".dylib"))
++ {
++ errMsg += "; " + _err;
+ if(!load(lib + ".so"))
+ {
+ errMsg += "; " + _err;
+@@ -195,7 +203,8 @@
+ return 0;
+ }
+ }
+- _err = "";
++ }
++ _err = "";
+ }
+ #else
+ if(!load(lib))
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/IncomingAsync.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/IncomingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -24,7 +24,7 @@
- using namespace IceInternal;
-
- IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
--IceUtil::Shared* IceInternal::upCast(AMD_Object_ice_invoke* p) { return p; }
-+IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
-
- namespace
- {
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/LocalObject.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/LocalObject.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -13,7 +13,7 @@
- using namespace Ice;
- using namespace IceInternal;
-
--IceUtil::Shared* IceInternal::upCast(LocalObject* obj) { return obj; }
-+IceUtil::Shared* Ice::upCast(LocalObject* obj) { return obj; }
-
- bool
- Ice::LocalObject::operator==(const LocalObject& r) const
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Object.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.Object.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Object.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/Object.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/Object.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -19,7 +19,7 @@
- using namespace Ice;
- using namespace IceInternal;
-
--IceUtil::Shared* IceInternal::upCast(Object* p) { return p; }
-+IceUtil::Shared* Ice::upCast(Object* p) { return p; }
-
- bool
- Ice::Object::operator==(const Object& r) const
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/OutgoingAsync.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/OutgoingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
-@@ -30,7 +30,7 @@
- using namespace Ice;
- using namespace IceInternal;
-
--IceUtil::Shared* IceInternal::upCast(AsyncResult* p) { return p; }
-+IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
-
- IceUtil::Shared* IceInternal::upCast(OutgoingAsyncMessageCallback* p) { return p; }
- IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,20 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/PropertyNames.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/PropertyNames.cpp 2012-03-04 19:55:44.000000000 +0100
-@@ -8,7 +8,7 @@
- // **********************************************************************
-
- //
--// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
-+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
-
- // IMPORTANT: Do not edit this file -- any edits made here will be lost!
-
-@@ -335,6 +335,8 @@
- IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
- IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
- IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
-+ IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
-+ IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
- IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
- IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
- IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,10 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/ProxyFactory.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/ProxyFactory.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -229,6 +229,7 @@
- }
- else if(cnt > static_cast<int>(_retryIntervals.size()))
- {
-+ interval = 0; // apeace compiler
- if(traceLevels->retry >= 1)
- {
- Trace out(logger, traceLevels->retryCat);
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Stream.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.Stream.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.Stream.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,24 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Ice/Stream.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Ice/Stream.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -8,10 +8,19 @@
- // **********************************************************************
-
- #include <Ice/Stream.h>
-+#include <Ice/LocalException.h>
-
- using namespace std;
- using namespace Ice;
- using namespace IceInternal;
-
--IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
--IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
-+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
-+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
-+
-+namespace IceInternal
-+{
-+ void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
-+ {
-+ throw Ice::MarshalException(file, line, message);
-+ }
-+}
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,35 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/DescriptorHelper.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/DescriptorHelper.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -198,15 +198,6 @@
- return result;
- }
-
--template<typename Dict> Dict
--getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
--{
--#if defined(_MSC_VER) && (_MSC_VER < 1300)
-- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
--#else
-- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
--#endif
--}
-
- template<typename EqFunc, typename Dict> Dict
- getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq)
-@@ -223,6 +214,16 @@
- return result;
- }
-
-+template<typename Dict> Dict
-+getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
-+{
-+#if defined(_MSC_VER) && (_MSC_VER < 1300)
-+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
-+#else
-+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
-+#endif
-+}
-+
- template <typename Dict> Ice::StringSeq
- getDictRemovedElts(const Dict& ldict, const Dict& rdict)
- {
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,20 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/Internal.ice 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/Internal.ice 2012-03-04 19:55:44.000000000 +0100
-@@ -702,7 +702,7 @@
- *
- **/
- NodeSession* registerNode(InternalNodeInfo info, Node* prx, LoadInfo loadInf)
-- throws NodeActiveException;
-+ throws NodeActiveException, PermissionDeniedException;
-
- /**
- *
-@@ -721,7 +721,7 @@
- *
- **/
- ReplicaSession* registerReplica(InternalReplicaInfo info, InternalRegistry* prx)
-- throws ReplicaActiveException;
-+ throws ReplicaActiveException, PermissionDeniedException;
-
- /**
- *
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,136 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/InternalRegistryI.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/InternalRegistryI.cpp 2012-03-04 19:55:44.000000000 +0100
-@@ -19,6 +19,8 @@
- #include <IceGrid/ReplicaSessionI.h>
- #include <IceGrid/ReplicaSessionManager.h>
- #include <IceGrid/FileCache.h>
-+#include <IceSSL/IceSSL.h>
-+#include <IceSSL/RFC2253.h>
-
- using namespace std;
- using namespace IceGrid;
-@@ -38,6 +40,8 @@
- Ice::PropertiesPtr properties = database->getCommunicator()->getProperties();
- _nodeSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
- _replicaSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
-+ _requireNodeCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireNodeCertCN", 0);
-+ _requireReplicaCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireReplicaCertCN", 0);
- }
-
- InternalRegistryI::~InternalRegistryI()
-@@ -50,7 +54,56 @@
- const LoadInfo& load,
- const Ice::Current& current)
- {
-- const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
-+ const TraceLevelsPtr traceLevels = _database->getTraceLevels();
-+ const Ice::LoggerPtr logger = traceLevels->logger;
-+ if(!info || !node)
-+ {
-+ return 0;
-+ }
-+
-+ if(_requireNodeCertCN)
-+ {
-+ try
-+ {
-+ IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
-+ if(sslConnInfo)
-+ {
-+ if (sslConnInfo->certs.empty() ||
-+ !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
-+ {
-+ if(traceLevels->node > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->nodeCat);
-+ out << "certificate CN doesn't match node name `" << info->name << "'";
-+ }
-+ throw PermissionDeniedException("certificate CN doesn't match node name `" + info->name + "'");
-+ }
-+ }
-+ else
-+ {
-+ if(traceLevels->node > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->nodeCat);
-+ out << "node certificate for `" << info->name << "' is required to connect to this registry";
-+ }
-+ throw PermissionDeniedException("node certificate is required to connect to this registry");
-+ }
-+ }
-+ catch(const PermissionDeniedException& ex)
-+ {
-+ throw ex;
-+ }
-+ catch(const IceUtil::Exception&)
-+ {
-+ if(traceLevels->node > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->nodeCat);
-+ out << "unexpected exception while verifying certificate for node `" << info->name << "'";
-+ }
-+ throw PermissionDeniedException("unable to verify certificate for node `" + info->name + "'");
-+ }
-+ }
-+
- try
- {
- NodeSessionIPtr session = new NodeSessionI(_database, node, info, _nodeSessionTimeout, load);
-@@ -68,7 +121,56 @@
- const InternalRegistryPrx& prx,
- const Ice::Current& current)
- {
-- const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
-+ const TraceLevelsPtr traceLevels = _database->getTraceLevels();
-+ const Ice::LoggerPtr logger = traceLevels->logger;
-+ if(!info || !prx)
-+ {
-+ return 0;
-+ }
-+
-+ if(_requireReplicaCertCN)
-+ {
-+ try
-+ {
-+ IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
-+ if(sslConnInfo)
-+ {
-+ if (sslConnInfo->certs.empty() ||
-+ !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
-+ {
-+ if(traceLevels->replica > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->replicaCat);
-+ out << "certificate CN doesn't match replica name `" << info->name << "'";
-+ }
-+ throw PermissionDeniedException("certificate CN doesn't match replica name `" + info->name + "'");
-+ }
-+ }
-+ else
-+ {
-+ if(traceLevels->replica > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->replicaCat);
-+ out << "replica certificate for `" << info->name << "' is required to connect to this registry";
-+ }
-+ throw PermissionDeniedException("replica certificate is required to connect to this registry");
-+ }
-+ }
-+ catch(const PermissionDeniedException& ex)
-+ {
-+ throw ex;
-+ }
-+ catch(const IceUtil::Exception&)
-+ {
-+ if(traceLevels->replica > 0)
-+ {
-+ Ice::Trace out(logger, traceLevels->replicaCat);
-+ out << "unexpected exception while verifying certificate for replica `" << info->name << "'";
-+ }
-+ throw PermissionDeniedException("unable to verify certificate for replica `" + info->name + "'");
-+ }
-+ }
-+
- try
- {
- ReplicaSessionIPtr s = new ReplicaSessionI(_database, _wellKnownObjects, info, prx, _replicaSessionTimeout);
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/InternalRegistryI.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/InternalRegistryI.h 2012-03-04 19:55:44.000000000 +0100
-@@ -68,6 +68,8 @@
- ReplicaSessionManager& _session;
- int _nodeSessionTimeout;
- int _replicaSessionTimeout;
-+ bool _requireNodeCertCN;
-+ bool _requireReplicaCertCN;
- };
-
- };
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/NodeSessionManager.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/NodeSessionManager.cpp 2012-03-04 19:55:44.000000000 +0100
-@@ -110,6 +110,14 @@
- }
- exception.reset(ex.ice_clone());
- }
-+ catch(const PermissionDeniedException& ex)
-+ {
-+ if(traceLevels)
-+ {
-+ traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
-+ }
-+ exception.reset(ex.ice_clone());
-+ }
- catch(const Ice::Exception& ex)
- {
- exception.reset(ex.ice_clone());
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/ReplicaCache.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/ReplicaCache.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -40,7 +40,7 @@
- Lock sync(*this);
-
- ReplicaEntryPtr entry;
-- while(entry = getImpl(name))
-+ while((entry = getImpl(name)))
- {
- ReplicaSessionIPtr session = entry->getSession();
- if(session->isDestroyed())
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/ReplicaSessionManager.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/ReplicaSessionManager.cpp 2012-03-04 19:55:44.000000000 +0100
-@@ -500,6 +500,14 @@
- }
- exception.reset(ex.ice_clone());
- }
-+ catch(const PermissionDeniedException& ex)
-+ {
-+ if(_traceLevels)
-+ {
-+ _traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
-+ }
-+ exception.reset(ex.ice_clone());
-+ }
- catch(const Ice::Exception& ex)
- {
- exception.reset(ex.ice_clone());
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceGrid/SessionI.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceGrid/SessionI.h 2012-03-04 20:14:53.000000000 +0100
-@@ -35,7 +35,7 @@
- class SessionI;
- typedef IceUtil::Handle<SessionI> SessionIPtr;
-
--class BaseSessionI : virtual Ice::Object, public IceUtil::Mutex
-+class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
- {
- public:
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/Instance.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/Instance.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -38,7 +38,7 @@
- using namespace Ice;
- using namespace IceSSL;
-
--IceUtil::Shared* IceInternal::upCast(IceSSL::Instance* p) { return p; }
-+IceUtil::Shared* IceSSL::upCast(IceSSL::Instance* p) { return p; }
-
- namespace
- {
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/InstanceF.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/InstanceF.h 2012-03-04 20:14:53.000000000 +0100
-@@ -18,13 +18,13 @@
- {
-
- class Instance;
-+IceUtil::Shared* upCast(IceSSL::Instance*);
-
- }
-
- namespace IceInternal
- {
-
--IceUtil::Shared* upCast(IceSSL::Instance*);
-
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/TrustManager.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/TrustManager.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -20,7 +20,7 @@
- using namespace std;
- using namespace IceSSL;
-
--IceUtil::Shared* IceInternal::upCast(IceSSL::TrustManager* p) { return p; }
-+IceUtil::Shared* IceSSL::upCast(IceSSL::TrustManager* p) { return p; }
-
- TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
- _communicator(communicator)
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/TrustManagerF.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/TrustManagerF.h 2012-03-04 20:14:53.000000000 +0100
-@@ -18,13 +18,13 @@
- {
-
- class TrustManager;
-+IceUtil::Shared* upCast(IceSSL::TrustManager*);
-
- }
-
- namespace IceInternal
- {
-
--IceUtil::Shared* upCast(IceSSL::TrustManager*);
-
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/Util.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/Util.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -175,7 +175,7 @@
- return dh;
- }
-
--IceUtil::Shared* IceInternal::upCast(IceSSL::DHParams* p) { return p; }
-+IceUtil::Shared* IceSSL::upCast(IceSSL::DHParams* p) { return p; }
-
- IceSSL::DHParams::DHParams() :
- _dh512(0), _dh1024(0), _dh2048(0), _dh4096(0)
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,17 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceSSL/UtilF.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceSSL/UtilF.h 2012-03-04 20:14:53.000000000 +0100
-@@ -21,13 +21,13 @@
- {
-
- class DHParams;
-+IceUtil::Shared* upCast(IceSSL::DHParams*);
-
- }
-
- namespace IceInternal
- {
-
--IceUtil::Shared* upCast(IceSSL::DHParams*);
-
- }
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,49 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/IceUtil/CtrlCHandler.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/IceUtil/CtrlCHandler.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -219,29 +219,41 @@
- sigaddset(&ctrlCLikeSignals, SIGHUP);
- sigaddset(&ctrlCLikeSignals, SIGINT);
- sigaddset(&ctrlCLikeSignals, SIGTERM);
-- int rc = pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
-+#ifndef NDEBUG
-+ int rc =
-+#endif
-+ pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
- assert(rc == 0);
-
- // Joinable thread
-- rc = pthread_create(&_tid, 0, sigwaitThread, 0);
-+#ifndef NDEBUG
-+ rc =
-+#endif
-+ pthread_create(&_tid, 0, sigwaitThread, 0);
- assert(rc == 0);
- }
- }
-
- CtrlCHandler::~CtrlCHandler()
- {
-- int rc = pthread_cancel(_tid);
-+#ifndef NDEBUG
-+ int rc =
-+#endif
-+ pthread_cancel(_tid);
- assert(rc == 0);
- #if defined(__APPLE__)
- //
- // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
- // comment in sigwaitThread
- //
-- rc = pthread_kill(_tid, SIGTERM);
-+ pthread_kill(_tid, SIGTERM);
- //assert(rc == 0); For some reaosns, this assert is sometime triggered
- #endif
- void* status = 0;
-- rc = pthread_join(_tid, &status);
-+#ifndef NDEBUG
-+ rc =
-+#endif
-+ pthread_join(_tid, &status);
- assert(rc == 0);
- #if !defined(__APPLE__)
- assert(status == PTHREAD_CANCELED);
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,20 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/Slice/CPlusPlusUtil.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/Slice/CPlusPlusUtil.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -631,7 +631,7 @@
- string scope = fixKwd(cl->scope());
- if(marshal)
- {
-- out << nl << stream << deref << "write(::Ice::ObjectPtr(::IceInternal::upCast(" << fixedParam
-+ out << nl << stream << deref << "write(::Ice::ObjectPtr(" << scope << "upCast(" << fixedParam
- << ".get())));";
- }
- else
-@@ -649,7 +649,7 @@
- string scope = fixKwd(px->_class()->scope());
- if(marshal)
- {
-- out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceInternal::upCast(" << fixedParam
-+ out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceProxy" << scope << "upCast(" << fixedParam
- << ".get())));";
- }
- else
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,111 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/slice2cpp/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/slice2cpp/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -1944,8 +1944,10 @@
- }
-
- string name = fixKwd(p->name());
-+ string scoped = fixKwd(p->scoped());
-
- H << sp << nl << "class " << name << ';';
-+ H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
- }
-
- Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c, const string& dllExport) :
-@@ -3691,10 +3693,22 @@
- Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
- {
- string name = fixKwd(p->name());
-+ string scoped = fixKwd(p->scoped());
-
- H << sp << nl << "class " << name << ';';
- H << nl << "bool operator==(const " << name << "&, const " << name << "&);";
- H << nl << "bool operator<(const " << name << "&, const " << name << "&);";
-+
-+ H << sp;
-+
-+ if(!p->isLocal())
-+ {
-+ H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
-+ }
-+ else
-+ {
-+ H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
-+ }
- }
-
- void
-@@ -4922,13 +4936,13 @@
- {
- if((BuiltinPtr::dynamicCast(p) && BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject)
- || ClassDeclPtr::dynamicCast(p))
-- {
-- C << nl << "if(" << prefix << name << ')';
-+ { C << nl << "if(" << prefix << name << ')';
- C << sb;
- ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
- if(decl)
- {
-- C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__addObject(_c);";
-+ string scope = fixKwd(decl->scope());
-+ C << nl << scope << "upCast(" << prefix << name << ".get())->__addObject(_c);";
- }
- else
- {
-@@ -4991,9 +5005,10 @@
- ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
- if(decl)
- {
-- C << nl << "if(" << "::IceInternal::upCast(" << prefix << name << ".get())->__usesClasses())";
-+ string scope = fixKwd(decl->scope());
-+ C << nl << "if(" << scope << "upCast(" << prefix << name << ".get())->__usesClasses())";
- C << sb;
-- C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__decRefUnsafe();";
-+ C << nl << scope << "upCast(" << prefix << name << ".get())->__decRefUnsafe();";
- C << nl << prefix << name << ".__clearHandleUnsafe();";
-
- }
-@@ -5629,40 +5644,30 @@
- {
- string scoped = fixKwd(p->scoped());
-
-- H << sp;
--
-- if(!p->isLocal())
-- {
-- H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
-- H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
-- }
-- else
-- {
-- H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
-- }
- }
-
- bool
- Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p)
- {
- string scoped = fixKwd(p->scoped());
-+ string scope = fixKwd(p->scope());
-
- C << sp;
- if(!p->isLocal())
- {
- C << nl
- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-- << "::Ice::Object* IceInternal::upCast(" << scoped << "* p) { return p; }";
-+ << "::Ice::Object* " << scope << "upCast(" << scoped << "* p) { return p; }";
- C << nl
- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-- << "::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy" << scoped
-+ << "::IceProxy::Ice::Object* IceProxy" << scope << "upCast(::IceProxy" << scoped
- << "* p) { return p; }";
- }
- else
- {
- C << nl
- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-- << "::Ice::LocalObject* IceInternal::upCast(" << scoped << "* p) { return p; }";
-+ << "::Ice::LocalObject* " << scope << "upCast(" << scoped << "* p) { return p; }";
- }
-
- return true;
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,28 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/slice2cs/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/slice2cs/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -1281,7 +1281,7 @@
- {
- _out << value << "F";
- }
-- else if(ep = EnumPtr::dynamicCast(type))
-+ else if((ep = EnumPtr::dynamicCast(type)))
- {
- string enumName = fixId(ep->scoped());
- string::size_type colon = value.rfind(':');
-@@ -3914,16 +3914,6 @@
- ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
- string name = fixId(p->name(), DotNet::ICloneable, true);
- vector<string> params = getParams(p);
-- bool hasOutParams = false;
-- ParamDeclList paramList = p->parameters();
-- for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
-- {
-- if((*pli)->isOutParam())
-- {
-- hasOutParams = true;
-- break;
-- }
-- }
-
- _out << sp;
-
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,20 +0,0 @@
---- Ice-3.4.2.orig/cpp/src/slice2java/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/src/slice2java/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -1246,7 +1246,7 @@
- {
- BuiltinPtr bp;
- EnumPtr ep;
-- if(bp = BuiltinPtr::dynamicCast(type))
-+ if((bp = BuiltinPtr::dynamicCast(type)))
- {
- switch(bp->kind())
- {
-@@ -1349,7 +1349,7 @@
- }
-
- }
-- else if(ep = EnumPtr::dynamicCast(type))
-+ else if((ep = EnumPtr::dynamicCast(type)))
- {
- string val = value;
- string::size_type pos = val.rfind(':');
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,43 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/Glacier2/ssl/Server.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Glacier2/ssl/Server.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -31,9 +31,15 @@
- test(ctx["_con.type"] == "ssl");
- test(ctx["_con.localPort"] == "12348");
- }
-- test(ctx["_con.localAddress"] == "127.0.0.1");
-+ if (!inFreeBSDJail())
-+ {
-+ test(ctx["_con.localAddress"] == "127.0.0.1");
-+ }
- test(ctx["_con.remotePort"] != "");
-- test(ctx["_con.remoteAddress"] == "127.0.0.1");
-+ if (!inFreeBSDJail())
-+ {
-+ test(ctx["_con.remoteAddress"] == "127.0.0.1");
-+ }
- }
-
- }
-@@ -99,7 +105,7 @@
- }
-
- virtual void
-- ice_ping(const Ice::Current& current)
-+ ice_ping(const Ice::Current& current) const
- {
- testContext(_ssl, current.ctx);
- }
-@@ -133,8 +139,11 @@
- {
- testContext(true, current.ctx);
-
-- test(info.remoteHost == "127.0.0.1");
-- test(info.localHost == "127.0.0.1");
-+ if (!inFreeBSDJail())
-+ {
-+ test(info.remoteHost == "127.0.0.1");
-+ test(info.localHost == "127.0.0.1");
-+ }
- test(info.localPort == 12348);
-
- try
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,11 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/Ice/background/EndpointI.h 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Ice/background/EndpointI.h 2012-03-04 20:14:53.000000000 +0100
-@@ -48,7 +48,7 @@
-
- virtual Ice::Int hashInit() const;
- #if !defined(_MSC_VER) || _MSC_VER > 1300
-- using IceInternal::EndpointI::connectors;
-+ using ::IceInternal::EndpointI::connectors;
- #endif
-
- private:
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,32 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/Ice/custom/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Ice/custom/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -1384,7 +1384,8 @@
- const ::Test::ClassStructSeq& seq,
- const InParamPtr& cookie)
- {
-- pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in = getIn(in, cookie);
-+ pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in;
-+ in = getIn(in, cookie);
- test(ret == in.first);
- test(cs1 == in.first);
- test(seq == in.second);
-@@ -1432,7 +1433,8 @@
-
- void throwExcept1(const Ice::AsyncResultPtr& result)
- {
-- wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
-+ wstring in;
-+ in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
- try
- {
- Test1::WstringClassPrx t = Test1::WstringClassPrx::uncheckedCast(result->getProxy());
-@@ -1451,7 +1453,8 @@
-
- void throwExcept2(const Ice::AsyncResultPtr& result)
- {
-- wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
-+ wstring in;
-+ in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
- try
- {
- Test2::WstringClassPrx t = Test2::WstringClassPrx::uncheckedCast(result->getProxy());
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.properties.run.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.test.Ice.properties.run.py.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Ice.properties.run.py.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,18 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/Ice/properties/run.py 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Ice/properties/run.py 2012-03-04 20:14:53.000000000 +0100
-@@ -26,7 +26,7 @@
- #
- # Write config
- #
--configPath = u"./config/中国_client.config"
-+configPath = u"./config/中国_client.config".encode("utf-8")
-
- TestUtil.createConfig(configPath,
- ["# Automatically generated by Ice test driver.",
-@@ -38,4 +38,4 @@
- TestUtil.simpleTest(client)
-
- if os.path.exists(configPath):
-- os.remove(configPath)
-\ No newline at end of file
-+ os.remove(configPath)
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,20 +0,0 @@
---- Ice-3.4.2.orig/cpp/test/Slice/keyword/Client.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ Ice-3.4.2/cpp/test/Slice/keyword/Client.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -73,6 +73,9 @@
- virtual void ice_response(Ice::Int) {}
- virtual void ice_exception(const ::Ice::Exception&) {}
- };
-+
-+template<typename T>
-+void unused(T const &) { }
-
- //
- // This section of the test is present to ensure that the C++ types
-@@ -86,6 +89,7 @@
-
- _cpp_and::_cpp_auto b;
- b._cpp_default = 0;
-+ unused(b);
-
- _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
- c->_cpp_else = "";
Deleted: trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.scripts.TestUtil.py.diff 2012-12-14 04:44:10 UTC (rev 100484)
+++ trunk/dports/devel/zeroc-ice35/files/patch-ice.scripts.TestUtil.py.diff 2012-12-14 05:57:58 UTC (rev 100487)
@@ -1,44 +0,0 @@
---- Ice-3.4.2.orig/scripts/TestUtil.py 2011-06-15 21:44:00.000000000 +0200
-+++ Ice-3.4.2/scripts/TestUtil.py 2012-03-04 20:14:53.000000000 +0100
-@@ -74,6 +74,25 @@
- def isLinux():
- return sys.platform.startswith("linux")
-
-+def isFreeBSD():
-+ return sys.platform.startswith("freebsd")
-+
-+def sysctl(key):
-+ p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
-+ try:
-+ result = p.communicate()[0].strip().split()[1]
-+ except IndexError:
-+ return 0
-+ if sys.version_info >= (3,):
-+ result = str(result, sys.stdout.encoding)
-+ try:
-+ return int(result)
-+ except ValueError:
-+ return result
-+
-+def isFreeBSDJail():
-+ return isFreeBSD() and sysctl("security.jail.jailed")
-+
- def getCppCompiler():
- compiler = ""
- if os.environ.get("CPP_COMPILER", "") != "":
-@@ -1590,7 +1609,15 @@
- if isDarwin() and "nodarwin" in config:
- print "%s*** test not supported under Darwin%s" % (prefix, suffix)
- continue
-+
-+ if isFreeBSD() and "nofreebsd" in config:
-+ print "%s*** test not supported under FreeBSD%s" % (prefix, suffix)
-+ continue
-
-+ if isFreeBSDJail() and "nofreebsdjail" in config:
-+ print "%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix)
-+ continue
-+
- if not isWin32() and "win32only" in config:
- print "%s*** test only supported under Win32%s" % (prefix, suffix)
- continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121213/a297b4af/attachment-0001.html>
More information about the macports-changes
mailing list