diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile
index 5547efb53727..c49a9a177dc6 100644
--- a/devel/ice37/Makefile
+++ b/devel/ice37/Makefile
@@ -1,150 +1,145 @@
 PORTNAME=		Ice
-PORTVERSION=		3.7.2
-PORTREVISION=	1
+PORTVERSION=		3.7.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 PKGNAMESUFFIX?=		37
 
-# Fix ${WRKSRC}/python/config/Make.rules to allow build with Python 3.8
-PATCH_SITES=	https://github.com/zeroc-ice/ice/commit/
-PATCHFILES=	067fd319b37f0ebdb995b3771e7c0b8b6e2b55f1.patch:-p1
-
 MAINTAINER=		grembo@FreeBSD.org
 COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
 
 LICENSE=		GPLv2
 
 SLAVE_PORT?=		no
 CONFLICTS=		Ice py*-Ice php*-Ice
 
 .if ${SLAVE_PORT} == "no"
 LIB_DEPENDS=		libexpat.so:textproc/expat2 \
 			liblmdb.so:databases/lmdb \
 			libmcpp.so:devel/mcpp
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
 LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice37
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
 DESTDIRNAME=		NOT_USED # setting DESTDIR interferes with Ice's Makefiles
 
 OPTIONS_DEFINE?=	DEBUG STATIC TEST
 OPTIONS_SUB=		yes
 
 USES+=			compiler:c++14-lang iconv gmake
 DEBUG_MAKE_ENV=		OPTIMIZE=no
 TEST_ALL_TARGET_OFF=	srcs
 MAKE_ARGS+=		V=1
 
 CONFIGS=		shared
 
 .if ${SLAVE_PORT} == "no"
 USES+=			ssl
 CONFIGS+=		cpp11-shared
 STATIC_VARS=		configs+="static cpp11-static"
 TEST_USES=		python:build shebangfix
 TEST_VARS=		shebang_glob=*.py
 TEST_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.options.mk>
 
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
 USE_GITHUB=		yes
 GH_ACCOUNT=		zeroc-ice
 GH_PROJECT=		ice
 
 # determine if we are on a 64-bit arch
 .if ${ARCH:M*64*}
 MAKE_ENV+=		LP64=yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${LOCALBASE}
 PYSITEDIR=		${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||}
 .else
 PYSITEDIR=		${PYTHON_SITELIBDIR}
 .endif
 
 .if defined(PYTHON_VER) && (${PYTHON_VER} == "2.7" || ${PYTHON_VER} == "3.4")
 PLIST_SUB+=		PYTHONGT34="@comment "
 .else
 PLIST_SUB+=		PYTHONGT34=""
 .endif
 
 post-patch:
 	@${SED} 's|%%CONFIGS%%|${CONFIGS}|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|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%MANPREFIX%%|${STAGEDIR}${MANPREFIX}|g; \
 		s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \
 		s|%%OPENSSLINC%%|${OPENSSLINC}|g; \
 		s|%%PREFIX%%|${STAGEDIR}${PREFIX}|g;' \
 		${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/config/Make.rules.FreeBSD
 	@${REINPLACE_CMD} 's|%%CHMOD%%|${CHMOD}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%INSTALL_LIB%%|${INSTALL_LIB}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%MKDIR%%|${MKDIR}|g; \
 		s|%%MV%%|${MV}|g; \
 		s|%%RM%%|${RM}|g;' \
 		${WRKSRC}/config/Make.project.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|%%CHMOD%%|${CHMOD}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%INSTALL_LIB%%|${INSTALL_LIB}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%MKDIR%%|${MKDIR}|g; \
 		s|%%MV%%|${MV}|g; \
 		s|%%RM%%|${RM}|g;' \
 		${WRKSRC}/python/python/Makefile
 	@${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%PREFIX%%|${PREFIX}|g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/php/Makefile
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g;' \
 		${WRKSRC}/scripts/Util.py
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g;' \
 		${WRKSRC}/scripts/Glacier2Util.py
 
 IS_JAILED_CMD=		${SYSCTL} -n security.jail.jailed
 JAILED_FILTER=		--rfilter=IceDiscovery \
 			--rfilter=priority \
 			--rfilter=threadPoolPriority \
 			--rfilter=udp
 
 do-test-TEST-on:
 .for CONFIG in ${CONFIGS}
 	@${ECHO} Testing configuration ${CONFIG}
 	cd ${BUILD_WRKSRC} && \
 		${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ./allTests.py \
 		--config=${CONFIG} \
 		$$(${TEST} $$(${IS_JAILED_CMD}) -eq 1 \
 			&& ${ECHO} ${JAILED_FILTER})
 .endfor
 
 .if ${SLAVE_PORT} == "no"
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 	@cd ${WRKSRC} && ${GMAKE} install-doc install-slice
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/ice37/distinfo b/devel/ice37/distinfo
index 31010fff478f..00a3e36b5262 100644
--- a/devel/ice37/distinfo
+++ b/devel/ice37/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1617032905
-SHA256 (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9
-SIZE (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = 9427121
-SHA256 (067fd319b37f0ebdb995b3771e7c0b8b6e2b55f1.patch) = c9186f79236968030b169f5649c5b35ec3b16210fb3949c9660014c878680421
-SIZE (067fd319b37f0ebdb995b3771e7c0b8b6e2b55f1.patch) = 1912
+TIMESTAMP = 1642272308
+SHA256 (zeroc-ice-ice-v3.7.6_GH0.tar.gz) = 75b18697c0c74f363bd0b85943f15638736e859c26778337cbfe72d31f5cfb47
+SIZE (zeroc-ice-ice-v3.7.6_GH0.tar.gz) = 10652936
+SHA256 (067fd319b37f0ebdb995b3771e7c0b8b6e2b55f1.patch) = b63312229fa59650fdb7fe7a6666900c26685d9eb34ced357909c2e2abe34ee7
+SIZE (067fd319b37f0ebdb995b3771e7c0b8b6e2b55f1.patch) = 1916
diff --git a/devel/ice37/files/patch-config-Make.project.rules b/devel/ice37/files/patch-config-Make.project.rules
index afb1637630bc..6c1ba4238058 100644
--- a/devel/ice37/files/patch-config-Make.project.rules
+++ b/devel/ice37/files/patch-config-Make.project.rules
@@ -1,64 +1,64 @@
---- config/Make.project.rules.orig	2018-04-20 15:02:08 UTC
+--- config/Make.project.rules.orig	2021-06-21 14:44:58 UTC
 +++ config/Make.project.rules
-@@ -48,17 +48,16 @@ component-configs       = $(call unique,
+@@ -43,17 +43,16 @@ component-configs       = $(call unique,$(foreach c,$(
  #
  # Some variables for utilities
  #
--INSTALL                 = install -p
--MV                      = mv -f
--RM                      = rm -f
--MKDIR                   = mkdir
--CHMOD                   = chmod
+-INSTALL                 ?= install -p
+-MV                      ?= mv -f
+-RM                      ?= rm -f
+-MKDIR                   ?= mkdir
+-CHMOD                   ?= chmod
 +MV                      = /bin/mv
 +RM                      = /bin/rm -f
 +MKDIR                   = /bin/mkdir -p
 +CHMOD                   = /bin/chmod
  
  Q                       := $(if $(V),,@)
  E                       := $(if $(V),@:,@echo)
  
  # $(call install-data,$1=filename,$2=srcdir,$3=destdist)
 -install-data            = $(INSTALL) -m 644 $2/$1 $(DESTDIR)$3/$1
 +install-data            = %%INSTALL_DATA%% $2/$1 $(DESTDIR)$3/$1
  
  #
  # $(call install-data-files,$1=files,$2=$srcdir,$3=$destdir,$4=target,$5=text-output)
-@@ -218,7 +217,7 @@ endef
+@@ -213,7 +212,7 @@ endef
  define install-static-library
  $(DESTDIR)$5/$(call mklibname,$1,$3,$4): $2/$(call mklibname,$1,$3,$4) | $(DESTDIR)$5
  	$(E) "Installing $$@"
 -	$(Q)$(INSTALL) $$< $(DESTDIR)$5
 +	$(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5
  endef
  
  # $(call get-static-library-targets,$1=libname,$2=libdir,$3=version,$4=soversion,$5=devinstall)
-@@ -254,8 +253,7 @@ define install-shared-library
+@@ -249,8 +248,7 @@ define install-shared-library
  
  $(DESTDIR)$5/$(call mkshlibfilename,$1,$3,$4): $2/$(call mkshlibfilename,$1,$3,$4) | $(DESTDIR)$5
  	$(E) "Installing $$@"
 -	$(Q)$(INSTALL) $$< $(DESTDIR)$5
 -	$(Q)$(CHMOD) a+rx $$@
 +	$(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5
  
  ifneq ($(and $4,$(filter-out undefined,$(origin mksoname))),)
  $(DESTDIR)$5/$(call mksoname,$1,$3,$4): $(DESTDIR)$5/$(call mkshlibfilename,$1,$3,$4) \
-@@ -295,8 +293,7 @@ endef
+@@ -289,8 +287,7 @@ endef
  define install-shared-module
  $(DESTDIR)$5/$1: $2/$1 | $(DESTDIR)$5
  	$(E) "Installing $$@"
 -	$(Q)$(INSTALL) $$< $(DESTDIR)$5
 -	$(Q)$(CHMOD) a+rx $$@
 +	$(Q)%%INSTALL_LIB%% $$< $(DESTDIR)$5
  endef
  
  # $(call get-shared-module-targets,$1=libname,$2=libdir,$3=version,$4=soversion,$5=devinstall)
-@@ -320,8 +317,7 @@ endef
+@@ -314,8 +311,7 @@ endef
  define install-program
  $(DESTDIR)$5/$1$(EXE_EXT): $2/$1$(EXE_EXT) | $(DESTDIR)$5
  	$(E) "Installing $$@"
 -	$(Q)$(INSTALL) $$< $(DESTDIR)$5
 -	$(Q)$(CHMOD) a+rx $$@
 +	$(Q)%%INSTALL_PROGRAM%% $$< $(DESTDIR)$5
  endef
  
  # $(call get-program-targets,$1=exename,$2=bindir,$3=version,$4=soversion,$5=devinstall)
diff --git a/devel/ice37/files/patch-config-Make.rules b/devel/ice37/files/patch-config-Make.rules
index 92b0ad0d59b7..d216f7a4ac23 100644
--- a/devel/ice37/files/patch-config-Make.rules
+++ b/devel/ice37/files/patch-config-Make.rules
@@ -1,11 +1,11 @@
---- config/Make.rules.orig	2018-04-20 15:02:08 UTC
+--- config/Make.rules.orig	2021-06-21 14:44:58 UTC
 +++ config/Make.rules
-@@ -150,7 +150,7 @@ slicedir                = $(if $(use-bin
+@@ -151,7 +151,7 @@ slicedir                = $(if $(use-bin-dist),$(ice_s
  sdkdir                  = $(if $(use-bin-dist),$(ice_home)/sdk,$(top_srcdir)/sdk)
  srcdir                  = $(call mappingdir,$(or $1,$(currentdir)),src)
  
 -usr_dir_install         := $(or $(filter yes,$(USR_DIR_INSTALL)),$(filter /usr%,$(prefix)))
 +#usr_dir_install         := $(or $(filter yes,$(USR_DIR_INSTALL)),$(filter /usr%,$(prefix)))
  install_bindir          ?= $(prefix)/bin
  install_libdir          ?= $(prefix)/lib
  install_slicedir        ?= $(prefix)$(if $(usr_dir_install),/share/ice)/slice
diff --git a/devel/ice37/files/patch-cpp-include-IceUtil-Config.h b/devel/ice37/files/patch-cpp-include-IceUtil-Config.h
index 743bbb2a7c13..e78b3d453d1e 100644
--- a/devel/ice37/files/patch-cpp-include-IceUtil-Config.h
+++ b/devel/ice37/files/patch-cpp-include-IceUtil-Config.h
@@ -1,20 +1,20 @@
---- cpp/include/IceUtil/Config.h.orig	2018-04-20 15:02:08 UTC
+--- cpp/include/IceUtil/Config.h.orig	2021-06-21 14:44:58 UTC
 +++ cpp/include/IceUtil/Config.h
-@@ -80,13 +80,15 @@
+@@ -78,13 +78,15 @@
      //
  #   include <stdint.h>
  
 -#   if defined(__WORDSIZE) && (__WORDSIZE == 64)
 +#   if (__cplusplus >= 201103L) && defined(__WORDSIZE) && (__WORDSIZE == 64)
  #      define ICE_64
 -#   elif defined(__WORDSIZE) && (__WORDSIZE == 32)
 +#   elif (__cplusplus >= 201103L) && defined(__WORDSIZE) && (__WORDSIZE == 32)
  #      define ICE_32
  #   elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64))  || \
-          defined(__linux) && defined(__x86_64)                        || \
+          defined(__linux__) && defined(__x86_64)                      || \
           defined(__APPLE__) && defined(__x86_64)                      || \
 +         defined(__FreeBSD__) && defined(__x86_64)                    || \
 +         defined(__FreeBSD__) && defined(__LP64__)                    || \
           defined(__hppa) && defined(__LP64__)                         || \
           defined(_ARCH_COM) && defined(__64BIT__)                     || \
           defined(__alpha__)                                           || \
diff --git a/devel/ice37/files/patch-cpp-src-Ice-ProxyFactory.cpp b/devel/ice37/files/patch-cpp-src-Ice-ProxyFactory.cpp
index 80d813663345..17b4b01eaf97 100644
--- a/devel/ice37/files/patch-cpp-src-Ice-ProxyFactory.cpp
+++ b/devel/ice37/files/patch-cpp-src-Ice-ProxyFactory.cpp
@@ -1,10 +1,10 @@
---- cpp/src/Ice/ProxyFactory.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/src/Ice/ProxyFactory.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/src/Ice/ProxyFactory.cpp
-@@ -233,6 +233,7 @@ IceInternal::ProxyFactory::checkRetryAft
+@@ -237,6 +237,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(co
      }
      else if(cnt > static_cast<int>(_retryIntervals.size()))
      {
 +        interval = 0; // apeace compiler
          if(traceLevels->retry >= 1)
          {
              Trace out(logger, traceLevels->retryCat);
diff --git a/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp b/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
index 21714728ccd1..3bd93a474d32 100644
--- a/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
+++ b/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
@@ -1,15 +1,15 @@
---- cpp/src/Ice/Thread.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/src/Ice/Thread.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/src/Ice/Thread.cpp
-@@ -720,6 +720,12 @@ IceUtil::Thread::start(size_t stackSize,
+@@ -724,6 +724,12 @@ IceUtil::Thread::start(size_t stackSize, bool realtime
              stackSize = stackSize / 4096 * 4096 + 4096;
          }
  #endif
 +#if defined(__FreeBSD__)
 +        if(stackSize < 16384)
 +        {
 +            stackSize = 16384;
 +        }
 +#endif
          rc = pthread_attr_setstacksize(&attr, stackSize);
          if(rc != 0)
          {
diff --git a/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp b/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp
new file mode 100644
index 000000000000..c5eeed90796c
--- /dev/null
+++ b/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp
@@ -0,0 +1,23 @@
+--- cpp/src/Ice/ThreadPool.cpp.orig	2021-06-21 14:44:58 UTC
++++ cpp/src/Ice/ThreadPool.cpp
+@@ -17,6 +17,10 @@
+ #   include <Ice/StringConverter.h>
+ #endif
+ 
++#if defined(__FreeBSD__)
++#   include <sys/sysctl.h>
++#endif
++
+ using namespace std;
+ using namespace Ice;
+ using namespace Ice::Instrumentation;
+@@ -303,8 +307,8 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr&
+     int nProcessors = sysInfo.dwNumberOfProcessors;
+ #   elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+     static int ncpu[2] = { CTL_HW, HW_NCPU };
+-    size_t sz = sizeof(nProcessors);
+     int nProcessors;
++    size_t sz = sizeof(nProcessors);
+     if(sysctl(ncpu, 2, &nProcessors, &sz, 0, 0) == -1)
+     {
+         nProcessors = 1;
diff --git a/devel/ice37/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp b/devel/ice37/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
index cadd284f3d60..ace6dc36ed27 100644
--- a/devel/ice37/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
+++ b/devel/ice37/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
@@ -1,23 +1,23 @@
---- cpp/src/IceGrid/PluginFacadeI.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/src/IceGrid/PluginFacadeI.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/src/IceGrid/PluginFacadeI.cpp
-@@ -34,10 +34,16 @@ public:
+@@ -29,10 +29,16 @@ class Init (public)
          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/ice37/files/patch-cpp-src-IceGrid-RegistryI.cpp b/devel/ice37/files/patch-cpp-src-IceGrid-RegistryI.cpp
index afa418cdeb94..24999e88883a 100644
--- a/devel/ice37/files/patch-cpp-src-IceGrid-RegistryI.cpp
+++ b/devel/ice37/files/patch-cpp-src-IceGrid-RegistryI.cpp
@@ -1,24 +1,24 @@
---- cpp/src/IceGrid/RegistryI.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/src/IceGrid/RegistryI.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/src/IceGrid/RegistryI.cpp
-@@ -46,6 +46,13 @@ using namespace std;
+@@ -41,6 +41,13 @@ using namespace std;
  using namespace Ice;
  using namespace IceGrid;
  
 +namespace IceGrid
 +{
 +
 +ICEGRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
 +
 +}
 +
  namespace
  {
  
-@@ -183,6 +190,7 @@ RegistryI::RegistryI(const CommunicatorP
+@@ -178,6 +185,7 @@ RegistryI::RegistryI(const CommunicatorPtr& communicat
  
  RegistryI::~RegistryI()
  {
 +    IceGrid::setRegistryPluginFacade(0);
  }
  
  bool
diff --git a/devel/ice37/files/patch-cpp-src-IceStorm-Replica.h b/devel/ice37/files/patch-cpp-src-IceStorm-Replica.h
new file mode 100644
index 000000000000..82d60fdf8a29
--- /dev/null
+++ b/devel/ice37/files/patch-cpp-src-IceStorm-Replica.h
@@ -0,0 +1,11 @@
+--- cpp/src/IceStorm/Replica.h.orig	2021-06-21 14:44:58 UTC
++++ cpp/src/IceStorm/Replica.h
+@@ -23,7 +23,7 @@ struct GroupNodeInfo
+     //
+ #if defined(__clang__) && defined(_LIBCPP_VERSION)
+ #   ifdef ICE_CPP11_COMPILER
+-    GroupNodeInfo(const GroupNodeInfo&);
++    GroupNodeInfo(const GroupNodeInfo&) = default;
+ #   endif
+     GroupNodeInfo& operator=(const GroupNodeInfo&);
+ #endif
diff --git a/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp b/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp
index 0c3fc64ae6b6..b75846bfa295 100644
--- a/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp
+++ b/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp
@@ -1,25 +1,25 @@
---- cpp/test/Glacier2/ssl/Server.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Glacier2/ssl/Server.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Glacier2/ssl/Server.cpp
-@@ -35,9 +35,9 @@ void testContext(bool ssl, const Ice::Co
-         port << getTestPort(communicator->getProperties(), 1);
+@@ -31,9 +31,9 @@ void testContext(bool ssl, const Ice::CommunicatorPtr&
+         port << TestHelper::getTestPort(communicator->getProperties(), 1);
          test(ctx["_con.localPort"] == port.str());
      }
 -    test(ctx["_con.localAddress"] == "127.0.0.1");
 +    test(ctx["_con.localAddress"] == "127.0.0.1" || inFreeBSDJail());
      test(ctx["_con.remotePort"] != "");
 -    test(ctx["_con.remoteAddress"] == "127.0.0.1");
 +    test(ctx["_con.remoteAddress"] == "127.0.0.1" || inFreeBSDJail());
  }
  
  }
-@@ -129,8 +129,8 @@ public:
+@@ -125,8 +125,8 @@ class SSLSessionManagerI : public Glacier2::SSLSession
      {
          testContext(true, current.adapter->getCommunicator(), current.ctx);
  
 -        test(info.remoteHost == "127.0.0.1");
 -        test(info.localHost == "127.0.0.1");
 +        test(info.remoteHost == "127.0.0.1" || inFreeBSDJail());
 +        test(info.localHost == "127.0.0.1" || inFreeBSDJail());
          test(info.localPort == TestHelper::getTestPort(current.adapter->getCommunicator()->getProperties(), 1));
  
          try
diff --git a/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp b/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
index ec7d5f6f85dd..81ecd3d7d9ad 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
@@ -1,40 +1,40 @@
---- cpp/test/Ice/info/AllTests.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Ice/info/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Ice/info/AllTests.cpp
-@@ -129,13 +129,13 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -125,13 +125,13 @@ allTests(Test::TestHelper* helper)
              test(ipEndpoint);
              test(ipEndpoint->type() == Ice::TCPEndpointType || ipEndpoint->type() == Ice::SSLEndpointType ||
                  ipEndpoint->type() == Ice::WSEndpointType || ipEndpoint->type() == Ice::WSSEndpointType);
 -            test(ipEndpoint->host == "127.0.0.1");
 +            test(ipEndpoint->host == "127.0.0.1" || inFreeBSDJail());
              test(ipEndpoint->port > 0);
              test(ipEndpoint->timeout == 15000);
  
              Ice::UDPEndpointInfoPtr udpEndpoint = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, endpoints[1]->getInfo());
              test(udpEndpoint);
 -            test(udpEndpoint->host == "127.0.0.1");
 +            test(udpEndpoint->host == "127.0.0.1" || inFreeBSDJail());
              test(udpEndpoint->datagram());
              test(udpEndpoint->port > 0);
  
-@@ -218,8 +218,8 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -214,8 +214,8 @@ allTests(Test::TestHelper* helper)
          test(info->remotePort == port);
          if(defaultHost == "127.0.0.1")
          {
 -            test(info->remoteAddress == defaultHost);
 -            test(info->localAddress == defaultHost);
 +            test(info->remoteAddress == defaultHost || inFreeBSDJail());
 +            test(info->localAddress == defaultHost || inFreeBSDJail());
          }
  #if !defined(ICE_OS_UWP)
          test(info->rcvSize >= 1024);
-@@ -279,8 +279,8 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -275,8 +275,8 @@ allTests(Test::TestHelper* helper)
          test(udpinfo->remotePort == port);
          if(defaultHost == "127.0.0.1")
          {
 -            test(udpinfo->remoteAddress == defaultHost);
 -            test(udpinfo->localAddress == defaultHost);
 +            test(udpinfo->remoteAddress == defaultHost || inFreeBSDJail());
 +            test(udpinfo->localAddress == defaultHost || inFreeBSDJail());
          }
  
  #if !defined(ICE_OS_UWP)
diff --git a/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp b/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
index dde1aa63ced3..56c6ba8766ab 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
@@ -1,50 +1,50 @@
---- cpp/test/Ice/metrics/AllTests.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Ice/metrics/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Ice/metrics/AllTests.cpp
-@@ -712,9 +712,12 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -858,9 +858,12 @@ allTests(Test::TestHelper* helper, const CommunicatorO
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "incoming", "false");
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "adapterName", "");
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "connectionId", "Con1");
 -        testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localHost", host);
 -        //testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localPort", "");
 -        testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remoteHost", host);
 +        if (!inFreeBSDJail())
 +        {
 +            testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localHost", host);
 +            //testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localPort", "");
 +            testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remoteHost", host);
 +        }
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remotePort", port);
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "mcastHost", "");
          testAttribute(clientMetrics, clientProps, update.get(), "Connection", "mcastPort", "");
-@@ -803,7 +806,7 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -949,7 +952,7 @@ allTests(Test::TestHelper* helper, const CommunicatorO
          bool dnsException = false;
          try
          {
 -            communicator->stringToProxy("test:tcp -t 500 -h unknownfoo.zeroc.com -p " + port)->ice_ping();
 +            communicator->stringToProxy("test:tcp -t 500 -h unknownhost9999.example.org -p " + port)->ice_ping();
              test(false);
          }
          catch(const Ice::DNSException&)
-@@ -816,7 +819,7 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -962,7 +965,7 @@ allTests(Test::TestHelper* helper, const CommunicatorO
          }
          test(clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"].size() == 2);
          m1 = clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"][1];
 -        test(m1->id == "tcp -h unknownfoo.zeroc.com -p " + port + " -t 500" && m1->total == 2 &&
 +        test(m1->id == "tcp -h unknownhost9999.example.org -p " + port + " -t 500" && m1->total == 2 &&
               (!dnsException || m1->failures == 2));
          if(dnsException)
          {
-@@ -947,9 +950,11 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -1093,9 +1096,11 @@ allTests(Test::TestHelper* helper, const CommunicatorO
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "incoming", "true", op);
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "adapterName", "TestAdapter", op);
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "connectionId", "", op);
 -        testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localHost", host, op);
 +        if (!inFreeBSDJail())
 +            testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localHost", host, op);
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localPort", port, op);
 -        testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remoteHost", host, op);
 +        if (!inFreeBSDJail())
 +            testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remoteHost", host, op);
          //testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remotePort", port, op);
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "mcastHost", "", op);
          testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "mcastPort", "", op);
diff --git a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-AllTests.cpp b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-AllTests.cpp
index 8dd6993a3603..c70bd8395fe7 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-AllTests.cpp
@@ -1,11 +1,11 @@
---- cpp/test/Ice/threadPoolPriority/AllTests.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Ice/threadPoolPriority/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Ice/threadPoolPriority/AllTests.cpp
-@@ -30,7 +30,7 @@ allTests(const Ice::CommunicatorPtr& com
+@@ -26,7 +26,7 @@ allTests(Test::TestHelper* helper)
  #ifdef _WIN32
          test(1 == priority->getPriority());
  #else
 -        test(50 == priority->getPriority());
 +        test(31 == priority->getPriority());
  #endif
      }
      catch(...)
diff --git a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-Server.cpp b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-Server.cpp
index a5ab3dcd00d9..0a71a898c603 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-Server.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-Server.cpp
@@ -1,11 +1,11 @@
---- cpp/test/Ice/threadPoolPriority/Server.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Ice/threadPoolPriority/Server.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Ice/threadPoolPriority/Server.cpp
-@@ -43,7 +43,7 @@ run(int, char**, const Ice::Communicator
+@@ -46,7 +46,7 @@ Server::run(int argc, char** argv)
  #ifdef _WIN32
      communicator->getProperties()->setProperty("Ice.ThreadPool.Server.ThreadPriority", "1");
  #else
 -    communicator->getProperties()->setProperty("Ice.ThreadPool.Server.ThreadPriority", "50");
 +    communicator->getProperties()->setProperty("Ice.ThreadPool.Server.ThreadPriority", "31");
  #endif
  
      Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
diff --git a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-ServerCustomThreadPool.cpp b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-ServerCustomThreadPool.cpp
index 9ee38ed0c75c..052e07920dd6 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-ServerCustomThreadPool.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-threadPoolPriority-ServerCustomThreadPool.cpp
@@ -1,11 +1,11 @@
---- cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
-@@ -48,7 +48,7 @@ run(int, char**, const Ice::Communicator
+@@ -51,7 +51,7 @@ ServerCustomThreadPool::run(int argc, char** argv)
      communicator->getProperties()->setProperty("TestAdapter.ThreadPool.ThreadPriority", "1");
  #else
      communicator->getProperties()->setProperty("Ice.ThreadPool.Server.ThreadPriority", "10");
 -    communicator->getProperties()->setProperty("TestAdapter.ThreadPool.ThreadPriority", "50");
 +    communicator->getProperties()->setProperty("TestAdapter.ThreadPool.ThreadPriority", "31");
  #endif
      Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
      Ice::ObjectPtr object = ICE_MAKE_SHARED(PriorityI, adapter);
diff --git a/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp b/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
index a9951417629e..3058341ece46 100644
--- a/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@@ -1,54 +1,30 @@
---- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/IceSSL/configuration/AllTests.cpp
-@@ -741,7 +741,11 @@ allTests(const CommunicatorPtr& communic
+@@ -743,7 +743,11 @@ allTests(Test::TestHelper* helper, const string& /*tes
          openSSLVersion = plugin->getOpenSSLVersion();
          comm->destroy();
      }
 +#  if defined(LIBRESSL_VERSION_NUMBER)
 +    const string anonCiphers = "ADH";
 +#  else
      const string anonCiphers = openSSLVersion >= 0x10100000L ? "ADH:@SECLEVEL=0" : "ADH";
 +#  endif
  #endif
  
      IceSSL::ConnectionInfoPtr info;
-@@ -2655,6 +2659,7 @@ allTests(const CommunicatorPtr& communic
-     // This is fixed in 10.11.3
-     if(!elCapitanUpdate2OrLower)
+@@ -2681,6 +2685,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
+     }
+ 
      {
 +#if !defined(LIBRESSL_VERSION_NUMBER)
          //
          // This should fail because we disabled all anonymous ciphers and the server doesn't
          // provide a certificate.
-@@ -2692,6 +2697,7 @@ allTests(const CommunicatorPtr& communic
+@@ -2718,6 +2723,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
          }
          fact->destroyServer(server);
          comm->destroy();
 +#endif
      }
  #    ifdef ICE_USE_SECURE_TRANSPORT
      {
-@@ -2843,7 +2849,7 @@ allTests(const CommunicatorPtr& communic
-     //
-     // No DSA support in Secure Transport / AIX 7.1
-     //
--#  if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL)
-+#  if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) && !defined(LIBRESSL_VERSION_NUMBER)
-     {
-         //
-         // DSA PEM keys are not supported with SChannel. Since Windows 10
-@@ -4165,6 +4171,7 @@ allTests(const CommunicatorPtr& communic
- #endif
-     }
- 
-+#if 0
- #if !defined(_AIX) && !defined(ICE_OS_UWP) && !(defined(_WIN32) && defined(ICE_USE_OPENSSL))
-     //
-     // On AIX 6.1, the default root certificates don't validate demo.zeroc.com.
-@@ -4279,5 +4286,6 @@ allTests(const CommunicatorPtr& communic
-     }
-     cout << "ok" << endl;
- #endif
-+#endif
-     return factory;
- }
diff --git a/devel/ice37/files/patch-cpp-test-IceStorm-single-test.py b/devel/ice37/files/patch-cpp-test-IceStorm-single-test.py
deleted file mode 100644
index 4014f670bcf9..000000000000
--- a/devel/ice37/files/patch-cpp-test-IceStorm-single-test.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- cpp/test/IceStorm/single/test.py.orig	2018-08-27 01:10:47 UTC
-+++ cpp/test/IceStorm/single/test.py
-@@ -15,12 +15,12 @@
- # send buffer size (causing the received messages to be truncated). See
- # bug #6070 and #7558.
- #
--props = { "Ice.UDP.SndSize" : 2048 * 1024, "Ice.Warn.Dispatch" : 0 }
-+props = { "Ice.UDP.SndSize" : 512 * 1024, "Ice.Warn.Dispatch" : 0 }
- persistent = IceStorm(props = props)
- transient = IceStorm(props = props, transient=True)
- replicated = [ IceStorm(replica=i, nreplicas=3, props = props) for i in range(0,3) ]
- 
--sub = Subscriber(args=["{testcase.parent.name}"], props = { "Ice.UDP.RcvSize" : 4096 * 1024 }, readyCount=3)
-+sub = Subscriber(args=["{testcase.parent.name}"], props = { "Ice.UDP.RcvSize" : 1024 * 1024 }, readyCount=3)
- pub = Publisher(args=["{testcase.parent.name}"])
- 
- class IceStormSingleTestCase(IceStormTestCase):
diff --git a/devel/ice37/files/patch-cpp-test-IceUtil-priority-PriorityInversion.cpp b/devel/ice37/files/patch-cpp-test-IceUtil-priority-PriorityInversion.cpp
index 9e629463b17a..84b30979c7cc 100644
--- a/devel/ice37/files/patch-cpp-test-IceUtil-priority-PriorityInversion.cpp
+++ b/devel/ice37/files/patch-cpp-test-IceUtil-priority-PriorityInversion.cpp
@@ -1,13 +1,13 @@
---- cpp/test/IceUtil/priority/PriorityInversion.cpp.orig	2018-04-20 15:02:08 UTC
+--- cpp/test/IceUtil/priority/PriorityInversion.cpp.orig	2021-06-21 14:44:58 UTC
 +++ cpp/test/IceUtil/priority/PriorityInversion.cpp
-@@ -342,8 +342,8 @@ PriorityInversionTest::run()
+@@ -338,8 +338,8 @@ PriorityInversionTest::run()
          return; // Mutex protocol PrioInherit not supported
      }
      cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
 -    high = 45;
 -    medium = 35;
 +    high = 31;
 +    medium = 15;
      low = 1;
- #endif
  
+     {
diff --git a/devel/ice37/files/patch-cpp-test-Slice-unicodePaths-test.py b/devel/ice37/files/patch-cpp-test-Slice-unicodePaths-test.py
index 848dc24d3d06..b9b90f287dc6 100644
--- a/devel/ice37/files/patch-cpp-test-Slice-unicodePaths-test.py
+++ b/devel/ice37/files/patch-cpp-test-Slice-unicodePaths-test.py
@@ -1,11 +1,11 @@
---- cpp/test/Slice/unicodePaths/test.py.orig	2018-08-27 01:10:47 UTC
+--- cpp/test/Slice/unicodePaths/test.py.orig	2022-01-15 23:22:20 UTC
 +++ cpp/test/Slice/unicodePaths/test.py
-@@ -14,7 +14,7 @@ class SliceUnicodePathsTestCase(ClientTe
+@@ -9,7 +9,7 @@ class SliceUnicodePathsTestCase(ClientTestCase):
  
      def runClientSide(self, current):
  
 -        if isinstance(platform, Linux) or isinstance(platform, AIX):
 +        if isinstance(platform, Linux) or isinstance(platform, AIX) or isinstance(platform, FreeBSD):
              encoding = locale.getdefaultlocale()[1]
              if encoding != "UTF-8":
                  current.writeln("Please set LC_ALL to xx_xx.UTF-8, for example FR_FR.UTF-8")
diff --git a/devel/ice37/files/patch-cpp-test-include-TestHelper.h b/devel/ice37/files/patch-cpp-test-include-TestHelper.h
index 3ccbef2f6a7a..008bdd729e5e 100644
--- a/devel/ice37/files/patch-cpp-test-include-TestHelper.h
+++ b/devel/ice37/files/patch-cpp-test-include-TestHelper.h
@@ -1,23 +1,23 @@
---- cpp/test/include/TestHelper.h.orig	2019-02-11 14:02:41.681160000 +0100
-+++ cpp/test/include/TestHelper.h	2019-02-11 16:04:38.557681000 +0100
-@@ -199,4 +199,20 @@
+--- cpp/test/include/TestHelper.h.orig	2021-06-21 14:44:58 UTC
++++ cpp/test/include/TestHelper.h
+@@ -199,4 +199,20 @@ runTest(int argc, char* argv[])
  
  #define test(ex) ((ex) ? ((void)0) : ::Test::testFailed(#ex, __FILE__, __LINE__))
  
 +#if defined(__FreeBSD__)
 +extern "C" { int sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
 +                 const void *newp, size_t newlen); }
 +inline bool inFreeBSDJail()
 +{
 +    int jailed;
 +    size_t size = sizeof(jailed);
 +    return (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) != -1 || jailed);
 +}
 +#else
 +inline bool inFreeBSDJail()
 +{
 +    return false;
 +}
 +#endif
 +
  #endif
diff --git a/devel/ice37/files/patch-php-Makefile b/devel/ice37/files/patch-php-Makefile
index d038b70d2560..fd5028b54af0 100644
--- a/devel/ice37/files/patch-php-Makefile
+++ b/devel/ice37/files/patch-php-Makefile
@@ -1,28 +1,28 @@
---- php/Makefile.orig	2018-04-20 15:02:08 UTC
+--- php/Makefile.orig	2021-06-21 14:44:58 UTC
 +++ php/Makefile
-@@ -15,8 +15,8 @@ include $(top_srcdir)/config/Make.rules
+@@ -10,8 +10,8 @@ include $(top_srcdir)/config/Make.rules
  #
  # Load C++ dependencies
  #
 -$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2php))
 -$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceDiscovery IceLocatorDiscovery)))
 +#$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2php))
 +#$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceDiscovery IceLocatorDiscovery)))
  
  #
  # Load php rules after loading C++ dependencies
-@@ -44,11 +44,11 @@ $(call make-projects,$(projects))
+@@ -39,11 +39,11 @@ $(call make-projects,$(projects))
  
  install:: | $(DESTDIR)$(install_phpdir)
  	$(E) "Installing generated code"
 -	$(Q)$(INSTALL) -m 644 lib/Glacier2.php  lib/IceBox.php  lib/IceGrid.php lib/IcePatch2.php lib/IceStorm.php $(DESTDIR)$(install_phpdir)
 +	$(Q)%%INSTALL_DATA%% lib/Glacier2.php  lib/IceBox.php  lib/IceGrid.php lib/IcePatch2.php lib/IceStorm.php $(DESTDIR)$(install_phpdir)
  ifeq ($(USE_NAMESPACES),no)
 -	$(Q)$(INSTALL) -m 644 lib/Ice_no_ns.php $(DESTDIR)$(install_phpdir)/Ice.php
 +	$(Q)%%INSTALL_DATA%% lib/Ice_no_ns.php $(DESTDIR)$(install_phpdir)/Ice.php
  else
 -	$(Q)$(INSTALL) -m 644 lib/Ice_ns.php $(DESTDIR)$(install_phpdir)/Ice.php
 +	$(Q)%%INSTALL_DATA%% lib/Ice_ns.php $(DESTDIR)$(install_phpdir)/Ice.php
  endif
  
  $(eval $(call make-php-package,$(slicedir),lib,Ice))
diff --git a/devel/ice37/files/patch-php-config-Make.rules b/devel/ice37/files/patch-php-config-Make.rules
index aa92a5b380b6..9076196cc46e 100644
--- a/devel/ice37/files/patch-php-config-Make.rules
+++ b/devel/ice37/files/patch-php-config-Make.rules
@@ -1,13 +1,13 @@
---- php/config/Make.rules.orig	2018-04-20 15:02:08 UTC
+--- php/config/Make.rules.orig	2021-06-21 14:44:58 UTC
 +++ php/config/Make.rules
-@@ -23,6 +23,10 @@ USE_NAMESPACES  ?= yes
+@@ -18,6 +18,10 @@ USE_NAMESPACES  ?= yes
  # Don't change anything below this line!
  # ----------------------------------------------------------------------
  
 +slice2php_path		= $(localbase)/bin/slice2php
 +install_phpdir          = $(prefix)/share/pear
 +install_phplibdir       = $(prefix)/lib/php/$(PHP_EXT_DIR)
 +
  ifneq ($(USE_NAMESPACES),yes)
  slice2php_flags         = --no-namespace
  endif
diff --git a/devel/ice37/files/patch-php-src-php7-Makefile.mk b/devel/ice37/files/patch-php-src-php-Makefile.mk
similarity index 61%
rename from devel/ice37/files/patch-php-src-php7-Makefile.mk
rename to devel/ice37/files/patch-php-src-php-Makefile.mk
index 5ac204d7d143..5c98014365bd 100644
--- a/devel/ice37/files/patch-php-src-php7-Makefile.mk
+++ b/devel/ice37/files/patch-php-src-php-Makefile.mk
@@ -1,13 +1,18 @@
---- php/src/php7/Makefile.mk.orig	2018-04-20 15:02:08 UTC
-+++ php/src/php7/Makefile.mk
-@@ -14,8 +14,8 @@ IcePHP_targetname       := ice
+--- php/src/php/Makefile.mk.orig	2021-06-21 14:44:58 UTC
++++ php/src/php/Makefile.mk
+@@ -9,8 +9,13 @@ IcePHP_targetname       := ice
  IcePHP_targetdir        := lib
  IcePHP_installdir       := $(install_phplibdir)
  IcePHP_cppflags         := -I$(project) -I$(top_srcdir)/cpp/src $(ice_cpp_cppflags) $(php_cppflags)
 -IcePHP_ldflags          := $(php_ldflags)
 -IcePHP_dependencies     := IceDiscovery IceLocatorDiscovery IceSSL Ice
-+IcePHP_system_libs      := $(php_ldflags) -L/usr/local/lib -lIceDiscovery -lIceLocatorDiscovery -lIceSSL -lIce -lphp7
++IcePHP_system_libs      := $(php_ldflags) -L/usr/local/lib -lIceDiscovery -lIceLocatorDiscovery -lIceSSL -lIce
++ifeq ($(shell [ $$($(PHP_CONFIG) --vernum) -lt 80000 ] && echo 0),0)
++    IcePHP_system_libs += -lphp7
++else
++    IcePHP_system_libs += -lphp
++endif
 +#IcePHP_dependencies     := IceDiscovery IceLocatorDiscovery IceSSL Ice
  IcePHP_extra_sources    := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp
  
  projects += $(project)
diff --git a/devel/ice37/files/patch-php-src-php5-Makefile.mk b/devel/ice37/files/patch-php-src-php5-Makefile.mk
index 2a9c6fe1462c..fb1ef3c2352b 100644
--- a/devel/ice37/files/patch-php-src-php5-Makefile.mk
+++ b/devel/ice37/files/patch-php-src-php5-Makefile.mk
@@ -1,13 +1,13 @@
---- php/src/php5/Makefile.mk.orig	2018-04-20 15:02:08 UTC
+--- php/src/php5/Makefile.mk.orig	2021-06-21 14:44:58 UTC
 +++ php/src/php5/Makefile.mk
-@@ -14,8 +14,8 @@ IcePHP_targetname       := ice
+@@ -9,8 +9,8 @@ IcePHP_targetname       := ice
  IcePHP_targetdir        := lib
  IcePHP_installdir       := $(install_phplibdir)
  IcePHP_cppflags         := -I$(project) -I$(top_srcdir)/cpp/src $(ice_cpp_cppflags) $(php_cppflags)
 -IcePHP_system_libs      := $(php_ldflags)
 -IcePHP_dependencies     := IceDiscovery IceLocatorDiscovery IceSSL Ice
 +IcePHP_system_libs      := $(php_ldflags) -L/usr/local/lib -lIceDiscovery -lIceLocatorDiscovery -lIceSSL -lIce -lphp5
 +#IcePHP_dependencies     := IceDiscovery IceLocatorDiscovery IceSSL Ice
  IcePHP_extra_sources    := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp
  
  projects += $(project)
diff --git a/devel/ice37/files/patch-python-Makefile b/devel/ice37/files/patch-python-Makefile
index ae548b0db5fb..e79cc325995b 100644
--- a/devel/ice37/files/patch-python-Makefile
+++ b/devel/ice37/files/patch-python-Makefile
@@ -1,11 +1,11 @@
---- python/Makefile.orig	2018-04-20 15:02:08 UTC
+--- python/Makefile.orig	2021-06-21 14:44:58 UTC
 +++ python/Makefile
-@@ -19,7 +19,7 @@ include $(top_srcdir)/config/Make.rules
+@@ -14,7 +14,7 @@ include $(top_srcdir)/config/Make.rules
  #
  # Load C++ dependencies
  #
 -$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceLocatorDiscovery IceDiscovery)))
 +#$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceLocatorDiscovery IceDiscovery)))
  
  #
  # Load python rules after loading C++ dependencies
diff --git a/devel/ice37/files/patch-python-config-Make.rules b/devel/ice37/files/patch-python-config-Make.rules
index fc7a58188d1b..8878487979ba 100644
--- a/devel/ice37/files/patch-python-config-Make.rules
+++ b/devel/ice37/files/patch-python-config-Make.rules
@@ -1,21 +1,21 @@
---- python/config/Make.rules.orig	2018-04-20 15:02:08 UTC
+--- python/config/Make.rules.orig	2021-06-21 14:44:58 UTC
 +++ python/config/Make.rules
-@@ -12,7 +12,8 @@
+@@ -7,7 +7,8 @@
  # version to be used for building the Ice extension, set PYTHON to the
  # location of the python interpreter.
  #
 -PYTHON              ?= python
 +PYTHON              = %%PYTHON_CMD%%
 +slice2py_path       = $(localbase)/bin/slice2py
  
  # ----------------------------------------------------------------------
  # Don't change anything below this line!
-@@ -46,7 +47,7 @@ python_cppflags         := $(filter-out 
+@@ -59,7 +60,7 @@ python_cppflags         := $(filter-out -Wunreachable-
  #
  # Python installation directory
  #
--install_pythondir       = $(if $(usr_dir_install),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir),$(prefix)/python)
+-install_pythondir       = $(or $(PYTHON_INSTALLDIR),$(if $(usr_dir_install),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir),$(prefix)/python))
 +install_pythondir	= %%PYTHON_SITELIBDIR%%
  
  #
  # Rules to build a python module. We just compute the name of the python module
diff --git a/devel/ice37/files/patch-python-modules-IcePy-Makefile.mk b/devel/ice37/files/patch-python-modules-IcePy-Makefile.mk
index 1e7a46995bb3..b4455e08699e 100644
--- a/devel/ice37/files/patch-python-modules-IcePy-Makefile.mk
+++ b/devel/ice37/files/patch-python-modules-IcePy-Makefile.mk
@@ -1,13 +1,13 @@
---- python/modules/IcePy/Makefile.mk.orig	2018-04-20 15:02:08 UTC
+--- python/modules/IcePy/Makefile.mk.orig	2021-06-21 14:44:58 UTC
 +++ python/modules/IcePy/Makefile.mk
-@@ -14,8 +14,8 @@ IcePy_targetname        := IcePy
+@@ -9,8 +9,8 @@ IcePy_targetname        := IcePy
  IcePy_targetdir         := $(lang_srcdir)/python
  IcePy_installdir        := $(install_pythondir)
  IcePy_cppflags          := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src $(python_cppflags)
 -IcePy_system_libs       := $(python_ldflags)
 -IcePy_dependencies      := IceDiscovery IceLocatorDiscovery IceSSL Ice
 +IcePy_system_libs       := $(python_ldflags) -lIceDiscovery -lIceLocatorDiscovery -lIceSSL -lIce
 +#IcePy_dependencies      := IceDiscovery IceLocatorDiscovery IceSSL Ice
  IcePy_libs              := mcpp
  IcePy_extra_sources     := $(filter-out %Util.cpp %Ruby.cpp,\
                             $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
diff --git a/devel/ice37/files/patch-python-python-Makefile b/devel/ice37/files/patch-python-python-Makefile
index dcefed3195ed..671af7462679 100644
--- a/devel/ice37/files/patch-python-python-Makefile
+++ b/devel/ice37/files/patch-python-python-Makefile
@@ -1,28 +1,28 @@
---- python/python/Makefile.orig	2018-04-20 15:02:08 UTC
+--- python/python/Makefile.orig	2021-06-21 14:44:58 UTC
 +++ python/python/Makefile
-@@ -16,7 +16,7 @@ include $(lang_srcdir)/config/Make.rules
+@@ -11,7 +11,7 @@ include $(lang_srcdir)/config/Make.rules
  #
  # Load C++ dependencies
  #
 -$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2py))
 +#$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2py))
  
  .NOTPARALLEL:
  
-@@ -35,12 +35,12 @@ $(eval $(call make-python-slice,$(sliced
+@@ -30,12 +30,12 @@ $(eval $(call make-python-slice,$(slicedir),$(lang_src
  
  install:: | $(DESTDIR)$(install_pythondir)/Ice
  	$(E) "Installing generated code"
 -	$(Q)$(INSTALL) -m 644 Ice/__init__.py $(DESTDIR)$(install_pythondir)/Ice
 +	$(Q)%%INSTALL_DATA%% -m 644 Ice/__init__.py $(DESTDIR)$(install_pythondir)/Ice
  # Ice/Future requires python >= 3.5
  ifeq ($(shell $(PYTHON) -c "print(1 if $(python-version) >= 3.5 else 0)"),1)
--	$(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(install_pythondir)/Ice/Py3
+-	$(Q)$(MKDIR) -p -m 755 $(DESTDIR)$(install_pythondir)/Ice/Py3
 -	$(Q)$(INSTALL) -m 644 Ice/Py3/IceFuture.py $(DESTDIR)$(install_pythondir)/Ice/Py3/
 +	$(Q)%%MKDIR%% $(DESTDIR)$(install_pythondir)/Ice/Py3
 +	$(Q)%%INSTALL_DATA%% -m 644 Ice/Py3/IceFuture.py $(DESTDIR)$(install_pythondir)/Ice/Py3/
  endif
  
  install:: | $(DESTDIR)$(install_pythondir)/Glacier2
 -	$(Q)$(INSTALL) -m 644 Glacier2/__init__.py $(DESTDIR)$(install_pythondir)/Glacier2
 +	$(Q)%%INSTALL_DATA%% -m 644 Glacier2/__init__.py $(DESTDIR)$(install_pythondir)/Glacier2
diff --git a/devel/ice37/files/patch-python-test-Ice-info-AllTests.py b/devel/ice37/files/patch-python-test-Ice-info-AllTests.py
index bb36c22792b6..b73a9c3a5ad8 100644
--- a/devel/ice37/files/patch-python-test-Ice-info-AllTests.py
+++ b/devel/ice37/files/patch-python-test-Ice-info-AllTests.py
@@ -1,73 +1,73 @@
---- python/test/Ice/info/AllTests.py.orig	2018-08-27 01:10:47 UTC
+--- python/test/Ice/info/AllTests.py.orig	2022-01-15 23:22:20 UTC
 +++ python/test/Ice/info/AllTests.py
-@@ -7,12 +7,31 @@
+@@ -2,12 +2,31 @@
+ # Copyright (c) ZeroC, Inc. All rights reserved.
  #
- # **********************************************************************
  
 -import Ice, Test, sys, threading
 +import Ice, Test, sys, subprocess, threading
  
  def test(b):
      if not b:
          raise RuntimeError('test assertion failed')
  
 +def isFreeBSD():
 +    return sys.platform.startswith("freebsd")
 +
 +def sysctl(key):
 +    p = subprocess.Popen("sysctl -n "+key, shell=1, stdout=subprocess.PIPE)
 +    try:
 +        result = p.communicate()[0].strip()
 +    except IndexError:
 +        return 0    
 +    if sys.version_info >= (3,):
 +        result = str(result, sys.stdout.encoding)
 +    try:
 +        return int(result)
 +    except ValueError:
 +        return result
 +
 +def isFreeBSDJail():
 +    return isFreeBSD() and sysctl("security.jail.jailed")
 +
  def getTCPEndpointInfo(info):
      while(info):
          if isinstance(info, Ice.TCPEndpointInfo):
-@@ -119,7 +138,7 @@ def allTests(communicator):
+@@ -114,7 +133,7 @@ def allTests(helper, communicator):
          test(tcpEndpoint.port == 15000)
  
      tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo())
 -    test(tcpEndpoint.host == "127.0.0.1")
 +    test(tcpEndpoint.host == "127.0.0.1" or isFreeBSDJail())
      test(tcpEndpoint.port == 15000)
  
      adapter.destroy()
-@@ -137,7 +156,7 @@ def allTests(communicator):
+@@ -134,7 +153,7 @@ def allTests(helper, communicator):
      tcpinfo = getTCPEndpointInfo(base.ice_getConnection().getEndpoint().getInfo())
-     test(tcpinfo.port == 12010)
+     test(tcpinfo.port == port)
      test(not tcpinfo.compress)
 -    test(tcpinfo.host == defaultHost)
 +    test(tcpinfo.host == defaultHost or isFreeBSDJail())
  
      ctx = testIntf.getEndpointInfoAsContext()
      test(ctx["host"] == tcpinfo.host)
-@@ -147,7 +166,7 @@ def allTests(communicator):
+@@ -144,7 +163,7 @@ def allTests(helper, communicator):
  
      udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
      test(udp.port == port)
 -    test(udp.host == defaultHost)
 +    test(udp.host == defaultHost or isFreeBSDJail())
  
      print("ok")
  
-@@ -163,8 +182,8 @@ def allTests(communicator):
+@@ -160,8 +179,8 @@ def allTests(helper, communicator):
      test(len(info.adapterName) == 0)
-     test(tcpinfo.remotePort == 12010)
+     test(tcpinfo.remotePort == port)
      if defaultHost == '127.0.0.1':
 -        test(tcpinfo.remoteAddress == defaultHost)
 -        test(tcpinfo.localAddress == defaultHost)
 +        test(tcpinfo.remoteAddress == defaultHost or isFreeBSDJail())
 +        test(tcpinfo.localAddress == defaultHost or isFreeBSDJail())
      test(tcpinfo.rcvSize >= 1024)
      test(tcpinfo.sndSize >= 2048)
  
diff --git a/devel/ice37/files/patch-scripts-Glacier2Util.py b/devel/ice37/files/patch-scripts-Glacier2Util.py
index 288d07fe67ad..5fb0e391ce03 100644
--- a/devel/ice37/files/patch-scripts-Glacier2Util.py
+++ b/devel/ice37/files/patch-scripts-Glacier2Util.py
@@ -1,17 +1,17 @@
---- scripts/Glacier2Util.py.orig	2018-08-27 01:10:47 UTC
+--- scripts/Glacier2Util.py.orig	2022-01-15 23:22:20 UTC
 +++ scripts/Glacier2Util.py
-@@ -19,10 +19,13 @@ class Glacier2Router(ProcessFromBinDir, 
-         self.passwords = passwords
+@@ -17,10 +17,13 @@ class Glacier2Router(ProcessFromBinDir, ProcessIsRelea
+         return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
  
      def setup(self, current):
 +        glacier2router = self.getMapping(current).getCommandLine(current, self, self.exe, "")
-+        if not os.path.exists(self.exe) and os.path.exists("/usr/local/bin/glacier2router"):
-+            self.exe = "/usr/local/bin/glacier2router"
++        if not os.path.exists(self.exe) and os.path.exists("%%LOCALBASE%%/bin/glacier2router"):
++            self.exe = "%%LOCALBASE%%/bin/glacier2router"
          if self.passwords:
              path = os.path.join(current.testsuite.getPath(), "passwords")
              with open(path, "w") as file:
 -                command = "\"%s\" %s" % (sys.executable,
 +                command = "\"%s\" %s 2>/dev/null" % (sys.executable,
                                       os.path.abspath(os.path.join(toplevel, "scripts", "icehashpassword.py")))
  
                  #
diff --git a/devel/ice37/files/patch-scripts-Util.py b/devel/ice37/files/patch-scripts-Util.py
index c0a047a7fde9..18d8b6fb30f7 100644
--- a/devel/ice37/files/patch-scripts-Util.py
+++ b/devel/ice37/files/patch-scripts-Util.py
@@ -1,65 +1,59 @@
---- scripts/Util.py.orig	2019-02-11 16:48:19.076747000 +0100
-+++ scripts/Util.py	2019-02-11 19:16:32.768690000 +0100
-@@ -232,7 +232,7 @@
+--- scripts/Util.py.orig	2022-01-15 23:22:20 UTC
++++ scripts/Util.py
+@@ -263,7 +263,7 @@ class Platform(object):
          elif Mapping.getByName("cpp"):
              cwd = Mapping.getByName("cpp").getPath()
  
 -        output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd)
 +        output = run('gmake print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd)
          for l in output.split("\n"):
              match = re.match(r'^.*:.*: (.*) = (.*)', l)
              if match and match.group(1):
-@@ -304,6 +304,27 @@
-     def hasOpenSSL(self):
-         return True
+@@ -348,6 +348,29 @@ class AIX(Platform):
+     def getInstallDir(self):
+         return "/opt/freeware"
  
 +class FreeBSD(Platform):
 +
 +    def __init__(self):
 +        self.nugetPackageCache = None
++        self._hasNodeJS = None
++        self._hasSwift = None
 +
 +    def hasOpenSSL(self):
 +        return True
 +
 +    def getSliceDir(self, iceDir):
 +        installDir = self.getInstallDir(mapping, current)
 +        return os.path.join(installDir, "slice")
 +
 +    def getDefaultExe(self, name, config):
 +        if name == "icebox":
 +            if config.cpp11:
 +                name += "++11"
 +        return name
 +
 +    def canRun(self, mapping, current):
 +        return Platform.canRun(self, mapping, current)
 +
  class Linux(Platform):
  
      def __init__(self):
-@@ -1374,13 +1402,13 @@
-             if os.path.exists(translator):
-                 return translator + " " + args if args else translator
-             elif isinstance(platform, Windows):
--                return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe")
-+                return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe") + " " + args if args else translator
-             elif os.path.exists("/usr/local/bin/slice2py"):
--                return "/usr/local/bin/slice2py"
-+                return "/usr/local/bin/slice2py" + " " + args if args else translator
-             else:
-                 import slice2py
-                 return sys.executable + " " + os.path.normpath(
--                            os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py"))
-+                            os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) + " " + args if args else translator
-         else:
-             return Process.getCommandLine(self, current, args)
- 
-@@ -3786,6 +3807,8 @@
+@@ -1443,7 +1466,7 @@
+         # Look for slice2py installed by pip if not found in the bin directory
+         #
+         if self.exe == "slice2py":
+-            translator = self.getMapping(current).getCommandLine(current, self, self.getExe(current), "")
++            translator = self.getMapping(current).getCommandLine(current, self, "%%LOCALBASE%%/bin/slice2py", "")
+             if not os.path.exists(translator):
+                 translator = sys.executable + " -m slice2py"
+             return (translator + " " + args).strip()
+@@ -4059,6 +4082,8 @@ if sys.platform == "darwin":
      platform = Darwin()
  elif sys.platform.startswith("aix"):
      platform = AIX()
 +elif sys.platform.startswith("freebsd"):
 +    platform = FreeBSD()
  elif sys.platform.startswith("linux") or sys.platform.startswith("gnukfreebsd"):
      platform = Linux()
  elif sys.platform == "win32" or sys.platform[:6] == "cygwin":
diff --git a/devel/ice37/pkg-plist b/devel/ice37/pkg-plist
index 7d2cbf0cc540..32549fc42d85 100644
--- a/devel/ice37/pkg-plist
+++ b/devel/ice37/pkg-plist
@@ -1,388 +1,390 @@
 bin/glacier2router
 bin/icebox
 bin/icebox++11
 bin/iceboxadmin
 bin/icebridge
 bin/icegridadmin
 bin/icegriddb
 bin/icegridnode
 bin/icegridregistry
 bin/icepatch2calc
 bin/icepatch2client
 bin/icepatch2server
 bin/icestormadmin
 bin/icestormdb
 bin/slice2confluence
 bin/slice2cpp
 bin/slice2cs
 bin/slice2html
 bin/slice2java
 bin/slice2js
 bin/slice2matlab
 bin/slice2objc
 bin/slice2php
 bin/slice2py
 bin/slice2rb
+bin/slice2swift
 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
 include/Glacier2/RouterF.h
 include/Glacier2/SSLInfo.h
 include/Glacier2/Session.h
 include/Glacier2/SessionHelper.h
 include/Ice/Application.h
 include/Ice/AsyncResult.h
 include/Ice/AsyncResultF.h
 include/Ice/BatchRequestInterceptor.h
 include/Ice/BatchRequestQueueF.h
 include/Ice/Buffer.h
 include/Ice/BuiltinSequences.h
 include/Ice/Communicator.h
 include/Ice/CommunicatorAsync.h
 include/Ice/CommunicatorF.h
 include/Ice/Comparable.h
 include/Ice/Config.h
 include/Ice/Connection.h
 include/Ice/ConnectionAsync.h
 include/Ice/ConnectionF.h
 include/Ice/ConnectionIF.h
 include/Ice/ConsoleUtil.h
 include/Ice/Current.h
 include/Ice/DefaultValueFactory.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/EndpointTypes.h
 include/Ice/Exception.h
 include/Ice/ExceptionHelpers.h
 include/Ice/FacetMap.h
 include/Ice/FactoryTable.h
 include/Ice/FactoryTableInit.h
 include/Ice/Format.h
 include/Ice/Functional.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
 include/Ice/Incoming.h
 include/Ice/IncomingAsync.h
 include/Ice/IncomingAsyncF.h
 include/Ice/Initialize.h
 include/Ice/InputStream.h
 include/Ice/InstanceF.h
 include/Ice/Instrumentation.h
 include/Ice/InstrumentationF.h
 include/Ice/InterfaceByValue.h
 include/Ice/LocalException.h
 include/Ice/LocalObject.h
 include/Ice/LocalObjectF.h
 include/Ice/Locator.h
 include/Ice/LocatorF.h
 include/Ice/Logger.h
 include/Ice/LoggerF.h
 include/Ice/LoggerUtil.h
 include/Ice/Metrics.h
 include/Ice/MetricsAdminI.h
 include/Ice/MetricsFunctional.h
 include/Ice/MetricsObserverI.h
 include/Ice/NativePropertiesAdmin.h
 include/Ice/Object.h
 include/Ice/ObjectAdapter.h
 include/Ice/ObjectAdapterF.h
 include/Ice/ObjectF.h
 include/Ice/ObjectFactory.h
 include/Ice/ObserverHelper.h
 include/Ice/Optional.h
 include/Ice/OutgoingAsync.h
 include/Ice/OutgoingAsyncF.h
 include/Ice/OutputStream.h
 include/Ice/Plugin.h
 include/Ice/PluginF.h
 include/Ice/Process.h
 include/Ice/ProcessF.h
 include/Ice/Properties.h
 include/Ice/PropertiesAdmin.h
 include/Ice/PropertiesF.h
 include/Ice/Protocol.h
 include/Ice/Proxy.h
 include/Ice/ProxyF.h
 include/Ice/ProxyFactoryF.h
 include/Ice/ProxyHandle.h
 include/Ice/ReferenceF.h
 include/Ice/RegisterPlugins.h
 include/Ice/RemoteLogger.h
 include/Ice/RequestHandlerF.h
 include/Ice/ResponseHandlerF.h
 include/Ice/Router.h
 include/Ice/RouterF.h
 include/Ice/SHA1.h
 include/Ice/ServantLocator.h
 include/Ice/ServantLocatorF.h
 include/Ice/ServantManagerF.h
 include/Ice/Service.h
 include/Ice/SliceChecksumDict.h
 include/Ice/SliceChecksums.h
 include/Ice/SlicedData.h
 include/Ice/SlicedDataF.h
 include/Ice/StreamHelpers.h
 include/Ice/StringConverter.h
 include/Ice/ThreadPoolF.h
 include/Ice/UUID.h
 include/Ice/UniquePtr.h
 include/Ice/UniqueRef.h
 include/Ice/UserExceptionFactory.h
 include/Ice/Value.h
 include/Ice/ValueF.h
 include/Ice/ValueFactory.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/PluginFacade.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/IcePatch2.h
 include/IceSSL/Config.h
 include/IceSSL/ConnectionInfo.h
 include/IceSSL/ConnectionInfoF.h
 include/IceSSL/EndpointInfo.h
 include/IceSSL/IceSSL.h
 include/IceSSL/OpenSSL.h
 include/IceSSL/Plugin.h
 include/IceSSL/SChannel.h
 include/IceSSL/SecureTransport.h
 include/IceSSL/UWP.h
 include/IceStorm/Config.h
 include/IceStorm/IceStorm.h
 include/IceStorm/Metrics.h
 include/IceUtil/Atomic.h
 include/IceUtil/Cond.h
 include/IceUtil/Config.h
 include/IceUtil/ConsoleUtil.h
 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/InputUtil.h
 include/IceUtil/Iterator.h
 include/IceUtil/Lock.h
 include/IceUtil/Monitor.h
 include/IceUtil/Mutex.h
 include/IceUtil/MutexProtocol.h
 include/IceUtil/MutexPtrLock.h
 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/ResourceConfig.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/UndefSysMacros.h
 %%STATIC%%lib/libGlacier2++11.a
 lib/libGlacier2++11.so
-lib/libGlacier2++11.so.3.7.2
+lib/libGlacier2++11.so.3.7.6
 lib/libGlacier2++11.so.37
 %%STATIC%%lib/libGlacier2.a
 lib/libGlacier2.so
-lib/libGlacier2.so.3.7.2
+lib/libGlacier2.so.3.7.6
 lib/libGlacier2.so.37
-lib/libGlacier2CryptPermissionsVerifier.so.3.7.2
+lib/libGlacier2CryptPermissionsVerifier.so.3.7.6
 lib/libGlacier2CryptPermissionsVerifier.so.37
 %%STATIC%%lib/libIce++11.a
 lib/libIce++11.so
-lib/libIce++11.so.3.7.2
+lib/libIce++11.so.3.7.6
 lib/libIce++11.so.37
 %%STATIC%%lib/libIce.a
 lib/libIce.so
-lib/libIce.so.3.7.2
+lib/libIce.so.3.7.6
 lib/libIce.so.37
 %%STATIC%%lib/libIceBox++11.a
 lib/libIceBox++11.so
-lib/libIceBox++11.so.3.7.2
+lib/libIceBox++11.so.3.7.6
 lib/libIceBox++11.so.37
 %%STATIC%%lib/libIceBox.a
 lib/libIceBox.so
-lib/libIceBox.so.3.7.2
+lib/libIceBox.so.3.7.6
 lib/libIceBox.so.37
-lib/libIceDB.so.3.7.2
+lib/libIceDB.so.3.7.6
 lib/libIceDB.so.37
 %%STATIC%%lib/libIceDiscovery++11.a
 lib/libIceDiscovery++11.so
-lib/libIceDiscovery++11.so.3.7.2
+lib/libIceDiscovery++11.so.3.7.6
 lib/libIceDiscovery++11.so.37
 %%STATIC%%lib/libIceDiscovery.a
 lib/libIceDiscovery.so
-lib/libIceDiscovery.so.3.7.2
+lib/libIceDiscovery.so.3.7.6
 lib/libIceDiscovery.so.37
 %%STATIC%%lib/libIceGrid++11.a
 lib/libIceGrid++11.so
-lib/libIceGrid++11.so.3.7.2
+lib/libIceGrid++11.so.3.7.6
 lib/libIceGrid++11.so.37
 %%STATIC%%lib/libIceGrid.a
 lib/libIceGrid.so
-lib/libIceGrid.so.3.7.2
+lib/libIceGrid.so.3.7.6
 lib/libIceGrid.so.37
 %%STATIC%%lib/libIceLocatorDiscovery++11.a
 lib/libIceLocatorDiscovery++11.so
-lib/libIceLocatorDiscovery++11.so.3.7.2
+lib/libIceLocatorDiscovery++11.so.3.7.6
 lib/libIceLocatorDiscovery++11.so.37
 %%STATIC%%lib/libIceLocatorDiscovery.a
 lib/libIceLocatorDiscovery.so
-lib/libIceLocatorDiscovery.so.3.7.2
+lib/libIceLocatorDiscovery.so.3.7.6
 lib/libIceLocatorDiscovery.so.37
 %%STATIC%%lib/libIcePatch2.a
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.7.2
+lib/libIcePatch2.so.3.7.6
 lib/libIcePatch2.so.37
 %%STATIC%%lib/libIceSSL++11.a
 lib/libIceSSL++11.so
-lib/libIceSSL++11.so.3.7.2
+lib/libIceSSL++11.so.3.7.6
 lib/libIceSSL++11.so.37
 %%STATIC%%lib/libIceSSL.a
 lib/libIceSSL.so
-lib/libIceSSL.so.3.7.2
+lib/libIceSSL.so.3.7.6
 lib/libIceSSL.so.37
 %%STATIC%%lib/libIceStorm++11.a
 lib/libIceStorm++11.so
-lib/libIceStorm++11.so.3.7.2
+lib/libIceStorm++11.so.3.7.6
 lib/libIceStorm++11.so.37
 %%STATIC%%lib/libIceStorm.a
 lib/libIceStorm.so
-lib/libIceStorm.so.3.7.2
+lib/libIceStorm.so.3.7.6
 lib/libIceStorm.so.37
-lib/libIceStormService.so.3.7.2
+lib/libIceStormService.so.3.7.6
 lib/libIceStormService.so.37
-lib/libIceXML.so.3.7.2
+lib/libIceXML.so.3.7.6
 lib/libIceXML.so.37
 man/man1/glacier2router.1.gz
 man/man1/icebox.1.gz
 man/man1/iceboxadmin.1.gz
 man/man1/icebridge.1.gz
 man/man1/icegridadmin.1.gz
 man/man1/icegriddb.1.gz
 man/man1/icegridnode.1.gz
 man/man1/icegridregistry.1.gz
 man/man1/icepatch2calc.1.gz
 man/man1/icepatch2client.1.gz
 man/man1/icepatch2server.1.gz
 man/man1/icestormadmin.1.gz
 man/man1/icestormdb.1.gz
 man/man1/slice2cpp.1.gz
 man/man1/slice2cs.1.gz
 man/man1/slice2html.1.gz
 man/man1/slice2java.1.gz
 man/man1/slice2js.1.gz
 man/man1/slice2matlab.1.gz
 man/man1/slice2objc.1.gz
 man/man1/slice2php.1.gz
 man/man1/slice2py.1.gz
 man/man1/slice2rb.1.gz
+man/man1/slice2swift.1.gz
 %%DATADIR%%/Glacier2/Metrics.ice
 %%DATADIR%%/Glacier2/PermissionsVerifier.ice
 %%DATADIR%%/Glacier2/PermissionsVerifierF.ice
 %%DATADIR%%/Glacier2/Router.ice
 %%DATADIR%%/Glacier2/RouterF.ice
 %%DATADIR%%/Glacier2/SSLInfo.ice
 %%DATADIR%%/Glacier2/Session.ice
 %%DATADIR%%/Ice/BuiltinSequences.ice
 %%DATADIR%%/Ice/Communicator.ice
 %%DATADIR%%/Ice/CommunicatorF.ice
 %%DATADIR%%/Ice/Connection.ice
 %%DATADIR%%/Ice/ConnectionF.ice
 %%DATADIR%%/Ice/Current.ice
 %%DATADIR%%/Ice/Endpoint.ice
 %%DATADIR%%/Ice/EndpointF.ice
 %%DATADIR%%/Ice/EndpointTypes.ice
 %%DATADIR%%/Ice/FacetMap.ice
 %%DATADIR%%/Ice/Identity.ice
 %%DATADIR%%/Ice/ImplicitContext.ice
 %%DATADIR%%/Ice/ImplicitContextF.ice
 %%DATADIR%%/Ice/Instrumentation.ice
 %%DATADIR%%/Ice/InstrumentationF.ice
 %%DATADIR%%/Ice/LocalException.ice
 %%DATADIR%%/Ice/Locator.ice
 %%DATADIR%%/Ice/LocatorF.ice
 %%DATADIR%%/Ice/Logger.ice
 %%DATADIR%%/Ice/LoggerF.ice
 %%DATADIR%%/Ice/Metrics.ice
 %%DATADIR%%/Ice/ObjectAdapter.ice
 %%DATADIR%%/Ice/ObjectAdapterF.ice
 %%DATADIR%%/Ice/ObjectFactory.ice
 %%DATADIR%%/Ice/Plugin.ice
 %%DATADIR%%/Ice/PluginF.ice
 %%DATADIR%%/Ice/Process.ice
 %%DATADIR%%/Ice/ProcessF.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/ValueFactory.ice
 %%DATADIR%%/Ice/Version.ice
 %%DATADIR%%/IceBT/ConnectionInfo.ice
 %%DATADIR%%/IceBT/EndpointInfo.ice
 %%DATADIR%%/IceBT/Types.ice
 %%DATADIR%%/IceBox/IceBox.ice
 %%DATADIR%%/IceGrid/Admin.ice
 %%DATADIR%%/IceGrid/Descriptor.ice
 %%DATADIR%%/IceGrid/Exception.ice
 %%DATADIR%%/IceGrid/FileParser.ice
 %%DATADIR%%/IceGrid/PluginFacade.ice
 %%DATADIR%%/IceGrid/Registry.ice
 %%DATADIR%%/IceGrid/Session.ice
 %%DATADIR%%/IceGrid/UserAccountMapper.ice
 %%DATADIR%%/IceIAP/ConnectionInfo.ice
 %%DATADIR%%/IceIAP/EndpointInfo.ice
 %%DATADIR%%/IcePatch2/FileInfo.ice
 %%DATADIR%%/IcePatch2/FileServer.ice
 %%DATADIR%%/IceSSL/ConnectionInfo.ice
 %%DATADIR%%/IceSSL/ConnectionInfoF.ice
 %%DATADIR%%/IceSSL/EndpointInfo.ice
 %%DATADIR%%/IceStorm/IceStorm.ice
 %%DATADIR%%/IceStorm/Metrics.ice
 %%DATADIR%%/config/templates.xml
 %%DOCSDIR%%/ICE_LICENSE
 %%DOCSDIR%%/LICENSE
diff --git a/devel/php-ice37/Makefile b/devel/php-ice37/Makefile
index 9117ddad8d86..2de74d14f8d4 100644
--- a/devel/php-ice37/Makefile
+++ b/devel/php-ice37/Makefile
@@ -1,48 +1,47 @@
 CATEGORIES=		devel
 PKGNAMEPREFIX=		${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=		grembo@FreeBSD.org
 COMMENT=		Ice (Internet Communications Engine) language mapping for PHP
 
 LICENSE=		GPLv2
 
 BUILD_DEPENDS=		mcpp:devel/mcpp \
 			slice2php:devel/ice37
 LIB_DEPENDS=		libIce.so.${LIB_VRS}:devel/ice37
 
 OPTIONS_DEFINE=		DEBUG NAMESPACES
 NAMESPACES_DESC=	Use PHP namespaces (recommended)
 OPTIONS_DEFAULT=	NAMESPACES
 
 SLAVE_PORT=		yes
 MASTERDIR=		${.CURDIR}/../ice37
 PLIST=			${.CURDIR}/pkg-plist
 
 MAKE_ARGS+=		PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
 			PHP_HOME=${LOCALBASE} OPTIMIZE=yes
 USES+=			php:build,flavors
-IGNORE_WITH_PHP=	80 81
 BUILD_WRKSRC=		${WRKSRC}/php
 INSTALL_WRKSRC=		${WRKSRC}/php
 
 NAMESPACES_MAKE_ENV_OFF=USE_NAMESPACES=no
 
 LIB_VRS=		${PORTVERSION:S|.||g:C|0$||}
 PHP_MODNAME?=		ice
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 	@${ECHO_CMD} "extension=${PHP_MODNAME}.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-ice.ini
 
 security-check:
 	@${ECHO_CMD} "****************************************************************************"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/ext-20-ice.ini"
 	@${ECHO_CMD} "configuration file to automatically load the installed extension:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "extension=${PHP_MODNAME}.so"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "****************************************************************************"
 
 .include "${MASTERDIR}/Makefile"