Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0

PR:		201143
Differential Revision:	https://reviews.freebsd.org/D2930
Reviewed by:	bapt
Approved by:	bapt
Tested by:	Roger Leigh <rleigh@codelibre.net>

53 files changed, 1171 insertions, 979 deletions

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index d8a3a6d5f93f..f84d2197675b 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=		Ice
-PORTVERSION=		3.5.1
-PORTREVISION=		7
+PORTVERSION=		3.6.0
 CATEGORIES=		devel
-MASTER_SITES=		http://download.zeroc.com/Ice/3.5/
 
 MAINTAINER=		freebsd@grem.de
 COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
@@ -24,10 +22,9 @@ LIB_DEPENDS+=		libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
-OPTIONS_DEFINE?=	DEBUG DEMOS DOCS TESTS
-OPTIONS_DEFAULT?=	DEMOS TESTS
+OPTIONS_DEFINE?=	DEBUG TESTS
+OPTIONS_DEFAULT?=	TESTS
 TESTS_DESC?=		Build and run tests (requires lang/python)
-DEMOS_DESC?=		Build demos
 
 .include <bsd.port.options.mk>
 
@@ -35,29 +32,30 @@ USES+=			iconv gmake
 
 .if ${PORT_OPTIONS:MTESTS} && ${SLAVE_PORT} == "no"
 USES+=			python:build
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib
 .endif
 
+WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
+
 USE_BDB=		yes
 WANT_BDB_VER=		5
 INVALID_BDB_VER=	40 41 42 43 44 46 47 48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
+USE_GITHUB=		yes
+GH_ACCOUNT=		zeroc-ice
+GH_TAGNAME=		v3.6.0
+
 
 CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+=		-g
-.else
-CFLAGS+=		-DNDEBUG
-.endif
 
-.if ${ARCH} == "ia64"
-BROKEN=			does not compile on ia64
+.if !${PORT_OPTIONS:MDEBUG}
+CFLAGS+=		-DNDEBUG
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=			fails to link
-.endif
+BROKEN_ia64=		Does not compile on ${ARCH}
+BROKEN_sparc64=		Does not compile on ${ARCH}
 
 .if ((${ARCH} != i386) && (${ARCH} != powerpc))
 MAKE_ENV+=		LP64=yes
@@ -67,12 +65,8 @@ MAKE_ENV+=		LP64=yes
 MAKE_ENV+=		NOTESTS=yes
 .endif
 
-.if !${PORT_OPTIONS:MDEMOS}
-MAKE_ENV+=		NODEMOS=yes
-.endif
-
-.if !${PORT_OPTIONS:MDOCS}
-MAKE_ENV+=		NOICEDOCS=yes
+.if ${SLAVE_PORT} == "no"
+MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH
 .endif
 
 .include <bsd.port.pre.mk>
@@ -117,21 +111,26 @@ post-patch:
 		${WRKSRC}/cpp/config/Make.rules
 	@${REINPLACE_CMD} '/install_configdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
