Index: head/devel/ice/Makefile
===================================================================
--- head/devel/ice/Makefile	(revision 426169)
+++ head/devel/ice/Makefile	(revision 426170)
@@ -1,129 +1,130 @@
 # Created by: Stefan Ehmann <shoesoft@gmx.net>
 # $FreeBSD$
 
 PORTNAME=		Ice
 PORTVERSION=		3.6.3
+PORTREVISION=		1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
 MAINTAINER=		freebsd@grem.de
 COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
 
 LICENSE=		GPLv2
 
 SLAVE_PORT?=		no
 
 .if ${SLAVE_PORT} == "no"
 LIB_DEPENDS=		libexpat.so:textproc/expat2 \
 			libmcpp.so:devel/mcpp
 USES+=			ssl
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
 LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
 OPTIONS_DEFINE?=	DEBUG TEST
 
 .include <bsd.port.options.mk>
 
 USES+=			iconv gmake
 
 .if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
 USES+=			python:build
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib
 .endif
 
 WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
 
 USES+=			bdb:5
 INVALID_BDB_VER=	48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
 USE_GITHUB=		yes
 GH_ACCOUNT=		zeroc-ice
 
 
 CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
 
 .if !${PORT_OPTIONS:MDEBUG}
 CFLAGS+=		-DNDEBUG
 .endif
 
 .if ((${ARCH} != i386) && (${ARCH} != powerpc))
 MAKE_ENV+=		LP64=yes
 .endif
 
 .if !${PORT_OPTIONS:MTEST}
 MAKE_ENV+=		NOTESTS=yes
 .endif
 
 .if ${SLAVE_PORT} == "no"
 MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${LOCALBASE}
 PYSITEDIR=	${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||}
 .else
 PYSITEDIR=	${PYTHON_SITELIBDIR}
 .endif
 
 .if ${PORT_OPTIONS:MNAMESPACES}
 MAKE_ARGS+=	USE_NAMESPACES=yes
 PLIST_SUB+=	NAMESPACES=""
 PLIST_SUB+=	NONAMESPACES="@comment "
 .else
 PLIST_SUB+=	NAMESPACES="@comment "
 PLIST_SUB+=	NONAMESPACES=""
 .endif
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g; \
 		s|%%DATADIR%%|${STAGEDIR}${DATADIR}|g; \
 		s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g; \
 		s|%%ICONV_LIB%%|${ICONV_LIB}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \
 		s|%%OPENSSLINC%%|${OPENSSLINC}|g; \
 		s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g;' \
 		${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
 	@${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \
 		s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \
 		s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g; \
 		s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \
 		s|%%OPENSSLINC%%|${OPENSSLINC}|g; \
 		s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g; \
 		/install_docdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
 	@${REINPLACE_CMD} 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g;' \
 		${WRKSRC}/cpp/test/IceSSL/configuration/run.py
 	@${REINPLACE_CMD} '/install_configdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
 	@${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}/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
 
 do-test-TEST-on:
 	@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
 
 .if ${SLAVE_PORT} == "no"
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
===================================================================
--- head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp	(nonexistent)
+++ head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp	(revision 426170)
@@ -0,0 +1,26 @@
+--- cpp/src/IceGrid/ServerI.cpp.orig	2016-11-15 12:22:54.201742997 +0100
++++ cpp/src/IceGrid/ServerI.cpp	2016-11-15 12:48:01.409625996 +0100
+@@ -341,7 +341,22 @@
+         {
+             assert(_p->first.find("config_") == 0);
+             const string service = _p->first.substr(7);
+-            facet = "IceBox.Service." + service + ".Properties";
++            bool useSharedCommunicator = false;
++            for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d)
++            {
++                if (d->name == "IceBox.UseSharedCommunicator." + service)
++                {
++                   useSharedCommunicator = (atoi(d->value.c_str()) > 0);
++                }
++            }
++            if (useSharedCommunicator)
++            {
++                facet = "IceBox.SharedCommunicator.Properties";
++            }
++            else
++            {
++                facet = "IceBox.Service." + service + ".Properties";
++            }
+             if(_traceLevels->server > 1)
+             {
+                 const string id = _server->getId();

Property changes on: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property