-	@${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \
-		${WRKSRC}/cpp/src/ca/Makefile
 	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; ' \
 		${WRKSRC}/config/Make.common.rules
 	@${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%ICONV_LIB%%|${ICONV_LIB}|g; \
+		s|%%PYTHON_CMD%%|${PYTHON_CMD}|g; \
 		s|%%PYTHON_SITELIBDIR%%|${STAGEDIR}${PYSITEDIR}|g; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/python/config/Make.rules
 	@${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php
+.if empty(ICONV_LIB)
+	# native iconv detected
+	@${REINPLACE_CMD} \
+		-e 's|<iconv.h>|</usr/include/iconv.h>|g;' \
+		${WRKSRC}/cpp/include/IceUtil/IconvStringConverter.h
+.endif
 
 .if ${PORT_OPTIONS:MTESTS}
 TEST_CMD=		@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
@@ -141,4 +140,9 @@ check regression-test test: build
 pre-install: regression-test
 .endif
 
+.if ${SLAVE_PORT} == "no"
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/ice/distinfo b/devel/ice/distinfo
index cd6ab1290a48..a76eb1549b00 100644
--- a/devel/ice/distinfo
+++ b/devel/ice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Ice-3.5.1.tar.gz) = 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-SIZE (Ice-3.5.1.tar.gz) = 4799296
+SHA256 (zeroc-ice-Ice-3.6.0-v3.6.0_GH0.tar.gz) = 77933580cdc7fade0ebfce517935819e9eef5fc6b9e3f4143b07404daf54e25e
+SIZE (zeroc-ice-Ice-3.6.0-v3.6.0_GH0.tar.gz) = 5300956
diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD
index ab9b61f69399..16d76071633a 100644
--- a/devel/ice/files/Make.rules.FreeBSD
+++ b/devel/ice/files/Make.rules.FreeBSD
@@ -3,12 +3,12 @@ mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4
 BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%%
 LIBS			= -lIce $(BASELIBS) 
 
-ICEUTIL_OS_LIBS         = -pthread
+CRYPT_OS_LIBS		= -lcrypt
+ICEUTIL_OS_LIBS		= -pthread -lcrypto
 
 PLATFORM_HAS_READLINE   := yes
 
-export LD_LIBRARY_PATH	:= $(libdir):$(LD_LIBRARY_PATH)
-
+cpp11libdirsuffix	=
 lp64suffix		=
 create_runpath_symlink	= no
 prefix			= %%PREFIX%%
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules
index 8dd6eb5c8451..e2ea0e9aa60f 100644
--- a/devel/ice/files/patch-config-Make.common.rules
+++ b/devel/ice/files/patch-config-Make.common.rules
@@ -1,18 +1,40 @@
---- config.orig/Make.common.rules	2013-05-20 22:21:58.666286011 +0000
-+++ config/Make.common.rules	2013-05-20 22:20:50.897196090 +0000
-@@ -19,7 +19,7 @@
- SHORT_VERSION           = 3.4
- SOVERSION		= 34
+--- config/Make.common.rules.orig	2015-06-23 15:30:20.000000000 +0000
++++ config/Make.common.rules	2015-06-27 23:55:59.468049240 +0000
+@@ -19,7 +19,8 @@
+ SHORT_VERSION   = 3.6
+ SOVERSION	= 36
  
--INSTALL			= cp -fp
-+INSTALL			= %%INSTALL_PROGRAM%%
- INSTALL_PROGRAM		= ${INSTALL}
- INSTALL_LIBRARY		= ${INSTALL}
- INSTALL_DATA		= ${INSTALL}
-@@ -386,11 +386,15 @@
- 	then \
- 	    echo "Creating $(DESTDIR)$(install_slicedir)..." ; \
- 	    $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
+-INSTALL		= cp -fp
++override DESTDIR	=
++INSTALL		= %%INSTALL_PROGRAM%%
+ INSTALL_PROGRAM	= ${INSTALL}
+ INSTALL_LIBRARY	= ${INSTALL}
+ INSTALL_DATA	= ${INSTALL}
+@@ -49,13 +50,13 @@
+ #
+ # usr_dir_install means we want to install with a /usr style layout.
+ #
+-ifeq ($(prefix), /usr)
+-    usr_dir_install = 1
+-endif
+-
+-ifeq ($(prefix), /usr/local)
+-    usr_dir_install = 1
+-endif
++#ifeq ($(prefix), /usr)
++#    usr_dir_install = 1
++#endif
++#
++#ifeq ($(prefix), /usr/local)
++#    usr_dir_install = 1
++#endif
+ 
+ #
+ # A /usr style layout can be forced by setting USR_DIR_INSTALL=yes.
+@@ -461,20 +463,24 @@
+ 	    then \
+ 		    ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \
+ 	    fi ; \
 +	fi
 +
 +	@if test -d $(DESTDIR)$(install_slicedir) ; \
@@ -26,20 +48,16 @@
 -	    fi
 +	fi
  
-@@ -410,12 +410,12 @@
-     fi
- 
- 
--	@if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \
-+	@if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \
+-	@if test ! -f $(DESTDIR)$(install_docdir)/ICE_LICENSE$(TEXT_EXTENSION) ; \
++	@if test ! -f $(DESTDIR)$(install_slicedir)/ICE_LICENSE$(TEXT_EXTENSION) ; \
  	then \
--		$(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
-+		$(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
+-	    $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \
++	    $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
  	fi
  
--	@if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
-+	@if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
+-	@if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \
++	@if test ! -f $(DESTDIR)$(install_slicedir)/LICENSE$(TEXT_EXTENSION) ; \
  	then \
--		$(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
-+		$(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
+-	    $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \
++	    $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
  	fi
diff --git a/devel/ice/files/patch-cpp-Makefile b/devel/ice/files/patch-cpp-Makefile
index 4857584e8327..d361a1d8898d 100644
--- a/devel/ice/files/patch-cpp-Makefile
+++ b/devel/ice/files/patch-cpp-Makefile
@@ -1,26 +1,13 @@
---- cpp.orig/Makefile	2013-03-11 15:19:46.000000000 +0000
-+++ cpp/Makefile	2013-05-19 22:06:57.713280491 +0000
-@@ -11,11 +11,22 @@
+--- cpp/Makefile.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/Makefile	2015-06-27 09:35:22.892599446 +0000
+@@ -13,8 +13,8 @@
  
- include $(top_srcdir)/config/Make.rules
+ SUBDIRS		= config src include
  
--SUBDIRS		= config src include test
-+SUBDIRS		= config src include
-+
+-ifneq ($(MAKECMDGOALS),install)
+-    SUBDIRS		:= $(SUBDIRS) test
 +ifeq ($(NOTESTS),)
-+SUBDIRS		:= $(SUBDIRS) test
-+endif
- 
- ifeq ($(shell uname | grep MINGW),)
-+ifeq ($(NODEMOS),)
- SUBDIRS		:= $(SUBDIRS) demo
++	SUBDIRS		:= $(SUBDIRS) test
  endif
-+endif
-+
-+ifeq ($(NOICEDOCS),)
-+SUBDIRS		:= $(SUBDIRS) doc
-+endif
-+
- 
- INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
  
+ INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \
diff --git a/devel/ice/files/patch-cpp-allTests.py b/devel/ice/files/patch-cpp-allTests.py
index 2b9a4cbf333a..eec93b1523d5 100644
--- a/devel/ice/files/patch-cpp-allTests.py
+++ b/devel/ice/files/patch-cpp-allTests.py
@@ -1,6 +1,6 @@
---- cpp.orig/allTests.py	2013-03-11 15:19:58.000000000 +0000
-+++ cpp/allTests.py	2013-05-19 22:25:00.000000000 +0000
-@@ -62,7 +63,7 @@
+--- cpp/allTests.py.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/allTests.py	2015-06-27 22:16:43.703450842 +0000
+@@ -66,7 +66,7 @@
      ("Ice/servantLocator", ["core"]),
      ("Ice/interceptor", ["core"]),
      ("Ice/stringConverter", ["core"]),
@@ -8,17 +8,22 @@
 +    ("Ice/udp", ["core", "nofreebsdjail"]),
      ("Ice/defaultServant", ["core"]),
      ("Ice/defaultValue", ["core"]),
-     ("Ice/invoke", ["core", "novc6"]),
-@@ -85,7 +85,7 @@
-     ("IceStorm/federation2", ["service", "novc90", "nomingw"]),
-     ("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # Too slow with appverifier.
-     ("IceStorm/rep1", ["service", "novc90", "nomingw"]),
--    ("IceStorm/repgrid", ["service", "novc90", "nomingw"]),
-+    ("IceStorm/repgrid", ["service", "novc90", "nomingw", "nofreebsd"]),
-     ("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]),
-     ("FreezeScript/dbmap", ["once", "novc90", "nomingw"]),
-     ("FreezeScript/evictor", ["once", "novc90", "nomingw"]),
-@@ -106,8 +107,8 @@
+     ("Ice/invoke", ["core"]),
+@@ -90,11 +90,11 @@
+     ("IceStorm/federation2", ["service", "novc100", "nomingw"]),
+     ("IceStorm/stress", ["service", "stress", "novc100", "nomingw"]), # Too slow with appverifier.
+     ("IceStorm/rep1", ["service", "novc100", "nomingw"]),
+-    ("IceStorm/repgrid", ["service", "novc100", "nomingw"]),
++    ("IceStorm/repgrid", ["service", "novc100", "nomingw", "nofreebsd"]),
+     ("IceStorm/repstress", ["service", "noipv6", "stress", "novc100", "nomingw"]),
+     ("FreezeScript/dbmap", ["once", "novc100", "nomingw"]),
+     ("FreezeScript/evictor", ["once", "novc100", "nomingw"]),
+-    ("IceDiscovery/simple", ["service"]),
++    ("IceDiscovery/simple", ["service", "nofreebsdjail"]),
+     ("IceGrid/simple", ["service", "novc100", "nomingw"]),
+     ("IceGrid/fileLock", ["service", "novc100", "nomingw"]),
+     ("IceGrid/deployer", ["service", "novc100", "nomingw"]),
+@@ -123,8 +123,8 @@
  #
  if TestUtil.isWin32() or os.getuid() == 0:
      tests += [
diff --git a/devel/ice/files/patch-cpp-config-Make.rules b/devel/ice/files/patch-cpp-config-Make.rules
index 85f52f5ddfa5..c847920962dc 100644
--- a/devel/ice/files/patch-cpp-config-Make.rules
+++ b/devel/ice/files/patch-cpp-config-Make.rules
@@ -1,13 +1,13 @@
---- cpp.orig/config/Make.rules	Fri Mar 11 16:19:00 2013
-+++ cpp/config/Make.rules	Fri May 19 22:00:09 2013
-@@ -233,7 +233,9 @@
-           DB_FLAGS          = -I/usr/local/include/db53
-           DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
-       else
--        DB_LIBS      = -ldb_cxx
-+        DB_FLAGS          = -I%%BDB_INCLUDE_DIR%%
-+        DB_LIBS           = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
-+        DB_RPATH_LINK     = $(call rpathlink,%%BDB_LIB_DIR%%)
-       endif
+--- cpp/config/Make.rules.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/config/Make.rules	2015-06-27 10:26:42.692387147 +0000
+@@ -240,7 +240,9 @@
+ 	    DB_FLAGS          = -I/usr/local/include/db53
+ 	    DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
+ 	else
+-	    DB_LIBS      = -ldb_cxx
++	    DB_FLAGS          = -I%%BDB_INCLUDE_DIR%%
++	    DB_LIBS           = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
++	    DB_RPATH_LINK     = $(call rpathlink,%%BDB_LIB_DIR%%)
+ 	endif
     endif
  endif
diff --git a/devel/ice/files/patch-cpp-include-Ice-Basicstream.h b/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
deleted file mode 100644
index e9832fe1132e..000000000000
--- a/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- cpp/include/Ice/BasicStream.h.orig	2014-11-04 18:12:19.183757485 +0100
-+++ cpp/include/Ice/BasicStream.h	2014-11-04 18:13:37.223886887 +0100
-@@ -964,7 +964,7 @@
- 
-         struct InstanceData
-         {
--            InstanceData(InstanceData* previous) : previous(previous), next(0)
-+            InstanceData(InstanceData* prev) : previous(prev), next(0)
-             {
-                 if(previous)
-                 {
-@@ -1123,7 +1123,7 @@
- 
-         struct InstanceData
-         {
--            InstanceData(InstanceData* previous) : previous(previous), next(0)
-+            InstanceData(InstanceData* prev) : previous(prev), next(0)
-             {
-                 if(previous)
-                 {
diff --git a/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h b/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
new file mode 100644
index 000000000000..e3211f25aa2f
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
@@ -0,0 +1,59 @@
+--- cpp/include/Ice/FactoryTableInit.h.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/include/Ice/FactoryTableInit.h	2015-06-27 14:51:48.188288621 +0000
+@@ -48,6 +55,9 @@
+     
+     DefaultUserExceptionFactoryInit(const char* typeId) :
+         _typeId(typeId)
++#if defined(ICE_BROKEN_ATEXIT)
++        , _ftableInit(new IceInternal::FactoryTableInit)
++#endif
+     {
+         factoryTable->addExceptionFactory(_typeId, new DefaultUserExceptionFactory<E>(_typeId));
+     }
+@@ -55,10 +65,16 @@
+     ~DefaultUserExceptionFactoryInit()
+     {
+         factoryTable->removeExceptionFactory(_typeId);
++#if defined(ICE_BROKEN_ATEXIT)
++        delete _ftableInit;
++#endif
+     }
+     
+ private:
+     const ::std::string _typeId;
++#if defined(ICE_BROKEN_ATEXIT)
++    IceInternal::FactoryTableInit* _ftableInit;
++#endif
+ };
+ 
+ template<class O>
+@@ -67,7 +83,10 @@
+ public:
+     
+     DefaultObjectFactoryInit(const char* typeId) :
+-        _typeId(typeId)
++        _typeId(typeId)
++#if defined(ICE_BROKEN_ATEXIT)
++        , _ftableInit(new IceInternal::FactoryTableInit)
++#endif
+     {
+         factoryTable->addObjectFactory(_typeId, new DefaultObjectFactory<O>(_typeId));
+     }
+@@ -75,11 +94,16 @@
+     ~DefaultObjectFactoryInit()
+     {
+         factoryTable->removeObjectFactory(_typeId);
++#if defined(ICE_BROKEN_ATEXIT)
++        delete _ftableInit;
++#endif
+     }
+     
+ private:
+     const ::std::string _typeId;
+- 
++#if defined(ICE_BROKEN_ATEXIT)
++    IceInternal::FactoryTableInit* _ftableInit;
++#endif
+ };
+ 
+ }
diff --git a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
deleted file mode 100644
index 24c48afad880..000000000000
--- a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/Ice/IconvStringConverter.h.orig	2013-10-04 15:48:14 UTC
-+++ cpp/include/Ice/IconvStringConverter.h
-@@ -20,7 +20,7 @@
- #include <langinfo.h>
- #endif
- 
--#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
-+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
-     //
-     // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
-     //
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Config.h b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
new file mode 100644
index 000000000000..79047cf87788
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
@@ -0,0 +1,19 @@
+--- cpp/include/IceUtil/Config.h.orig	2015-06-27 15:37:32.688102665 +0000
++++ cpp/include/IceUtil/Config.h	2015-06-27 15:37:34.926179135 +0000
+@@ -49,6 +49,16 @@
+ #endif
+ 
+ //
++// FreeBSD 10.0-RELEASE had a broken atexit handler
++// (affects the order of static destruction)
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#   if __FreeBSD_version < 1000700
++#   define ICE_BROKEN_ATEXIT = 1
++#   endif
++#endif
++
++//
+ // Check for C++ 11 support
+ //
+ // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h b/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
new file mode 100644
index 000000000000..e3f45c54716a
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
@@ -0,0 +1,11 @@
+--- cpp/include/IceUtil/ScannerConfig.h.orig	2015-06-27 11:31:57.336119105 +0000
++++ cpp/include/IceUtil/ScannerConfig.h	2015-06-27 11:42:15.630073945 +0000
+@@ -29,7 +29,7 @@
+ // Clang++ >= 5.1  deprecate 'register' storage class specifier
+ // used by lex generated Scanners.
+ //
+-#if defined(__clang__)
++#if defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 4
+ #   pragma clang diagnostic ignored "-Wdeprecated-register"
+ #endif
+ 
diff --git a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
new file mode 100644
index 000000000000..c9b023c3d26a
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
@@ -0,0 +1,64 @@
+--- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp	2015-06-27 17:04:09.625743300 +0000
+@@ -17,6 +17,8 @@
+ 
+ #if defined(__GLIBC__)
+ #   include <crypt.h>
++#elif defined(__FreeBSD__)
++#   include <unistd.h>
+ #elif defined(__APPLE__)
+ #   include <CoreFoundation/CoreFoundation.h>
+ #   include <Security/Security.h>
+@@ -33,6 +35,28 @@
+ namespace
+ {
+ 
++#if defined(__FreeBSD__)
++IceUtil::Mutex* _staticMutex = 0;
++
++class Init
++{
++public:
++
++    Init()
++    {
++        _staticMutex = new IceUtil::Mutex;
++    }
++
++    ~Init()
++    {
++        delete _staticMutex;
++        _staticMutex = 0;
++    }
++};
++
++Init init;
++#endif
++
+ class CryptPermissionsVerifierI : public PermissionsVerifier
+ {
+ public:
+@@ -140,7 +164,7 @@
+     {
+         return false;
+     }
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+     size_t i = p->second.rfind('$');
+     string salt;
+     if(i == string::npos)
+@@ -162,9 +186,14 @@
+             return false;
+         }
+     }
++#   if defined(__GLIBC__)
+     struct crypt_data data;
+     data.initialized = 0;
+     return p->second == crypt_r(password.c_str(), salt.c_str(), &data);
++#   else
++    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
++    return p->second == crypt(password.c_str(), salt.c_str());
++#   endif
+ #elif defined(__APPLE__) || defined(_WIN32)    
+     //
+     // Pbkdf2 string format:
diff --git a/devel/ice/files/patch-cpp-src-Ice-.depend b/devel/ice/files/patch-cpp-src-Ice-.depend
deleted file mode 100644
index 1269827d8d61..000000000000
--- a/devel/ice/files/patch-cpp-src-Ice-.depend
+++ /dev/null
@@ -1,8 +0,0 @@
---- cpp.orig/src/Ice/.depend	2013-05-21 00:29:56.146194325 +0000
-+++ cpp/src/Ice/.depend	2013-05-21 00:42:56.956197313 +0000
-@@ -1,5 +1,5 @@
--Acceptor$(OBJEXT): Acceptor.cpp ../Ice/Acceptor.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h ../Ice/AcceptorF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h ../Ice/TransceiverF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.h $(includedir)/Ice/EndpointTypes.h
-+Acceptor$(OBJEXT): Acceptor.cpp ../Ice/Acceptor.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h ../Ice/AcceptorF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h ../Ice/TransceiverF.h ../Ice/Network.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.h $(includedir)/Ice/EndpointTypes.h
- Application$(OBJEXT): Application.cpp $(includedir)/Ice/Application.h $(includedir)/Ice/Ice.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/ProxyF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/InstrumentationF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/FactoryTable.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Version.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/UniquePtr.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/ObjectFactoryManagerF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Instrumentation.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/SlicedData.h $(includedir)/Ice/Process.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/PropertiesAdmin.h $(includedir)/Ice/Metrics.h $(includedir)/Ice/Service.h $(includedir)/Ice/IconvStringConverter.h ../Ice/LoggerI.h $(includedir)/IceUtil/FileUtil.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/ArgVector.h ../Ice/GC.h
- Base64$(OBJEXT): Base64.cpp ../Ice/Base64.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Config.h
- Buffer$(OBJEXT): Buffer.cpp $(includedir)/Ice/Buffer.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/ProxyF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/ProxyHandle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/Identity.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Version.h $(includedir)/Ice/BuiltinSequences.h
diff --git a/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp b/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp
new file mode 100644
index 000000000000..e8507767608a
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp
@@ -0,0 +1,11 @@
+--- cpp/src/Ice/StreamSocket.cpp.orig	2015-07-03 16:22:19.091609986 +0200
++++ cpp/src/Ice/StreamSocket.cpp	2015-07-03 16:22:32.355937985 +0200
+@@ -32,7 +32,7 @@
+ #ifndef ICE_USE_IOCP
+     if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
+     {
+-        _state = StateConnected;
++        _state = _proxy ? StateProxyWrite : StateConnected;
+     }
+ #endif
+     _desc = fdToString(_fd, _proxy, _addr);
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.cpp b/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.cpp
deleted file mode 100644
index a0d8aba5a8b3..000000000000
--- a/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
---- cpp/src/IceGrid/AdapterCache.cpp.orig	2013-03-11 15:19:47.000000000 +0000
-+++ cpp/src/IceGrid/AdapterCache.cpp	2014-09-08 14:21:13.335195726 +0000
-@@ -202,8 +202,12 @@ AdapterCache::addServerAdapter(const AdapterDescriptor& desc, const ServerEntryP
-         ReplicaGroupEntryPtr repEntry = ReplicaGroupEntryPtr::dynamicCast(getImpl(desc.replicaGroupId));
-         if(!repEntry)
-         {
--            Ice::Error out(_communicator->getLogger());
--            out << "can't add adapter `" << desc.id << "' to unknown replica group `" << desc.replicaGroupId << "'";
-+            //
-+            // Add an un-assigned replica group, the replica group will in theory be added
-+            // shortly after when its application is loaded.
-+            //
-+            repEntry = new ReplicaGroupEntry(*this, desc.replicaGroupId, "", new RandomLoadBalancingPolicy("0"));
-+            addImpl(desc.replicaGroupId, repEntry);
-         }
-         repEntry->addReplica(desc.id, entry);
-     }
-@@ -213,13 +217,24 @@ void
- AdapterCache::addReplicaGroup(const ReplicaGroupDescriptor& desc, const string& app)
- {
-     Lock sync(*this);
--    if(getImpl(desc.id))
-+    ReplicaGroupEntryPtr repEntry = ReplicaGroupEntryPtr::dynamicCast(getImpl(desc.id));
-+    if(repEntry)
-     {
--        Ice::Error out(_communicator->getLogger());
--        out << "can't add duplicate replica group `" << desc.id << "'";
-+        //
-+        // If the replica group isn't assigned to an application,
-+        // assign it. Otherwise, it's a duplicate so we log an error.
-+        //
-+        if(repEntry->getApplication().empty())
-+        {
-+            repEntry->update(app, desc.loadBalancing);
-+        }
-+        else
-+        {
-+            Ice::Error out(_communicator->getLogger());
-+            out << "can't add duplicate replica group `" << desc.id << "'";
-+        }
-         return;
-     }
--
-     addImpl(desc.id, new ReplicaGroupEntry(*this, desc.id, app, desc.loadBalancing));
- }
- 
-@@ -258,7 +273,16 @@ AdapterCache::removeServerAdapter(const string& id)
-             Ice::Error out(_communicator->getLogger());
-             out << "can't remove adapter `" << id << "' from unknown replica group `" << replicaGroupId << "'";
-         }
--        repEntry->removeReplica(id);
-+        else
-+        {
-+            //
-+            // If the replica group is empty and it's not assigned, remove it.
-+            //
-+            if(repEntry->removeReplica(id))
-+            {
-+                removeImpl(replicaGroupId);
-+            }
-+        }
-     }
- }
- 
-@@ -440,7 +464,7 @@ ReplicaGroupEntry::ReplicaGroupEntry(AdapterCache& cache,
-     _lastReplica(0),
-     _requestInProgress(false)
- {
--    update(policy);
-+    update(application, policy);
- }
- 
- bool
-@@ -502,7 +526,7 @@ ReplicaGroupEntry::addReplica(const string& /*replicaId*/, const ServerAdapterEn
-     _replicas.push_back(adapter);
- }
- 
--void
-+bool
- ReplicaGroupEntry::removeReplica(const string& replicaId)
- {
-     Lock sync(*this);
-@@ -516,14 +540,18 @@ ReplicaGroupEntry::removeReplica(const string& replicaId)
-             break;
-         }
-     }
-+
-+    // Replica group can be removed if not assigned to an application and there's no more replicas
-+    return _replicas.empty() && _application.empty();
- }
- 
- void
--ReplicaGroupEntry::update(const LoadBalancingPolicyPtr& policy)
-+ReplicaGroupEntry::update(const string& application, const LoadBalancingPolicyPtr& policy)
- {
-     Lock sync(*this);
-     assert(policy);
- 
-+    _application = application;
-     _loadBalancing = policy;
- 
-     istringstream is(_loadBalancing->nReplicas);
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h b/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h
deleted file mode 100644
index 1892a09f4682..000000000000
--- a/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- cpp/src/IceGrid/AdapterCache.h.orig	2013-03-11 15:19:47.000000000 +0000
-+++ cpp/src/IceGrid/AdapterCache.h	2014-09-08 14:21:13.335195726 +0000
-@@ -62,7 +62,7 @@ protected:
- 
-     AdapterCache& _cache;
-     const std::string _id;
--    const std::string _application;
-+    std::string _application;
- };
- typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr;
- 
-@@ -105,9 +105,9 @@ public:
-     virtual AdapterPrx getProxy(const std::string&, bool) const { return 0; }
- 
-     void addReplica(const std::string&, const ServerAdapterEntryPtr&);
--    void removeReplica(const std::string&);
-+    bool removeReplica(const std::string&);
- 
--    void update(const LoadBalancingPolicyPtr&);
-+    void update(const std::string&, const LoadBalancingPolicyPtr&);
-     bool hasAdaptersFromOtherApplications() const;
- 
- private:
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-Database.cpp b/devel/ice/files/patch-cpp-src-IceGrid-Database.cpp
deleted file mode 100644
index 5b59405740fd..000000000000
--- a/devel/ice/files/patch-cpp-src-IceGrid-Database.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/src/IceGrid/Database.cpp.orig	2013-03-11 15:19:47.000000000 +0000
-+++ cpp/src/IceGrid/Database.cpp	2014-09-08 14:21:13.335195726 +0000
-@@ -2088,7 +2088,7 @@ Database::reload(const ApplicationHelper& oldApp,
-         {
-             ReplicaGroupEntryPtr entry = ReplicaGroupEntryPtr::dynamicCast(_adapterCache.get(r->id));
-             assert(entry);
--            entry->update(r->loadBalancing);
-+            entry->update(application, r->loadBalancing);
-         }
-         catch(const AdapterNotExistException&)
-         {
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
new file mode 100644
index 000000000000..fa3ead836a70
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
@@ -0,0 +1,23 @@
+--- cpp/src/IceGrid/PluginFacadeI.cpp.orig	2015-07-03 17:38:27.734242982 +0200
++++ cpp/src/IceGrid/PluginFacadeI.cpp	2015-07-03 17:42:42.990740982 +0200
+@@ -34,10 +34,16 @@
+         IceGrid::setRegistryPluginFacade(new RegistryPluginFacadeI);
+     }
+ 
+-    ~Init()
+-    {
+-        IceGrid::setRegistryPluginFacade(0);
+-    }
++/*	This is a bad idea, see
++ *	https://isocpp.org/wiki/faq/ctors#construct-on-first-use-v2
++ *  That's why we disabled it and make sure the registrypluginfacace
++ *  is reset somwhere else. Construction is still here, so that
++ *  registry plugins work as expected.
++ *  ~Init()
++ *   {
++ *       IceGrid::setRegistryPluginFacade(0);
++ *   }
++ */
+ };
+ 
+ Init init;
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
new file mode 100644
index 000000000000..4b23cd594964
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
@@ -0,0 +1,24 @@
+--- cpp/src/IceGrid/RegistryI.cpp.orig	2015-07-03 17:43:25.231459982 +0200
++++ cpp/src/IceGrid/RegistryI.cpp	2015-07-03 17:46:57.991198982 +0200
+@@ -48,6 +48,13 @@
+ using namespace Ice;
+ using namespace IceGrid;
+ 
++namespace IceGrid
++{
++
++ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
++
++}
++
+ namespace
+ {
+ 
+@@ -159,6 +166,7 @@
+ 
+ RegistryI::~RegistryI()
+ {
++    IceGrid::setRegistryPluginFacade(0);
+ }
+ 
+ bool
diff --git a/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp b/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
deleted file mode 100644
index 882245e5bfea..000000000000
--- a/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- cpp.orig/src/slice2cpp/Gen.cpp	2013-03-11 15:19:46.000000000 +0000
-+++ cpp/src/slice2cpp/Gen.cpp	2013-05-20 19:51:48.109197053 +0000
-@@ -756,10 +756,11 @@
- 
-         C << sp << nl << "class " << factoryName << "__Init";
-         C << sb;
-+        C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
-         C.dec();
-         C << nl << "public:";
-         C.inc();
--        C << sp << nl << factoryName << "__Init()";
-+        C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
-         C << sb;
-         C << nl << "::IceInternal::factoryTable->addExceptionFactory(\"" << p->scoped() << "\", new "
-           << factoryName << ");";
-@@ -767,6 +768,7 @@
-         C << sp << nl << "~" << factoryName << "__Init()";
-         C << sb;
-         C << nl << "::IceInternal::factoryTable->removeExceptionFactory(\"" << p->scoped() << "\");";
-+        C << nl << "delete _ftableinit;";
-         C << eb;
-         C << eb << ';';
- 
-@@ -3976,10 +3978,11 @@
-             C << sp;
-             C << nl << "class " << factoryName << "__Init";
-             C << sb;
-+            C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
-             C.dec();
-             C << nl << "public:";
-             C.inc();
--            C << sp << nl << factoryName << "__Init()";
-+            C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
-             C << sb;
-             if(!p->isAbstract())
-             {
-@@ -4002,6 +4005,7 @@
-             {
-                 C << nl << "::IceInternal::factoryTable->removeTypeId(" << p->compactId() << ");";
-             }
-+            C << nl << "delete _ftableinit;";
-             C << eb;
-             C << eb << ';';
- 
diff --git a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py b/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
deleted file mode 100644
index f3a00fbb3848..000000000000
--- a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- cpp.orig/test/Glacier2/staticFiltering/run.py	2013-10-04 17:48:14.000000000 +0200
-+++ cpp/test/Glacier2/staticFiltering/run.py	2014-08-27 10:17:57.233098328 +0200
-@@ -8,7 +8,7 @@
- #
- # **********************************************************************
- 
--import os, sys, time, socket
-+import os, sys, time, socket, subprocess
- 
- path = [ ".", "..", "../..", "../../..", "../../../.." ]
- head = os.path.dirname(sys.argv[0])
-@@ -100,6 +100,12 @@
-     fqdn = ""
-     domainname = ""
- 
-+print "Network and process debug output:"
-+subprocess.call(["/sbin/ifconfig", "-a"])
-+subprocess.call(["/sbin/sysctl", "-a"])
-+subprocess.call(["/bin/ps", "-alxww"])
-+subprocess.call(["/usr/bin/sockstat"])
-+subprocess.call(["/usr/bin/netstat", "-an"])
- testcases = [
-         ('testing category filter',
-                 ('', '', '', 'foo "a cat with spaces"', '', ''),
diff --git a/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
index acf603f2ed8d..a361893586eb 100644
--- a/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
@@ -1,31 +1,20 @@
---- cpp.orig/test/Ice/info/AllTests.cpp	2011-06-15 21:43:59.000000000 +0200
-+++ cpp/test/Ice/info/AllTests.cpp	2012-03-04 20:14:53.000000000 +0100
-@@ -141,9 +141,11 @@
+--- cpp.orig/test/Ice/info/AllTests.cpp	2015-01-23 12:42:09.819774063 +0000
++++ cpp/test/Ice/info/AllTests.cpp	2015-01-23 12:42:59.341774435 +0000
+@@ -157,7 +157,7 @@
          test(info->adapterName.empty());
          test(info->localPort > 0);
          test(info->remotePort == 12010);
--        test(info->remoteAddress == defaultHost);
--        test(info->localAddress == defaultHost);
--
-+        if (!inFreeBSDJail())
-+        {
-+            test(info->remoteAddress == defaultHost);
-+            test(info->localAddress == defaultHost);
-+        }
-         ostringstream os;
- 
-         Ice::Context ctx = testIntf->getConnectionInfoAsContext();
-@@ -163,8 +165,11 @@
+-        if(defaultHost == "127.0.0.1")
++        if(defaultHost == "127.0.0.1" && !inFreeBSDJail())
+         {
+             test(info->remoteAddress == defaultHost);
+             test(info->localAddress == defaultHost);
+@@ -182,7 +182,7 @@
          test(info->adapterName.empty());
          test(info->localPort > 0);
          test(info->remotePort == 12010);
--        test(info->remoteAddress ==defaultHost);
--        test(info->localAddress == defaultHost);
-+        if (!inFreeBSDJail())
-+        {
-+            test(info->remoteAddress == defaultHost);
-+            test(info->localAddress == defaultHost);
-+        }
-     }
-     cout << "ok" << endl;
- 
+-        if(defaultHost == "127.0.0.1")
++        if(defaultHost == "127.0.0.1" && !inFreeBSDJail())
+         {
+             test(info->remoteAddress == defaultHost);
+             test(info->localAddress == defaultHost);
diff --git a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
index 7da26e749dfb..5a81f47eb21c 100644
--- a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
@@ -1,32 +1,50 @@
---- cpp.orig/test/Ice/metrics/AllTests.cpp	2013-03-11 15:19:47.000000000 +0000
-+++ cpp/test/Ice/metrics/AllTests.cpp	2013-05-20 02:11:00.939194168 +0000
-@@ -597,9 +597,12 @@
-     testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
--    testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
-+    if (!inFreeBSDJail())
-+    {
-+      testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
-+      testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
-+    }
-     //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
--    testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
-@@ -814,9 +817,12 @@
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
--    testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
-+    if (!inFreeBSDJail())
-+    {
-+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
-+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
-+    }
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
--    testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
-     //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);
+--- cpp/test/Ice/metrics/AllTests.cpp.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/test/Ice/metrics/AllTests.cpp	2015-06-27 19:16:18.877197646 +0000
+@@ -639,9 +639,12 @@
+         testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
+-        testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
++        if (!inFreeBSDJail())
++        {
++            testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
++            testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
++        }
+         //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
+-        testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
+@@ -726,7 +729,7 @@
+         bool dnsException = false;
+         try
+         {
+-            communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownfoo.zeroc.com")->ice_ping();
++            communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownhost9999.example.org")->ice_ping();
+             test(false);
+         }
+         catch(const Ice::DNSException&)
+@@ -739,7 +742,7 @@
+         }
+         test(clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"].size() == 2);
+         m1 = clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"][1];
+-        test(m1->id == "tcp -h unknownfoo.zeroc.com -p 12010 -t 500" && m1->total == 2 &&
++        test(m1->id == "tcp -h unknownhost9999.example.org -p 12010 -t 500" && m1->total == 2 &&
+              (!dnsException || m1->failures == 2));
+         if(dnsException)
+         {
+@@ -871,9 +874,12 @@
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
+-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
++        if (!inFreeBSDJail())
++        {
++            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
++            testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
++        }
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
+-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
+         //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py b/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
new file mode 100644
index 000000000000..5ad69760f28f
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
@@ -0,0 +1,21 @@
+--- cpp/test/IceGrid/admin/run.py.orig	2015-07-03 19:05:40.084004978 +0200
++++ cpp/test/IceGrid/admin/run.py	2015-07-03 19:19:36.550643978 +0200
+@@ -20,11 +20,14 @@
+ sys.path.append(os.path.join(path[0], "scripts"))
+ import TestUtil, IceGridAdmin
+ 
++dbdir = os.path.join(os.getcwd(), "db")
++
+ if not TestUtil.isWin32() and os.getuid() == 0:
+-    sys.stdout.write("\n")
+-    sys.stdout.write("*** can't run test as root ***\n")
+-    sys.stdout.write("\n")
+-    sys.exit(0)
++    for root, dirs, files in os.walk(dbdir):
++        os.chown(os.path.join(dbdir, root), 65534, 65534)
++        for f in files:
++            os.chown(os.path.join(dbdir, root, f), 65534, 65534)
++    os.setuid(65534)
+ 
+ testdir = os.getcwd();
+ 
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
new file mode 100644
index 000000000000..f30051f81dbc
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
@@ -0,0 +1,190 @@
+--- cpp/test/IceGrid/deployer/AllTests.cpp.orig	2015-07-04 13:12:57.306420997 +0200
++++ cpp/test/IceGrid/deployer/AllTests.cpp	2015-07-04 13:13:30.146599997 +0200
+@@ -126,21 +126,21 @@
+         //
+         // Test with empty file.
+         //
+-        string path = testDir + "/log1.txt";
++        string path = testDir + "/db/log1.txt";
+         ofstream os(path.c_str());
+         os.close();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", -1);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 0);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 100);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 100);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+@@ -156,29 +156,29 @@
+         //
+         // Test with log file with one line with no EOL on last line.
+         //
+-        string path = testDir + "/log2.txt";
++        string path = testDir + "/db/log2.txt";
+         ofstream os(path.c_str());
+         os << "one line file with no EOL on last line";
+         os.close();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log2.txt", -1);
++        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", -1);
+         test(it->read(1024, lines) && lines.size() == 1);
+         test(lines[0] == "one line file with no EOL on last line");
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 0);
++        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 0);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+         
+-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 1);
++        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 1);
+         test(it->read(1024, lines) && lines.size() == 1);
+         test(lines[0] == "one line file with no EOL on last line");
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 100);
++        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 100);
+         test(it->read(1024, lines) && lines.size() == 1);
+         test(lines[0] == "one line file with no EOL on last line");
+         test(it->read(1024, lines) && lines.empty());
+@@ -195,37 +195,37 @@
+         //
+         // Test with log file with one line with EOL on last line.
+         // 
+-        string path = testDir + "/log3.txt";
++        string path = testDir + "/db/log3.txt";
+         ofstream os(path.c_str());
+         os << "one line file with EOL on last line" << endl;
+         os.close();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log3.txt", -1);
++        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", -1);
+         test(it->read(1024, lines) && lines.size() == 2);
+         test(lines[0] == "one line file with EOL on last line");
+         test(lines[1].empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 0);
++        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 0);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+         
+-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 1);
++        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 1);
+         test(it->read(1024, lines) && lines.size() == 2);
+         test(lines[0] == "one line file with EOL on last line");
+         test(lines[1].empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 100);
++        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 100);
+         test(it->read(1024, lines) && lines.size() == 2);
+         test(lines[0] == "one line file with EOL on last line");
+         test(lines[1].empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 2);
++        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 2);
+         test(it->read(1024, lines) && lines.size() == 2);
+         test(lines[0] == "one line file with EOL on last line");
+         test(lines[1].empty());
+@@ -242,14 +242,14 @@
+         //
+         // Test with log file with multiple lines
+         //
+-        string path = testDir + "/log4.txt";
++        string path = testDir + "/db/log4.txt";
+         ofstream os(path.c_str());
+         os << "line 1" << endl;
+         os << "line 2" << endl;
+         os << "line 3" << endl;
+         os.close();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log4.txt", -1);
++        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", -1);
+         test(it->read(1024, lines) && lines.size() == 4);
+         test(lines[0] == "line 1");
+         test(lines[1] == "line 2");
+@@ -258,25 +258,25 @@
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 0);
++        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 0);
+         test(it->read(1024, lines) && lines.empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+         
+-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 1);
++        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 1);
+         test(it->read(1024, lines) && lines.size() == 2);
+         test(lines[0] == "line 3");
+         test(lines[1].empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 2);
++        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 2);
+         test(it->read(1024, lines) && lines.size() == 3);
+         test(lines[0] == "line 2");
+         test(lines[1] == "line 3");
+         test(lines[2].empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 100);
++        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 100);
+         test(it->read(1024, lines) && lines.size() == 4);
+         test(lines[0] == "line 1");
+         test(lines[1] == "line 2");
+@@ -292,11 +292,11 @@
+ 
+     try
+     {
+-        string path = testDir + "/log1.txt";
++        string path = testDir + "/db/log1.txt";
+         ofstream os(path.c_str(), ios_base::out | ios_base::trunc);
+         os << flush;
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", -1);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1);
+         test(it->read(1024, lines) && lines.empty());
+ 
+         os << "started a line" << flush;
+@@ -347,18 +347,18 @@
+ 
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 0);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0);
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+ 
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 1);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 1);
+         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0]));
+         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0]));
+         test(it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && lines[1].empty());
+         test(it->read(1024, lines) && lines.empty());
+         it->destroy();
+         
+-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 2);
++        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 2);
+         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0]));
+         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0]));
+         test(!it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && isLongLineStart(lines[1]));
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile b/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
new file mode 100644
index 000000000000..be56bc005ca5
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
@@ -0,0 +1,9 @@
+--- cpp/test/IceGrid/deployer/Makefile.orig	2015-07-04 13:29:31.867378996 +0200
++++ cpp/test/IceGrid/deployer/Makefile	2015-07-04 13:29:39.896414996 +0200
+@@ -53,5 +53,5 @@
+ 	$(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), $(DB_RPATH_LINK) -lFreeze $(LINKWITH))
+ 
+ clean::
+-	-rm -f build.txt log1.txt log2.txt log3.txt log4.txt
++	-rm -f build.txt db/log1.txt db/log2.txt db/log3.txt db/log4.txt
+ 	-rm -rf db/node db/registry db/replica-*
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml b/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
new file mode 100644
index 000000000000..58582e10d732
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
@@ -0,0 +1,17 @@
+--- cpp/test/IceGrid/deployer/application.xml.orig	2015-07-04 13:28:10.449020996 +0200
++++ cpp/test/IceGrid/deployer/application.xml	2015-07-04 13:28:22.486946996 +0200
+@@ -178,10 +178,10 @@
+   	  <object identity="${server}" type="::Test"/>
+         </adapter>
+ 
+-        <log path="${test.dir}/log1.txt"/>
+-        <log path="${test.dir}/log2.txt"/>
+-        <log path="${test.dir}/log3.txt"/>
+-        <log path="${test.dir}/log4.txt"/>
++        <log path="${test.dir}/db/log1.txt"/>
++        <log path="${test.dir}/db/log2.txt"/>
++        <log path="${test.dir}/db/log3.txt"/>
++        <log path="${test.dir}/db/log4.txt"/>
+         <env>MY_ENV_VARIABLE=12</env>
+         <env>MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO</env>
+         <env>MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO%</env>
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
new file mode 100644
index 000000000000..3573bd1b8e01
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
@@ -0,0 +1,20 @@
+--- cpp/test/IceGrid/distribution/AllTests.cpp.orig	2015-07-04 13:40:02.746382995 +0200
++++ cpp/test/IceGrid/distribution/AllTests.cpp	2015-07-04 13:40:20.588960995 +0200
+@@ -123,7 +123,7 @@
+     {
+         ApplicationUpdateDescriptor update;
+         update.name = "Test";
+-        update.variables["icepatch.directory"] = "${test.dir}/data/updated";
++        update.variables["icepatch.directory"] = "${test.dir}/db/data/updated";
+         admin->updateApplication(update);
+         
+         admin->startServer("Test.IcePatch2");
+@@ -212,7 +212,7 @@
+         ApplicationDescriptor app = admin->getApplicationInfo("Test").descriptor;
+         admin->removeApplication("Test");
+         
+-        app.variables["icepatch.directory"] = "${test.dir}/data/original";
++        app.variables["icepatch.directory"] = "${test.dir}/db/data/original";
+         test(app.nodes["localnode"].servers[2]->id == "server-dir1");
+         app.nodes["localnode"].servers[2]->applicationDistrib = false;
+         
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml b/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
new file mode 100644
index 000000000000..c49341debb8f
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
@@ -0,0 +1,11 @@
+--- cpp/test/IceGrid/distribution/application.xml.orig	2015-07-04 13:40:31.916391995 +0200
++++ cpp/test/IceGrid/distribution/application.xml	2015-07-04 13:40:54.916616995 +0200
+@@ -1,7 +1,7 @@
+ <icegrid>
+ 
+   <application name="Test">
+-    <variable name="icepatch.directory" value="${test.dir}/data/original"/>
++    <variable name="icepatch.directory" value="${test.dir}/db/data/original"/>
+ 
+     <server-template id="IcePatch2">
+ 
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py b/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
new file mode 100644
index 000000000000..176aa0ce5e2c
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
@@ -0,0 +1,11 @@
+--- cpp/test/IceGrid/distribution/run.py.orig	2015-07-04 13:42:32.436390995 +0200
++++ cpp/test/IceGrid/distribution/run.py	2015-07-04 13:42:42.506606995 +0200
+@@ -25,7 +25,7 @@
+     commandProc = TestUtil.spawn('"%s" "%s"' % (icePatch2Calc, os.path.join(datadir, dirname)))
+     commandProc.waitTestSuccess()
+ 
+-datadir = os.path.join(os.getcwd(), "data")
++datadir = os.path.join(os.getcwd(), "db/data")
+  
+ files = [ 
+   [ "original/rootfile", "rootfile" ],
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-session-run.py b/devel/ice/files/patch-cpp-test-IceGrid-session-run.py
new file mode 100644
index 000000000000..7146c9f3d719
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-session-run.py
@@ -0,0 +1,21 @@
+--- cpp/test/IceGrid/session/run.py.orig	2015-07-03 19:05:11.680636978 +0200
++++ cpp/test/IceGrid/session/run.py	2015-07-03 19:18:59.590608978 +0200
+@@ -20,11 +20,14 @@
+ sys.path.append(os.path.join(path[0], "scripts"))
+ import TestUtil, IceGridAdmin
+ 
++dbdir = os.path.join(os.getcwd(), "db")
++
+ if not TestUtil.isWin32() and os.getuid() == 0:
+-    sys.stdout.write("\n")
+-    sys.stdout.write("*** can't run test as root ***\n")
+-    sys.stdout.write("\n")
+-    sys.exit(0)
++    for root, dirs, files in os.walk(dbdir):
++        os.chown(os.path.join(dbdir, root), 65534, 65534)
++        for f in files:
++            os.chown(os.path.join(dbdir, root, f), 65534, 65534)
++    os.setuid(65534)
+ 
+ name = os.path.join("IceGrid", "session")
+ 
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp
new file mode 100644
index 000000000000..4c4219787f29
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp
@@ -0,0 +1,57 @@
+--- cpp/test/IceGrid/simple/AllTests.cpp.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/test/IceGrid/simple/AllTests.cpp	2015-06-27 16:05:16.492987125 +0000
+@@ -49,6 +49,7 @@
+     cout << "ok" << endl;
+ 
+     cout << "testing discovery... " << flush;
++    bool discoveryOk = true;
+     {
+         // Add test well-known object
+         IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
+@@ -77,15 +78,22 @@
+         initData.properties->setProperty("AdapterForDiscoveryTest.Endpoints", "default");
+ 
+         Ice::CommunicatorPtr com = Ice::initialize(initData);
+-        test(com->getDefaultLocator());
+-        com->stringToProxy("test @ TestAdapter")->ice_ping();
+-        com->stringToProxy("test")->ice_ping();
+ 
+-        test(com->getDefaultLocator()->getRegistry());
+-        test(IceGrid::LocatorPrx::checkedCast(com->getDefaultLocator()));
+-        test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalRegistry());
+-        test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalQuery());
++        try
++        {
++            test(com->getDefaultLocator());
++            com->stringToProxy("test @ TestAdapter")->ice_ping();
++            com->stringToProxy("test")->ice_ping();
+ 
++            test(com->getDefaultLocator()->getRegistry());
++            test(IceGrid::LocatorPrx::checkedCast(com->getDefaultLocator()));
++            test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalRegistry());
++            test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalQuery());
++        }
++        catch(const Ice::NoEndpointException&)
++        {
++            discoveryOk = false;
++        }
+         Ice::ObjectAdapterPtr adapter = com->createObjectAdapter("AdapterForDiscoveryTest");
+         adapter->activate();
+         adapter->deactivate();
+@@ -131,7 +139,15 @@
+ 
+         com->destroy();
+     }
+-    cout << "ok" << endl;
++
++    if (discoveryOk)
++    {
++        cout << "ok" << endl;
++    }
++    else
++    {
++        cout << "failed (is a firewall enabled?)" << endl;
++    }    
+ 
+     cout << "shutting down server... " << flush;
+     obj->shutdown();
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
new file mode 100644
index 000000000000..8e5db73754d3
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@@ -0,0 +1,18 @@
+--- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2015-06-27 18:39:22.443351407 +0000
++++ cpp/test/IceSSL/configuration/AllTests.cpp	2015-06-27 18:40:30.619349872 +0000
+@@ -3164,6 +3164,7 @@
+ #endif
+     }
+ 
++#if 0 // we don't want to talk to zeroc while building
+     cout << "testing system CAs... " << flush;
+     {
+         InitializationData initData;
+@@ -3208,6 +3209,7 @@
+         comm->destroy();
+     }
+     cout << "ok" << endl;
++#endif
+ 
+     if(shutdown)
+     {
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
new file mode 100644
index 000000000000..986c70fc845a
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
@@ -0,0 +1,11 @@
+--- cpp/test/IceSSL/configuration/run.py.orig	2015-06-27 13:03:48.260735765 +0000
++++ cpp/test/IceSSL/configuration/run.py	2015-06-27 13:03:54.559736750 +0000
+@@ -43,7 +43,7 @@
+     os.system("security create-keychain -p password %s" % keychainPath)
+     for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]:
+         os.system("security import %s -f pkcs12 -A -P password -k %s" % (os.path.join(certsPath, cert), keychainPath))
+-elif TestUtil.isLinux():
++elif TestUtil.isLinux() or TestUtil.isFreeBSD():
+     #
+     # Create copies of the CA certificates named after the subject
+     # hash. This is used by the tests to find the CA certificates in
diff --git a/devel/ice/files/patch-cpp-test-Slice-headers-run.py b/devel/ice/files/patch-cpp-test-Slice-headers-run.py
new file mode 100644
index 000000000000..fd97246651bc
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Slice-headers-run.py
@@ -0,0 +1,95 @@
+--- cpp/test/Slice/headers/run.py.orig	2015-06-27 12:14:37.106940921 +0000
++++ cpp/test/Slice/headers/run.py	2015-06-27 12:20:37.900915579 +0000
+@@ -20,6 +20,9 @@
+ sys.path.append(os.path.join(path[0], "scripts"))
+ import TestUtil
+ 
++def execute(cmd):
++    return TestUtil.runCommand(cmd).wait()
++
+ def clean():
+     for f in ["iceslices",
+               "linktoslices",
+@@ -28,7 +31,7 @@
+               os.path.join("slices", "dir1", "linktoa3.ice")]:
+         if os.path.exists(f):
+             os.unlink(f)
+-    os.system("rm -rf project1 tmp")
++    execute("rm -rf project1 tmp")
+ 
+ clean()
+ os.symlink("slices", "linktoslices")
+@@ -43,7 +46,7 @@
+ os.symlink(slicedir, "iceslices")
+ 
+ def runTest(cmd):
+-    os.system(cmd)
++    execute(cmd)
+     f = open("b.h")
+     if not re.search('#include <dir1\/a1\.h>\n'
+                      '#include <linktodir1\/a2\.h>\n'
+@@ -71,9 +74,9 @@
+ #
+ # Slice files are symlinks, include dir is a regular directory
+ #
+-os.system("mkdir -p project1/git/services.settings.slices")
+-os.system("mkdir -p project1/src/services/settings")
+-os.system("cd project1/src/services/settings &&  ln -s ../../../git/services.settings.slices slices")
++execute("mkdir -p project1/git/services.settings.slices")
++execute("mkdir -p project1/src/services/settings")
++execute("cd project1/src/services/settings &&  ln -s ../../../git/services.settings.slices slices")
+ 
+ f = open("project1/git/services.settings.slices/A.ice", "w")
+ f.write("// dumy file")
+@@ -82,7 +85,7 @@
+ f.write("#include <services/settings/slices/A.ice>")
+ f.close()
+ 
+-os.system("cd project1 && %s -Isrc src/services/settings/slices/B.ice" % slice2cpp)
++execute("cd project1 && %s -Isrc src/services/settings/slices/B.ice" % slice2cpp)
+ f = open("project1/B.h")
+ 
+ if not re.search(re.escape('#include <services/settings/slices/A.h>'), f.read()):
+@@ -94,16 +97,16 @@
+ #
+ # Slice file is regular file, include dir is a symlink to a second symlink
+ #
+-os.system("mkdir -p tmp/Ice-x.y.z/share")
+-os.system("cd tmp/Ice-x.y.z/share && ln -s %s" % slicedir)
++execute("mkdir -p tmp/Ice-x.y.z/share")
++execute("cd tmp/Ice-x.y.z/share && ln -s %s" % slicedir)
+ 
+ 
+-os.system("mkdir -p project1/share")
+-os.system("cd project1/share && ln -s %s/tmp/Ice-x.y.z/share/slice" % basedir)
++execute("mkdir -p project1/share")
++execute("cd project1/share && ln -s %s/tmp/Ice-x.y.z/share/slice" % basedir)
+ f = open("project1/A.ice", "w")
+ f.write("#include <Ice/Identity.ice>")
+ f.close()
+-os.system("cd project1 && %s -Ishare/slice A.ice" % slice2cpp)
++execute("cd project1 && %s -Ishare/slice A.ice" % slice2cpp)
+ f = open("project1/A.h")
+ if not re.search(re.escape('#include <Ice/Identity.h>'), f.read()):
+     print("failed!")
+@@ -114,16 +117,16 @@
+ #
+ # Typical Ice install with symlink Ice-x.y -> Ice-x.y.z
+ #
+-os.system("mkdir -p tmp/Ice-x.y.z/slice/Ice")
+-os.system("cd tmp && ln -s Ice-x.y.z Ice-x.y")
++execute("mkdir -p tmp/Ice-x.y.z/slice/Ice")
++execute("cd tmp && ln -s Ice-x.y.z Ice-x.y")
+ f = open("tmp/Ice-x.y.z/slice/Ice/Identity.ice", "w")
+ f.write("// dumy file")
+ 
+-os.system("mkdir -p project1")
++execute("mkdir -p project1")
+ f = open("project1/A.ice", "w")
+ f.write("#include <Ice/Identity.ice>")
+ f.close()
+-os.system("cd project1 && %s -I%s/tmp/Ice-x.y/slice A.ice" % (slice2cpp, basedir))
++execute("cd project1 && %s -I%s/tmp/Ice-x.y/slice A.ice" % (slice2cpp, basedir))
+ f = open("project1/A.h")
+ if not re.search(re.escape('#include <Ice/Identity.h>'), f.read()):
+     print("failed!")
diff --git a/devel/ice/files/patch-php-config-Make.rules.php b/devel/ice/files/patch-php-config-Make.rules.php
index 9b2a08c7e276..0b8bff3f7e39 100644
--- a/devel/ice/files/patch-php-config-Make.rules.php
+++ b/devel/ice/files/patch-php-config-Make.rules.php
@@ -1,17 +1,22 @@
---- php/config/Make.rules.php.orig	2013-03-11 15:19:47.000000000 +0000
-+++ php/config/Make.rules.php	2013-06-02 14:36:13.744196194 +0000
-@@ -100,8 +100,8 @@
- endif
+--- php/config/Make.rules.php.orig	2015-06-23 15:30:20.000000000 +0000
++++ php/config/Make.rules.php	2015-06-27 19:48:31.900063596 +0000
+@@ -108,13 +108,8 @@
+ 
+ libdir		= $(top_srcdir)/lib
+ 
+-ifndef usr_dir_install
+-    install_phpdir	= $(prefix)/php
+-    install_libdir  	= $(prefix)/php
+-else
+-    install_phpdir  	= $(prefix)/share/php
+-    install_libdir  	= $(shell php -r "echo(ini_get('extension_dir'));")
+-endif
++install_phpdir  	= $(prefix)/share/pear
++install_libdir  	= $(prefix)/lib/php/$(PHP_EXT_DIR)
  
- libdir			= $(top_srcdir)/lib
- ifneq ($(prefix), /usr)
--install_phpdir      = $(prefix)/php
--install_libdir      = $(prefix)/php
-+install_phpdir		= $(prefix)/share/pear
-+install_libdir		= $(prefix)/lib/php/$(PHP_EXT_DIR)
- else
-
-@@ -155,7 +155,8 @@
+ ifdef ice_src_dist
+     RPATH_DIR	= $(LOADER_PATH)/../../cpp/$(libsubdir)
+@@ -172,7 +167,8 @@
  endif
  
  ifeq ($(installphplib),)
diff --git a/devel/ice/files/patch-py-config-Make.rules b/devel/ice/files/patch-py-config-Make.rules
deleted file mode 100644
index d6085067d160..000000000000
--- a/devel/ice/files/patch-py-config-Make.rules
+++ /dev/null
@@ -1,41 +0,0 @@
---- py/config/Make.rules.orig	2013-03-11 15:19:47.000000000 +0000
-+++ py/config/Make.rules	2013-05-20 14:21:13.335195726 +0000
-@@ -12,7 +12,8 @@
- # if it does not exist.
- #
- 
--prefix			?= /opt/Ice-$(VERSION)
-+ICE_HOME		= %%LOCALBASE%%
-+prefix			?= %%PREFIX%%
- 
- #
- # The "root directory" for runpath embedded in executables. Can be unset
-@@ -96,8 +97,8 @@
- 
- libdir                  = $(top_srcdir)/python
- ifneq ($(prefix), /usr)
--install_pythondir       = $(prefix)/python
--install_libdir          = $(prefix)/python
-+install_pythondir       = %%PYTHON_SITELIBDIR%%/Ice
-+install_libdir          = %%PYTHON_SITELIBDIR%%/Ice
- else
-     ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
-         install_pythondir       = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
-@@ -128,7 +129,7 @@
-     ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
-     ICE_FLAGS	= -I$(ice_dir)/include
- endif
--ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
-+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil %%ICONV_LIB%%
- 
- ifneq ($(embedded_runpath_prefix),)
-    runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)
-@@ -167,7 +167,7 @@
- 
- all:: $(SRCS)
- 
--%_ice.py: $(slicedir)/%.ice
-+%_ice.py: $(ICE_HOME)/%.ice
- 	rm -f $(*F).py
- 	$(SLICE2PY) $(SLICE2PYFLAGS) $<
- 
diff --git a/devel/ice/files/patch-py-Makefile b/devel/ice/files/patch-python-Makefile
index 7f929446e128..ce6642471df7 100644
--- a/devel/ice/files/patch-py-Makefile
+++ b/devel/ice/files/patch-python-Makefile
@@ -1,5 +1,5 @@
---- py/Makefile.orig	2013-10-04 15:48:15.000000000 +0000
-+++ py/Makefile	2013-12-01 16:37:09.381657035 +0000
+--- python/Makefile.orig	2013-10-04 15:48:15.000000000 +0000
++++ python/Makefile	2013-12-01 16:37:09.381657035 +0000
 @@ -15,7 +15,7 @@
  
  INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir)
diff --git a/devel/ice/files/patch-python-config-Make.rules b/devel/ice/files/patch-python-config-Make.rules
new file mode 100644
index 000000000000..f6926ad9913c
--- /dev/null
+++ b/devel/ice/files/patch-python-config-Make.rules
@@ -0,0 +1,99 @@
+--- python/config/Make.rules.orig	2015-06-23 15:30:20.000000000 +0000
++++ python/config/Make.rules	2015-06-27 23:26:40.586161355 +0000
+@@ -11,7 +11,8 @@
+ # Select an installation base directory. The directory will be created
+ # if it does not exist.
+ #
+-prefix			?= /opt/Ice-$(VERSION)
++ICE_HOME		= %%LOCALBASE%%
++prefix			?= %%PREFIX%%
+ 
+ #
+ # The "root directory" for runpath embedded in executables. Can be set
+@@ -49,7 +50,7 @@
+ # version used for building the Ice extension, then set PYTHON to
+ # the specific to the location of the python interpreter.
+ #
+-PYTHON              ?= python
++PYTHON              ?= %%PYTHON_CMD%%
+ 
+ PYTHON_VERSION      ?= python$(shell $(PYTHON) -c "import sys; import distutils.sysconfig as ds; sys.stdout.write(ds.get_python_version())")
+ 
+@@ -91,9 +92,9 @@
+     include $(top_srcdir)/../config/Make.common.rules
+ endif
+ 
+-ifndef usr_dir_install
+-RPATH_DIR	= $(prefix)/$(libsubdir)
+-endif
++#ifndef usr_dir_install
++#RPATH_DIR	= $(prefix)/$(libsubdir)
++#endif
+ 
+ install_bindir          = $(prefix)/$(binsubdir)
+ 
+@@ -108,17 +109,17 @@
+ 
+ libdir                  = $(top_srcdir)/python
+ 
+-ifndef usr_dir_install
+-    install_pythondir		= $(prefix)/python
+-    install_libdir			= $(prefix)/python
+-else
++#ifndef usr_dir_install
++#    install_pythondir		= $(prefix)/python
++#    install_libdir			= $(prefix)/python
++#else
+     #
+     # The install_dir script says where python wants site-packages installed.
+     #
+ 
+-    install_pythondir = $(shell $(PYTHON) $(top_srcdir)/config/install_dir)
+-    install_libdir = $(install_pythondir)
+-endif
++    install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
++    install_libdir = %%PYTHON_SITELIBDIR%%/Ice
++#endif
+ 
+ ifeq ($(UNAME),SunOS)
+     ifeq ($(LP64),yes)
+@@ -127,14 +128,10 @@
+     endif
+ endif
+ 
+-ifdef ice_src_dist
+-    ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
+-    ICE_FLAGS 	= -I$(ice_cpp_dir)/include
+-else
+-    ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
+-    ICE_FLAGS	= -I$(ice_dir)/include
+-endif
+-ICE_LIBS = $(ICE_LIB_DIR) -lIceSSL -lIce -lSlice -lIceUtil
++
++ICE_LIB_DIR	= -L%%LOCALBASE%%/$(libsubdir)
++ICE_FLAGS	= -I%%LOCALBASE%%/include
++ICE_LIBS	= $(ICE_LIB_DIR) -lIceSSL -lIce -lSlice -lIceUtil %%ICONV_LIB%%
+ 
+ CPPFLAGS		=
+ ICECPPFLAGS		= -I$(slicedir)
+@@ -143,10 +140,7 @@
+ 
+ ifdef ice_src_dist
+     SLICE2PY    = $(PYTHON) $(top_srcdir)/config/s2py.py
+-    SLICEPARSERLIB	= $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION))
+-    ifeq ($(wildcard $(SLICEPARSERLIB)),)
+-        SLICEPARSERLIB  = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION))
+-    endif
++    SLICEPARSERLIB	= /usr/local/lib/$(call mklibfilename,Slice,$(VERSION))
+ else
+     ifeq ($(UNAME),Darwin)
+         SLICE2PY = /usr/local/bin/slice2py
+@@ -171,7 +165,7 @@
+ 
+ all:: $(SRCS)
+ 
+-%_ice.py: $(slicedir)/%.ice
++%_ice.py: $(ICE_HOME)/%.ice
+ 	rm -f $(*F).py
+ 	$(SLICE2PY) $(SLICE2PYFLAGS) $<
+ 	@mkdir -p .depend
diff --git a/devel/ice/files/patch-py-modules-IcePy-Types.cpp b/devel/ice/files/patch-python-modules-IcePy-Types.cpp
index 35a811e4eb75..6d401ef5fd70 100644
--- a/devel/ice/files/patch-py-modules-IcePy-Types.cpp
+++ b/devel/ice/files/patch-python-modules-IcePy-Types.cpp
@@ -1,5 +1,5 @@
---- py/modules/IcePy/Types.cpp.orig	2015-01-18 15:25:00.277654935 +0100
-+++ py/modules/IcePy/Types.cpp	2015-01-18 15:24:52.737609935 +0100
+--- python/modules/IcePy/Types.cpp.orig	2015-01-18 15:25:00.277654935 +0100
++++ python/modules/IcePy/Types.cpp	2015-01-18 15:24:52.737609935 +0100
 @@ -915,7 +915,7 @@
  }
  
@@ -18,34 +18,6 @@
  {
      if(!validate(value))
      {
-@@ -1232,11 +1232,15 @@
- {
-     assert(PyObject_IsInstance(p, pythonType.get()) == 1); // validate() should have caught this.
- 
-+    int sizePos = -1;
-     if(optional)
-     {
-         if(_variableLength)
-         {
--            os->startSize();
-+            // BUGFIX: #5481 startSize/endSize can't be nested
-+            //os->startSize();
-+            sizePos = os->pos();
-+            os->write(Ice::Int(0));
-         }
-         else
-         {
-@@ -1266,7 +1270,9 @@
- 
-     if(optional && _variableLength)
-     {
--        os->endSize();
-+        assert(sizePos != -1);
-+        //os->endSize();
-+        os->rewrite(os->pos() - sizePos - 4, sizePos);
-     }
- }
- 
 @@ -1305,7 +1311,7 @@
  }
  
@@ -55,34 +27,6 @@
  {
      if(!validate(value))
      {
-@@ -1402,11 +1408,15 @@
- {
-     PrimitiveInfoPtr pi = PrimitiveInfoPtr::dynamicCast(elementType);
- 
-+    int sizePos = -1;
-     if(optional)
-     {
-         if(elementType->variableLength())
-         {
--            os->startSize();
-+            // BUGFIX: #5481 startSize/endSize can't be nested
-+            //os->startSize();
-+            sizePos = os->pos();
-+            os->write(Ice::Int(0));
-         }
-         else if(elementType->wireSize() > 1)
-         {
-@@ -1490,7 +1500,9 @@
- 
-     if(optional && elementType->variableLength())
-     {
--        os->endSize();
-+        assert(sizePos != -1);
-+        //os->endSize();
-+        os->rewrite(os->pos() - sizePos - 4, sizePos);
-     }
- }
- 
 @@ -1559,7 +1571,7 @@
  }
  
@@ -101,34 +45,6 @@
  {
      if(!validate(value))
      {
-@@ -2480,11 +2492,15 @@
- 
-     const Ice::Int sz = p == Py_None ? 0 : static_cast<Ice::Int>(PyDict_Size(p));
- 
-+    int sizePos = -1;
-     if(optional)
-     {
-         if(_variableLength)
-         {
--            os->startSize();
-+            // BUGFIX: #5481 startSize/endSize can't be nested
-+            //os->startSize();
-+            sizePos = os->pos();
-+            os->write(Ice::Int(0));
-         }
-         else
-         {
-@@ -2523,7 +2539,9 @@
- 
-     if(optional && _variableLength)
-     {
--        os->endSize();
-+        assert(sizePos != -1);
-+        //os->endSize();
-+        os->rewrite(os->pos() - sizePos - 4, sizePos);
-     }
- }
- 
 @@ -2597,7 +2615,7 @@
  }
  
@@ -156,32 +72,6 @@
  {
      if(base)
      {
-@@ -2958,9 +2976,13 @@
- void
- IcePy::ProxyInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional, const Ice::StringSeq*)
- {
-+    int sizePos = -1;
-     if(optional)
-     {
--        os->startSize();
-+        // BUGFIX: #5481 startSize/endSize can't be nested
-+        //os->startSize();
-+        sizePos = os->pos();
-+        os->write(Ice::Int(0));
-     }
- 
-     if(p == Py_None)
-@@ -2978,7 +3000,9 @@
- 
-     if(optional)
-     {
--        os->endSize();
-+        assert(sizePos != -1);
-+        //os->endSize();
-+        os->rewrite(os->pos() - sizePos - 4, sizePos);
-     }
- }
- 
 @@ -3011,7 +3035,7 @@
  }
  
diff --git a/devel/ice/files/patch-py-modules-IcePy-Types.h b/devel/ice/files/patch-python-modules-IcePy-Types.h
index 6c6d92ed8097..ff270cc82c89 100644
--- a/devel/ice/files/patch-py-modules-IcePy-Types.h
+++ b/devel/ice/files/patch-python-modules-IcePy-Types.h
@@ -1,5 +1,5 @@
---- py/modules/IcePy/Types.h.orig	2015-01-18 15:25:04.917707935 +0100
-+++ py/modules/IcePy/Types.h	2015-01-18 15:24:54.689631935 +0100
+--- python/modules/IcePy/Types.h.orig	2015-01-18 15:25:04.917707935 +0100
++++ python/modules/IcePy/Types.h	2015-01-18 15:24:54.689631935 +0100
 @@ -69,6 +69,50 @@
      std::map<PyObject*, int> objects;
  };
diff --git a/devel/ice/files/patch-py-python-Makefile b/devel/ice/files/patch-python-python-Makefile
index 3afcfe039544..29f6b00bf05a 100644
--- a/devel/ice/files/patch-py-python-Makefile
+++ b/devel/ice/files/patch-python-python-Makefile
@@ -1,5 +1,5 @@
---- py/python/Makefile.orig	2010-07-11 13:05:38.000000000 +1000
-+++ py/python/Makefile	2012-09-11 00:09:09.000000000 +2000
+--- python/python/Makefile.orig	2010-07-11 13:05:38.000000000 +1000
++++ python/python/Makefile	2012-09-11 00:09:09.000000000 +2000
 @@ -118,10 +118,11 @@
  
  install:: $(ALL_SRCS)
diff --git a/devel/ice/files/patch-py-test-Ice-info-AllTests.py b/devel/ice/files/patch-python-test-Ice-info-AllTests.py
index 5c04fe28227f..aa2790226a53 100644
--- a/devel/ice/files/patch-py-test-Ice-info-AllTests.py
+++ b/devel/ice/files/patch-python-test-Ice-info-AllTests.py
@@ -1,5 +1,5 @@
---- py/test/Ice/info/AllTests.py.orig	2013-03-11 15:19:47.000000000 +0000
-+++ py/test/Ice/info/AllTests.py	2013-05-20 14:25:56.860196743 +0000
+--- python/test/Ice/info/AllTests.py.orig	2015-06-27 10:55:33.131456669 +0000
++++ python/test/Ice/info/AllTests.py	2015-06-27 10:52:58.191276825 +0000
 @@ -7,12 +7,31 @@
  #
  # **********************************************************************
@@ -30,13 +30,13 @@
 +def isFreeBSDJail():
 +    return isFreeBSD() and sysctl("security.jail.jailed")
 +
- def allTests(communicator, collocated):
+ def allTests(communicator):
      sys.stdout.write("testing proxy endpoint information... ")
      sys.stdout.flush()
-@@ -67,12 +86,12 @@
- 
+@@ -74,12 +93,12 @@
      ipEndpoint = endpoints[0].getInfo()
-     test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
+     test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2 or ipEndpoint.type() == 4 or
+          ipEndpoint.type() == 5)
 -    test(ipEndpoint.host == defaultHost)
 +    test(ipEndpoint.host == defaultHost or isFreeBSDJail())
      test(ipEndpoint.port > 0)
@@ -48,7 +48,7 @@
      test(udpEndpoint.datagram())
      test(udpEndpoint.port > 0)
  
-@@ -108,7 +127,7 @@
+@@ -115,7 +134,7 @@
      ipinfo = base.ice_getConnection().getEndpoint().getInfo()
      test(ipinfo.port == 12010)
      test(not ipinfo.compress)
@@ -57,7 +57,7 @@
  
      ctx = testIntf.getEndpointInfoAsContext()
      test(ctx["host"] == ipinfo.host)
-@@ -118,7 +137,7 @@
+@@ -125,7 +144,7 @@
  
      udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
      test(udp.port == 12010)
@@ -66,14 +66,14 @@
  
      print("ok")
  
-@@ -129,8 +148,8 @@
-     test(not info.incoming)
+@@ -140,8 +159,8 @@
      test(len(info.adapterName) == 0)
      test(info.remotePort == 12010)
--    test(info.remoteAddress == defaultHost)
--    test(info.localAddress == defaultHost)
-+    test(info.remoteAddress == defaultHost or isFreeBSDJail())
-+    test(info.localAddress == defaultHost or isFreeBSDJail())
+     if defaultHost == '127.0.0.1':
+-        test(info.remoteAddress == defaultHost)
+-        test(info.localAddress == defaultHost)
++        test(info.remoteAddress == defaultHost or isFreeBSDJail())
++        test(info.localAddress == defaultHost or isFreeBSDJail())
+     test(info.rcvSize >= 1024)
+     test(info.sndSize >= 2048)
  
-     ctx = testIntf.getConnectionInfoAsContext()
-     test(ctx["incoming"] == "true")
diff --git a/devel/ice/files/patch-scripts-Expect.py b/devel/ice/files/patch-scripts-Expect.py
index d73c2adcffc6..8072c6b69ce9 100644
--- a/devel/ice/files/patch-scripts-Expect.py
+++ b/devel/ice/files/patch-scripts-Expect.py
@@ -1,11 +1,11 @@
---- scripts/Expect.py.orig	2013-03-11 15:19:47.000000000 +0000
-+++ scripts/Expect.py	2014-09-08 22:32:43.000000000 +0000
-@@ -461,7 +461,7 @@
-             if win32 and self.exitstatus != 0 and self.killed is not None:
-                 self.exitstatus = -self.killed
-             self.p = None
--            self.r.join()
-+            self.r.join(timeout)
-             # Simulate a match on EOF
-             self.buf = self.r.getbuf()
-             self.before = self.buf
+--- scripts.orig/Expect.py	2015-01-23 13:16:01.000000000 +0000
++++ scripts/Expect.py	2015-01-23 13:21:06.526614131 +0000
+@@ -484,7 +484,7 @@
+         global processes
+         del processes[self.p.pid]
+         self.p = None
+-        self.r.join()
++        self.r.join(timeout)
+         # Simulate a match on EOF
+         self.buf = self.r.getbuf()
+         self.before = self.buf
diff --git a/devel/ice/files/patch-scripts-IceGridAdmin.py b/devel/ice/files/patch-scripts-IceGridAdmin.py
new file mode 100644
index 000000000000..c9ad90d37805
--- /dev/null
+++ b/devel/ice/files/patch-scripts-IceGridAdmin.py
@@ -0,0 +1,21 @@
+--- scripts/IceGridAdmin.py.orig	2015-07-04 12:59:57.542262997 +0200
++++ scripts/IceGridAdmin.py	2015-07-04 13:02:16.496576997 +0200
+@@ -222,11 +222,14 @@
+ def iceGridTest(application, additionalOptions = "", applicationOptions = ""):
+ 
+     testdir = os.getcwd()
++    dbdir = os.path.join(os.getcwd(), "db")
++
+     if not TestUtil.isWin32() and os.getuid() == 0:
+-        print
+-        print("*** can't run test as root ***")
+-        print
+-        return
++        for root, dirs, files in os.walk(dbdir):
++            os.chown(os.path.join(dbdir, root), 65534, 65534)
++            for f in files:
++                os.chown(os.path.join(dbdir, root, f), 65534, 65534)
++        os.setuid(65534)
+ 
+     client = TestUtil.getDefaultClientFile()
+     if TestUtil.getDefaultMapping() != "java":
diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py
index a37569fd8cef..bd301767de25 100644
--- a/devel/ice/files/patch-scripts-TestUtil.py
+++ b/devel/ice/files/patch-scripts-TestUtil.py
@@ -1,8 +1,8 @@
---- scripts.orig/TestUtil.py	2013-03-11 15:19:47.000000000 +0000
-+++ scripts/TestUtil.py	2015-03-23 14:08:57.225102620 +0000
-@@ -84,6 +84,25 @@
- def isLinux():
-     return sys.platform.startswith("linux")
+--- scripts/TestUtil.py.orig	2015-06-23 15:30:20.000000000 +0000
++++ scripts/TestUtil.py	2015-06-27 10:59:56.354249500 +0000
+@@ -120,6 +120,25 @@
+ def isSles():
+     return isLinux() and linuxDistribution and linuxDistribution == "SUSE LINUX"
  
 +def isFreeBSD():
 +    return sys.platform.startswith("freebsd")
@@ -26,7 +26,25 @@
  def getCppCompiler():
      compiler = ""
      if os.environ.get("CPP_COMPILER", "") != "":
-@@ -1846,6 +1865,14 @@
+@@ -311,7 +330,7 @@
+     if(p.wait() != 0):
+         print("uname failed:\n" + p.stdout.read().strip())
+         sys.exit(1)
+-    if p.stdout.readline().decode('UTF-8').strip() == "x86_64" and os.environ.get("LP64", "") != "no":
++    if p.stdout.readline().decode('UTF-8').strip() in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
+         x64 = True
+ 
+ #
+@@ -1887,7 +1906,7 @@
+         if lang == "java":
+             addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll
+         addLdPath(getCppLibDir(lang), env)
+-    elif lang in ["python", "ruby", "php", "js", "objective-c"]:
++    elif lang in ["cpp", "python", "ruby", "php", "js", "objective-c"]:
+         addLdPath(getCppLibDir(lang), env)
+ 
+     if lang == "java":
+@@ -2233,6 +2252,14 @@
                  print("%s*** test not supported under Darwin%s" % (prefix, suffix))
                  continue
  
@@ -41,12 +59,3 @@
              if not isWin32() and "win32only" in config:
                  print("%s*** test only supported under Win32%s" % (prefix, suffix))
                  continue
-@@ -1929,7 +1929,7 @@
-                     print("  exit 1")
-                 print("fi")
-             else:
--                status = os.system(sys.executable + " " +  quoteArgument(os.path.join(dir, "run.py")) + " " + args)
-+                status = os.system(sys.executable + " " +  quoteArgument(os.path.join(dir, "run.py")) + " " + args) >> 8
- 
-                 if status:
-                     if(num > 0):
diff --git a/devel/ice/files/patch-scripts-icehashpassword.py b/devel/ice/files/patch-scripts-icehashpassword.py
new file mode 100644
index 000000000000..512390e90b81
--- /dev/null
+++ b/devel/ice/files/patch-scripts-icehashpassword.py
@@ -0,0 +1,11 @@
+--- scripts/icehashpassword.py.orig	2015-06-23 15:30:20.000000000 +0000
++++ scripts/icehashpassword.py	2015-06-27 17:12:00.818709719 +0000
+@@ -11,7 +11,7 @@
+ import sys, getopt, passlib.hash, getpass
+ 
+ usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin"
+-useCryptExt = sys.platform.startswith("linux")
++useCryptExt = sys.platform.startswith("linux") or sys.platform.startswith("freebsd")
+ 
+ if not usePBKDF2 and not useCryptExt:
+     print("platform not supported")
diff --git a/devel/ice/pkg-plist b/devel/ice/pkg-plist
index 9b651fd35439..fcf4628a6ff2 100644
--- a/devel/ice/pkg-plist
+++ b/devel/ice/pkg-plist
@@ -2,7 +2,6 @@ bin/dumpdb
 bin/glacier2router
 bin/icebox
 bin/iceboxadmin
-bin/iceca
 bin/icegridadmin
 bin/icegridnode
 bin/icegridregistry
@@ -17,9 +16,8 @@ bin/slice2freeze
 bin/slice2freezej
 bin/slice2html
 bin/slice2java
+bin/slice2js
 bin/slice2php
-bin/slice2py
-bin/slice2rb
 bin/transformdb
 include/Freeze/BackgroundSaveEvictor.h
 include/Freeze/Catalog.h
@@ -40,8 +38,10 @@ include/Freeze/Transaction.h
 include/Freeze/TransactionHolder.h
 include/Freeze/TransactionalEvictor.h
 include/Glacier2/Application.h
+include/Glacier2/Config.h
 include/Glacier2/Glacier2.h
 include/Glacier2/Metrics.h
+include/Glacier2/NullPermissionsVerifier.h
 include/Glacier2/PermissionsVerifier.h
 include/Glacier2/PermissionsVerifierF.h
 include/Glacier2/Router.h
@@ -49,8 +49,13 @@ include/Glacier2/RouterF.h
 include/Glacier2/SSLInfo.h
 include/Glacier2/Session.h
 include/Glacier2/SessionHelper.h
+include/Ice/ACMF.h
 include/Ice/Application.h
+include/Ice/AsyncResult.h
+include/Ice/AsyncResultF.h
 include/Ice/BasicStream.h
+include/Ice/BatchRequestInterceptor.h
+include/Ice/BatchRequestQueueF.h
 include/Ice/Buffer.h
 include/Ice/BuiltinSequences.h
 include/Ice/Communicator.h
@@ -62,18 +67,15 @@ include/Ice/ConnectionAsync.h
 include/Ice/ConnectionF.h
 include/Ice/ConnectionFactoryF.h
 include/Ice/ConnectionIF.h
-include/Ice/ConnectionMonitorF.h
 include/Ice/Current.h
-include/Ice/Direct.h
+include/Ice/DefaultObjectFactory.h
+include/Ice/DeprecatedStringConverter.h
 include/Ice/DispatchInterceptor.h
 include/Ice/Dispatcher.h
 include/Ice/DynamicLibrary.h
 include/Ice/DynamicLibraryF.h
 include/Ice/Endpoint.h
 include/Ice/EndpointF.h
-include/Ice/EndpointFactory.h
-include/Ice/EndpointFactoryF.h
-include/Ice/EndpointIF.h
 include/Ice/EndpointTypes.h
 include/Ice/Exception.h
 include/Ice/FacetMap.h
@@ -81,11 +83,9 @@ include/Ice/FactoryTable.h
 include/Ice/FactoryTableInit.h
 include/Ice/Format.h
 include/Ice/Functional.h
-include/Ice/GCCountMap.h
-include/Ice/GCShared.h
+include/Ice/GCObject.h
 include/Ice/Handle.h
 include/Ice/Ice.h
-include/Ice/IconvStringConverter.h
 include/Ice/Identity.h
 include/Ice/ImplicitContext.h
 include/Ice/ImplicitContextF.h
@@ -109,7 +109,6 @@ include/Ice/MetricsAdminI.h
 include/Ice/MetricsFunctional.h
 include/Ice/MetricsObserverI.h
 include/Ice/NativePropertiesAdmin.h
-include/Ice/NetworkF.h
 include/Ice/Object.h
 include/Ice/ObjectAdapter.h
 include/Ice/ObjectAdapterF.h
@@ -130,14 +129,14 @@ include/Ice/Properties.h
 include/Ice/PropertiesAdmin.h
 include/Ice/PropertiesF.h
 include/Ice/Protocol.h
-include/Ice/ProtocolPluginFacade.h
-include/Ice/ProtocolPluginFacadeF.h
 include/Ice/Proxy.h
 include/Ice/ProxyF.h
 include/Ice/ProxyFactoryF.h
 include/Ice/ProxyHandle.h
 include/Ice/ReferenceF.h
+include/Ice/RemoteLogger.h
 include/Ice/RequestHandlerF.h
+include/Ice/ResponseHandlerF.h
 include/Ice/Router.h
 include/Ice/RouterF.h
 include/Ice/ServantLocator.h
@@ -148,39 +147,43 @@ include/Ice/SliceChecksumDict.h
 include/Ice/SliceChecksums.h
 include/Ice/SlicedData.h
 include/Ice/SlicedDataF.h
-include/Ice/Stats.h
-include/Ice/StatsF.h
 include/Ice/Stream.h
 include/Ice/StreamF.h
 include/Ice/StreamHelpers.h
-include/Ice/StringConverter.h
-include/Ice/UndefSysMacros.h
+include/Ice/ThreadPoolF.h
 include/Ice/UserExceptionFactory.h
 include/Ice/Version.h
+include/IceBox/Config.h
 include/IceBox/IceBox.h
 include/IceGrid/Admin.h
+include/IceGrid/Config.h
 include/IceGrid/Descriptor.h
 include/IceGrid/Exception.h
 include/IceGrid/FileParser.h
 include/IceGrid/IceGrid.h
 include/IceGrid/Locator.h
 include/IceGrid/Observer.h
+include/IceGrid/PluginFacade.h
 include/IceGrid/Query.h
 include/IceGrid/Registry.h
+include/IceGrid/ReplicaGroupFilter.h
 include/IceGrid/Session.h
 include/IceGrid/UserAccountMapper.h
 include/IcePatch2/ClientUtil.h
+include/IcePatch2/Config.h
 include/IcePatch2/FileInfo.h
 include/IcePatch2/FileServer.h
-include/IcePatch2/Util.h
+include/IcePatch2/IcePatch2.h
+include/IceSSL/Config.h
 include/IceSSL/ConnectionInfo.h
 include/IceSSL/EndpointInfo.h
 include/IceSSL/IceSSL.h
 include/IceSSL/Plugin.h
+include/IceStorm/Config.h
 include/IceStorm/IceStorm.h
 include/IceStorm/Metrics.h
 include/IceUtil/AbstractMutex.h
-include/IceUtil/ArgVector.h
+include/IceUtil/Atomic.h
 include/IceUtil/Cache.h
 include/IceUtil/Cond.h
 include/IceUtil/Config.h
@@ -188,10 +191,10 @@ include/IceUtil/CountDownLatch.h
 include/IceUtil/CtrlCHandler.h
 include/IceUtil/DisableWarnings.h
 include/IceUtil/Exception.h
-include/IceUtil/FileUtil.h
 include/IceUtil/Functional.h
 include/IceUtil/Handle.h
 include/IceUtil/IceUtil.h
+include/IceUtil/IconvStringConverter.h
 include/IceUtil/InputUtil.h
 include/IceUtil/Iterator.h
 include/IceUtil/Lock.h
@@ -203,84 +206,85 @@ include/IceUtil/MutexPtrTryLock.h
 include/IceUtil/Optional.h
 include/IceUtil/Options.h
 include/IceUtil/OutputUtil.h
+include/IceUtil/PopDisableWarnings.h
+include/IceUtil/PushDisableWarnings.h
 include/IceUtil/Random.h
 include/IceUtil/RecMutex.h
+include/IceUtil/SHA1.h
 include/IceUtil/ScannerConfig.h
 include/IceUtil/ScopedArray.h
 include/IceUtil/Shared.h
-include/IceUtil/StopWatch.h
+include/IceUtil/StringConverter.h
 include/IceUtil/StringUtil.h
 include/IceUtil/Thread.h
 include/IceUtil/ThreadException.h
 include/IceUtil/Time.h
 include/IceUtil/Timer.h
 include/IceUtil/UUID.h
-include/IceUtil/Unicode.h
+include/IceUtil/UndefSysMacros.h
 include/IceUtil/UniquePtr.h
-include/IceXML/Parser.h
 include/Slice/CPlusPlusUtil.h
 include/Slice/Checksum.h
 include/Slice/CsUtil.h
 include/Slice/DotNetNames.h
 include/Slice/FileTracker.h
 include/Slice/JavaUtil.h
+include/Slice/ObjCUtil.h
 include/Slice/PHPUtil.h
 include/Slice/Parser.h
 include/Slice/Preprocessor.h
 include/Slice/PythonUtil.h
 include/Slice/RubyUtil.h
 include/Slice/Util.h
-lib/ImportKey.class
 lib/libFreeze.so
-lib/libFreeze.so.3.5.1
-lib/libFreeze.so.35
+lib/libFreeze.so.3.6.0
+lib/libFreeze.so.36
 lib/libGlacier2.so
-lib/libGlacier2.so.3.5.1
-lib/libGlacier2.so.35
+lib/libGlacier2.so.3.6.0
+lib/libGlacier2.so.36
+lib/libGlacier2CryptPermissionsVerifier.so
+lib/libGlacier2CryptPermissionsVerifier.so.3.6.0
+lib/libGlacier2CryptPermissionsVerifier.so.36
 lib/libIce.so
-lib/libIce.so.3.5.1
-lib/libIce.so.35
+lib/libIce.so.3.6.0
+lib/libIce.so.36
 lib/libIceBox.so
-lib/libIceBox.so.3.5.1
-lib/libIceBox.so.35
-lib/libIceDB.so
-lib/libIceDB.so.3.5.1
-lib/libIceDB.so.35
+lib/libIceBox.so.3.6.0
+lib/libIceBox.so.36
+lib/libIceDiscovery.so
+lib/libIceDiscovery.so.3.6.0
+lib/libIceDiscovery.so.36
 lib/libIceGrid.so
-lib/libIceGrid.so.3.5.1
-lib/libIceGrid.so.35
-lib/libIceGridFreezeDB.so
-lib/libIceGridFreezeDB.so.3.5.1
-lib/libIceGridFreezeDB.so.35
+lib/libIceGrid.so.3.6.0
+lib/libIceGrid.so.36
+lib/libIceLocatorDiscovery.so
+lib/libIceLocatorDiscovery.so.3.6.0
+lib/libIceLocatorDiscovery.so.36
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.5.1
-lib/libIcePatch2.so.35
+lib/libIcePatch2.so.3.6.0
+lib/libIcePatch2.so.36
 lib/libIceSSL.so
-lib/libIceSSL.so.3.5.1
-lib/libIceSSL.so.35
+lib/libIceSSL.so.3.6.0
+lib/libIceSSL.so.36
 lib/libIceStorm.so
-lib/libIceStorm.so.3.5.1
-lib/libIceStorm.so.35
-lib/libIceStormFreezeDB.so
-lib/libIceStormFreezeDB.so.3.5.1
-lib/libIceStormFreezeDB.so.35
+lib/libIceStorm.so.3.6.0
+lib/libIceStorm.so.36
 lib/libIceStormService.so
-lib/libIceStormService.so.3.5.1
-lib/libIceStormService.so.35
+lib/libIceStormService.so.3.6.0
+lib/libIceStormService.so.36
 lib/libIceUtil.so
-lib/libIceUtil.so.3.5.1
-lib/libIceUtil.so.35
+lib/libIceUtil.so.3.6.0
+lib/libIceUtil.so.36
 lib/libIceXML.so
-lib/libIceXML.so.3.5.1
-lib/libIceXML.so.35
+lib/libIceXML.so.3.6.0
+lib/libIceXML.so.36
 lib/libSlice.so
-lib/libSlice.so.3.5.1
-lib/libSlice.so.35
+lib/libSlice.so.3.6.0
+lib/libSlice.so.36
 man/man1/dumpdb.1.gz
 man/man1/glacier2router.1.gz
 man/man1/icebox.1.gz
 man/man1/iceboxadmin.1.gz
-man/man1/iceca.1.gz
 man/man1/icegridadmin.1.gz
 man/man1/icegridnode.1.gz
 man/man1/icegridregistry.1.gz
@@ -295,11 +299,9 @@ man/man1/slice2freeze.1.gz
 man/man1/slice2freezej.1.gz
 man/man1/slice2html.1.gz
 man/man1/slice2java.1.gz
+man/man1/slice2js.1.gz
 man/man1/slice2php.1.gz
-man/man1/slice2py.1.gz
-man/man1/slice2rb.1.gz
 man/man1/transformdb.1.gz
-%%DATADIR%%/CHANGES
 %%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
 %%DATADIR%%/Freeze/CatalogData.ice
 %%DATADIR%%/Freeze/Connection.ice
@@ -348,28 +350,30 @@ man/man1/transformdb.1.gz
 %%DATADIR%%/Ice/PluginF.ice
 %%DATADIR%%/Ice/Process.ice
 %%DATADIR%%/Ice/ProcessF.ice
-%%DATADIR%%/Ice/PropertiesAdmin.ice
 %%DATADIR%%/Ice/Properties.ice
+%%DATADIR%%/Ice/PropertiesAdmin.ice
 %%DATADIR%%/Ice/PropertiesF.ice
+%%DATADIR%%/Ice/RemoteLogger.ice
 %%DATADIR%%/Ice/Router.ice
 %%DATADIR%%/Ice/RouterF.ice
 %%DATADIR%%/Ice/ServantLocator.ice
 %%DATADIR%%/Ice/ServantLocatorF.ice
 %%DATADIR%%/Ice/SliceChecksumDict.ice
-%%DATADIR%%/Ice/Stats.ice
-%%DATADIR%%/Ice/StatsF.ice
 %%DATADIR%%/Ice/Version.ice
 %%DATADIR%%/IceBox/IceBox.ice
+%%DATADIR%%/IceDiscovery/IceDiscovery.ice
 %%DATADIR%%/IceGrid/Admin.ice
 %%DATADIR%%/IceGrid/Descriptor.ice
 %%DATADIR%%/IceGrid/Exception.ice
 %%DATADIR%%/IceGrid/FileParser.ice
 %%DATADIR%%/IceGrid/Locator.ice
 %%DATADIR%%/IceGrid/Observer.ice
+%%DATADIR%%/IceGrid/PluginFacade.ice
 %%DATADIR%%/IceGrid/Query.ice
 %%DATADIR%%/IceGrid/Registry.ice
 %%DATADIR%%/IceGrid/Session.ice
 %%DATADIR%%/IceGrid/UserAccountMapper.ice
+%%DATADIR%%/IceLocatorDiscovery/IceLocatorDiscovery.ice
 %%DATADIR%%/IcePatch2/FileInfo.ice
 %%DATADIR%%/IcePatch2/FileServer.ice
 %%DATADIR%%/IceSSL/ConnectionInfo.ice
@@ -377,281 +381,7 @@ man/man1/transformdb.1.gz
 %%DATADIR%%/IceStorm/IceStorm.ice
 %%DATADIR%%/IceStorm/Metrics.ice
 %%DATADIR%%/LICENSE
-%%DATADIR%%/RELEASE_NOTES
-%%DATADIR%%/config/convertssl.py
-%%DATADIR%%/config/icegrid-slice.3.1.ice.gz
-%%DATADIR%%/config/icegrid-slice.3.2.ice.gz
-%%DATADIR%%/config/icegrid-slice.3.3.ice.gz
 %%DATADIR%%/config/icegrid-slice.3.5.ice.gz
+%%DATADIR%%/config/icegrid-slice.3.6.ice.gz
 %%DATADIR%%/config/templates.xml
-%%DATADIR%%/config/upgradeicegrid33.py
-%%DATADIR%%/config/upgradeicegrid35.py
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/BackgroundSaveEvictor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/CatalogData.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Connection.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/DatabaseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/DeadlockException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Evictor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/EvictorDeactivatedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/EvictorIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/IndexNotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/InvalidPositionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/NoSuchElementException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/NotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/ObjectRecord.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/ServantInitializer.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Statistics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Transaction.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionAlreadyInProgressException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionalEvictor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/CannotCreateSessionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/IdentitySet.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/PermissionDeniedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/PermissionsVerifier.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/Router.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SSLInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SSLPermissionsVerifier.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SSLSessionManager.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/Session.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SessionControl.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SessionManager.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SessionNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/StringSet.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AdapterAlreadyActiveException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AdapterNotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AlreadyRegisteredException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/BadMagicException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CloneNotImplementedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CloseConnectionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CloseTimeoutException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CollocationOptimizationException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Communicator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CommunicatorDestroyedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CompressionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectFailedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectTimeoutException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Connection.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionLostException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionNotValidatedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionRefusedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionTimeoutException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Current.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/DNSException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/DatagramLimitException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EncapsulationException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EncodingVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Endpoint.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointSelectionType.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointSelectionTypeParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/FacetNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/FeatureNotSupportedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/FileException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/FixedProxyException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ForcedCloseConnectionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IPConnectionInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IPEndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Identity.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IdentityParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IllegalIdentityException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IllegalMessageSizeException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ImplicitContext.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InitializationException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Instrumentation.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InvalidReplicaGroupIdException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Locator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/LocatorRegistry.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Logger.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/MarshalException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/MemoryLimitException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/NoEndpointException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/NoObjectFactoryException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/NotRegisteredException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectAdapter.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectAdapterDeactivatedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectAdapterIdInUseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectNotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/OpaqueEndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/OperationMode.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/OperationNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Plugin.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PluginInitializationException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PluginManager.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Process.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Properties.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PropertiesAdmin.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProtocolException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProtocolVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyUnmarshalException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/RequestFailedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ResponseSentException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Router.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SecurityException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ServantLocator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ServerNotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SocketException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Stats.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/StringConversionException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SyscallException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/TCPConnectionInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/TCPEndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/TimeoutException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/TwowayOnlyException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UDPConnectionInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UDPEndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnexpectedObjectException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownLocalException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownMessageException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownReplyStatusException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownRequestIdException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnknownUserException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnmarshalOutOfBoundsException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedEncodingException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedProtocolException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/VersionMismatchException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/VersionParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStartedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStoppedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/FailureException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/NoSuchServiceException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/Service.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/ServiceManager.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/ServiceObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AccessDeniedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterDynamicInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdaptiveLoadBalancingPolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Admin.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdminSession.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AllocationException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AllocationTimeoutException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationUpdateDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ApplicationUpdateInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/BadSignalException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/BoxedDistributionDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/BoxedString.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/CommunicatorDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/DbEnvDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/DeploymentException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/DistributionDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/FileIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/FileNotAvailableException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/FileParser.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/IceBoxDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadBalancingPolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadSample.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Locator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeDynamicInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeUnreachableException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeUpdateDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectExistsException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectNotRegisteredException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObserverAlreadyRegisteredException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/OrderedLoadBalancingPolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ParseException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PatchException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PermissionDeniedException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PropertyDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PropertySetDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Query.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RandomLoadBalancingPolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Registry.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryObserver.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryUnreachableException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ReplicaGroupDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RoundRobinLoadBalancingPolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerDynamicInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerInstanceDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerNotExistException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerStartException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerState.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerStopException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerUnreachableException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServiceDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServiceInstanceDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Session.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/TemplateDescriptor.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountMapper.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountNotFoundException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/ConnectionMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/DispatchMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/InvocationMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/Metrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/MetricsAdmin.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/MetricsFailures.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/RemoteMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/SessionMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/SubscriberMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/ThreadMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/TopicMetrics.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/UnknownMetricsView.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileAccessException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileServer.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/PartitionOutOfRangeException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceSSL.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceSSL/ConnectionInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceSSL/EndpointInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/AlreadySubscribed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/BadQoS.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/LinkExists.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/LinkInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/NoSuchLink.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/NoSuchTopic.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/Topic.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/TopicExists.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/TopicManager.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/_sindex.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/closed.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/collapseAll.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/expandAll.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/home.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/important.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/index.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/nextx.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/opened.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/prev.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/prevx.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/tip.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/up.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/upx.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js
+%%DATADIR%%/config/upgradeicegrid36.py
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 2aa6269f0c8c..58121aa291f7 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
 		slice2php:${PORTSDIR}/devel/ice
 LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
 
-OPTIONS_DEFINE=	DEBUG DOCS NAMESPACES
+OPTIONS_DEFINE=	DEBUG NAMESPACES
 OPTIONS_DEFAULT=
 NAMESPACES_DESC=	Use PHP namespaces (recommended)
 
@@ -25,7 +25,6 @@ MAKE_ARGS+=	PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
 		PHP_HOME=${LOCALBASE} OPTIMIZE=yes
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
-DEFAULT_PHP_VER=5
 IGNORE_WITH_PHP=52
 BUILD_WRKSRC=	${WRKSRC}/php
 INSTALL_WRKSRC=	${WRKSRC}/php
@@ -34,6 +33,7 @@ LIB_VRS=	${PORTVERSION:S|.||g:C|0$||}
 PHP_MODNAME?=	IcePHP
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 
 add-plist-info:
diff --git a/devel/php5-ice/pkg-plist b/devel/php5-ice/pkg-plist
index 8d0ee3337601..a351e5badb21 100644
--- a/devel/php5-ice/pkg-plist
+++ b/devel/php5-ice/pkg-plist
@@ -43,8 +43,6 @@ share/pear/Ice/PropertiesF.php
 share/pear/Ice/Router.php
 share/pear/Ice/RouterF.php
 share/pear/Ice/SliceChecksumDict.php
-share/pear/Ice/Stats.php
-share/pear/Ice/StatsF.php
 share/pear/Ice/Version.php
 share/pear/IceBox.php
 share/pear/IceBox/IceBox.php
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 4c932a1bbb6a..576446a3c5ee 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -9,17 +9,21 @@ COMMENT=	Ice (Internet Communications Engine) language mapping for Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
-		slice2py:${PORTSDIR}/devel/ice
+BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp
 LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
 
-USES=		python
+USES=		python shebangfix
 SLAVE_PORT=	yes
 MASTERDIR=	${.CURDIR}/../ice
 PLIST=		${.CURDIR}/pkg-plist
 
-BUILD_WRKSRC=	${WRKSRC}/py
-INSTALL_WRKSRC=	${WRKSRC}/py
+BUILD_WRKSRC=	${WRKSRC}/python
+INSTALL_WRKSRC=	${WRKSRC}/python
+
+SHEBANG_LANG=	python
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	${PYTHON_CMD}
+SHEBANG_FILES=	${BUILD_WRKSRC}/config/s2py.py
 
 MAKE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION}
 
@@ -28,15 +32,19 @@ PLIST_SUB=	LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 
 # bypass infrastructure bug (taken from www/py-django)
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-OPTIONS_DEFINE=	DEBUG DOCS TESTS
+OPTIONS_DEFINE=	DEBUG TESTS
 OPTIONS_DEFAULT=TESTS
 TESTS_DESC=	Run tests
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYSITEDIR}/Ice/*.so.*
 	${ECHO} "Ice" > ${STAGEDIR}${PYSITEDIR}/Ice.pth
 	@${FIND} ${STAGEDIR}${PYSITEDIR}/Ice \( -name "*.pyc" -or -name "*.pyo" \) \
 		-exec ${CHMOD} u+w {} \;
-	@${PYTHON_CMD} -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
-	@${PYTHON_CMD} -O -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
+	@${PYTHON_CMD} -m compileall -d ${PYSITEDIR}/Ice ${STAGEDIR}${PYSITEDIR}/Ice
+	@${PYTHON_CMD} -O -m compileall -d ${PYSITEDIR}/Ice ${STAGEDIR}${PYSITEDIR}/Ice
+	${INSTALL_MAN} ${WRKSRC}/man/man1/slice2py.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/config/s2py.py \
+		${STAGEDIR}${PREFIX}/bin/slice2py
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist
index 1657577239b4..364f20265f5e 100644
--- a/devel/py-ice/pkg-plist
+++ b/devel/py-ice/pkg-plist
@@ -131,10 +131,6 @@
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_ServantLocator_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_SliceChecksumDict_ice.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_SliceChecksumDict_ice.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_StatsF_ice.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_StatsF_ice.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Stats_ice.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Stats_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Version_ice.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Version_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Glacier2.pyc
@@ -269,10 +265,6 @@
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyc
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyo
-%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyc
-%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyo
-%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyc
-%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.pyc
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.pyo
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2.py
@@ -344,6 +336,6 @@
 %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.py
+bin/slice2py
+man/man1/slice2py.1.gz