git: 504e97a0acce - main - devel/{ice37,php-ice37,py-ice37}: Update to 3.7.10

From: Michael Gmelin <grembo_at_FreeBSD.org>
Date: Tue, 30 Apr 2024 07:51:23 UTC
The branch main has been updated by grembo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=504e97a0acce85151013290a5174f7405faa2237

commit 504e97a0acce85151013290a5174f7405faa2237
Author:     Michael Gmelin <grembo@FreeBSD.org>
AuthorDate: 2024-04-30 07:49:49 +0000
Commit:     Michael Gmelin <grembo@FreeBSD.org>
CommitDate: 2024-04-30 07:49:49 +0000

    devel/{ice37,php-ice37,py-ice37}: Update to 3.7.10
---
 devel/ice37/Makefile                               |  3 +-
 devel/ice37/distinfo                               |  8 +-
 devel/ice37/files/patch-cpp-src-Ice-Thread.cpp     |  4 +-
 devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp | 23 ------
 devel/ice37/files/patch-cpp-src-IceStorm-Replica.h | 11 ---
 .../files/patch-cpp-test-Ice-info-AllTests.cpp     | 14 ++--
 ...atch-cpp-test-IceSSL-configuration-AllTests.cpp | 10 +--
 devel/ice37/files/patch-php-Makefile               |  2 +-
 devel/ice37/files/patch-php-config-Make.rules      |  8 +-
 devel/ice37/files/patch-python-Makefile            |  4 +-
 devel/ice37/files/patch-python-config-Make.rules   |  8 +-
 devel/ice37/files/patch-python-python-Makefile     |  4 +-
 devel/ice37/files/patch-scripts-Glacier2Util.py    |  2 +-
 devel/ice37/files/patch-scripts-Util.py            | 10 +--
 devel/ice37/pkg-plist                              | 91 +++++++++++-----------
 15 files changed, 82 insertions(+), 120 deletions(-)

diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile
index 0aaf8624ef42..340c948f19d9 100644
--- a/devel/ice37/Makefile
+++ b/devel/ice37/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=		Ice
-PORTVERSION=		3.7.6
-PORTREVISION=	1
+PORTVERSION=		3.7.10
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 PKGNAMESUFFIX?=		37
diff --git a/devel/ice37/distinfo b/devel/ice37/distinfo
index 00a3e36b5262..ede0bb193d72 100644
--- a/devel/ice37/distinfo
+++ b/devel/ice37/distinfo
@@ -1,5 +1,3 @@
-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
+TIMESTAMP = 1714215718
+SHA256 (zeroc-ice-ice-v3.7.10_GH0.tar.gz) = b90e9015ca9124a9eadfdfc49c5fba24d3550c547f166f3c9b2b5914c00fb1df
+SIZE (zeroc-ice-ice-v3.7.10_GH0.tar.gz) = 10120858
diff --git a/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp b/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
index 3bd93a474d32..f9c126968d55 100644
--- a/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
+++ b/devel/ice37/files/patch-cpp-src-Ice-Thread.cpp
@@ -1,6 +1,6 @@
---- cpp/src/Ice/Thread.cpp.orig	2021-06-21 14:44:58 UTC
+--- cpp/src/Ice/Thread.cpp.orig	2023-11-06 09:24:19 UTC
 +++ cpp/src/Ice/Thread.cpp
-@@ -724,6 +724,12 @@ IceUtil::Thread::start(size_t stackSize, bool realtime
+@@ -482,6 +482,12 @@ IceUtil::Thread::start(size_t stackSize, bool realtime
              stackSize = stackSize / 4096 * 4096 + 4096;
          }
  #endif
diff --git a/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp b/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp
deleted file mode 100644
index c5eeed90796c..000000000000
--- a/devel/ice37/files/patch-cpp-src-Ice-ThreadPool.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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-IceStorm-Replica.h b/devel/ice37/files/patch-cpp-src-IceStorm-Replica.h
deleted file mode 100644
index 82d60fdf8a29..000000000000
--- a/devel/ice37/files/patch-cpp-src-IceStorm-Replica.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-Ice-info-AllTests.cpp b/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
index 81ecd3d7d9ad..7859fa38600d 100644
--- a/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-Ice-info-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp/test/Ice/info/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
+--- cpp/test/Ice/info/AllTests.cpp.orig	2023-11-06 09:24:19 UTC
 +++ cpp/test/Ice/info/AllTests.cpp
-@@ -125,13 +125,13 @@ allTests(Test::TestHelper* helper)
+@@ -116,13 +116,13 @@ allTests(Test::TestHelper* helper)
              test(ipEndpoint);
              test(ipEndpoint->type() == Ice::TCPEndpointType || ipEndpoint->type() == Ice::SSLEndpointType ||
                  ipEndpoint->type() == Ice::WSEndpointType || ipEndpoint->type() == Ice::WSSEndpointType);
@@ -16,7 +16,7 @@
              test(udpEndpoint->datagram());
              test(udpEndpoint->port > 0);
  
-@@ -214,8 +214,8 @@ allTests(Test::TestHelper* helper)
+@@ -205,8 +205,8 @@ allTests(Test::TestHelper* helper)
          test(info->remotePort == port);
          if(defaultHost == "127.0.0.1")
          {
@@ -25,9 +25,9 @@
 +            test(info->remoteAddress == defaultHost || inFreeBSDJail());
 +            test(info->localAddress == defaultHost || inFreeBSDJail());
          }
- #if !defined(ICE_OS_UWP)
          test(info->rcvSize >= 1024);
-@@ -275,8 +275,8 @@ allTests(Test::TestHelper* helper)
+         test(info->sndSize >= 2048);
+@@ -264,8 +264,8 @@ allTests(Test::TestHelper* helper)
          test(udpinfo->remotePort == port);
          if(defaultHost == "127.0.0.1")
          {
@@ -36,5 +36,5 @@
 +            test(udpinfo->remoteAddress == defaultHost || inFreeBSDJail());
 +            test(udpinfo->localAddress == defaultHost || inFreeBSDJail());
          }
- 
- #if !defined(ICE_OS_UWP)
+         test(udpinfo->rcvSize >= 2048);
+         test(udpinfo->sndSize >= 1024);
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 3058341ece46..8227482235fa 100644
--- a/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
+++ b/devel/ice37/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2021-06-21 14:44:58 UTC
+--- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2023-11-06 09:24:19 UTC
 +++ cpp/test/IceSSL/configuration/AllTests.cpp
-@@ -743,7 +743,11 @@ allTests(Test::TestHelper* helper, const string& /*tes
+@@ -588,7 +588,11 @@ allTests(Test::TestHelper* helper, const string& /*tes
          openSSLVersion = plugin->getOpenSSLVersion();
          comm->destroy();
      }
@@ -12,7 +12,7 @@
  #endif
  
      IceSSL::ConnectionInfoPtr info;
-@@ -2681,6 +2685,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
+@@ -2528,6 +2532,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
      }
  
      {
@@ -20,11 +20,11 @@
          //
          // This should fail because we disabled all anonymous ciphers and the server doesn't
          // provide a certificate.
-@@ -2718,6 +2723,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
+@@ -2710,6 +2715,7 @@ allTests(Test::TestHelper* helper, const string& /*tes
          }
          fact->destroyServer(server);
          comm->destroy();
 +#endif
      }
- #    ifdef ICE_USE_SECURE_TRANSPORT
+ 
      {
diff --git a/devel/ice37/files/patch-php-Makefile b/devel/ice37/files/patch-php-Makefile
index fd5028b54af0..8692a66b898a 100644
--- a/devel/ice37/files/patch-php-Makefile
+++ b/devel/ice37/files/patch-php-Makefile
@@ -1,4 +1,4 @@
---- php/Makefile.orig	2021-06-21 14:44:58 UTC
+--- php/Makefile.orig	2023-11-06 09:24:19 UTC
 +++ php/Makefile
 @@ -10,8 +10,8 @@ include $(top_srcdir)/config/Make.rules
  #
diff --git a/devel/ice37/files/patch-php-config-Make.rules b/devel/ice37/files/patch-php-config-Make.rules
index 9076196cc46e..f26c98be8a2e 100644
--- a/devel/ice37/files/patch-php-config-Make.rules
+++ b/devel/ice37/files/patch-php-config-Make.rules
@@ -1,8 +1,8 @@
---- php/config/Make.rules.orig	2021-06-21 14:44:58 UTC
+--- php/config/Make.rules.orig	2023-11-06 09:24:19 UTC
 +++ php/config/Make.rules
-@@ -18,6 +18,10 @@ USE_NAMESPACES  ?= yes
- # Don't change anything below this line!
- # ----------------------------------------------------------------------
+@@ -20,6 +20,10 @@ USE_NAMESPACES  ?= yes
+ 
+ php_major_version       = $(firstword $(subst ., ,$(shell php -r "print(PHP_VERSION);")))
  
 +slice2php_path		= $(localbase)/bin/slice2php
 +install_phpdir          = $(prefix)/share/pear
diff --git a/devel/ice37/files/patch-python-Makefile b/devel/ice37/files/patch-python-Makefile
index e79cc325995b..31143fd54fe2 100644
--- a/devel/ice37/files/patch-python-Makefile
+++ b/devel/ice37/files/patch-python-Makefile
@@ -1,6 +1,6 @@
---- python/Makefile.orig	2021-06-21 14:44:58 UTC
+--- python/Makefile.orig	2023-11-06 09:24:19 UTC
 +++ python/Makefile
-@@ -14,7 +14,7 @@ include $(top_srcdir)/config/Make.rules
+@@ -10,7 +10,7 @@ include $(top_srcdir)/config/Make.rules
  #
  # Load C++ dependencies
  #
diff --git a/devel/ice37/files/patch-python-config-Make.rules b/devel/ice37/files/patch-python-config-Make.rules
index 8878487979ba..214c405b354f 100644
--- a/devel/ice37/files/patch-python-config-Make.rules
+++ b/devel/ice37/files/patch-python-config-Make.rules
@@ -1,20 +1,20 @@
---- python/config/Make.rules.orig	2021-06-21 14:44:58 UTC
+--- python/config/Make.rules.orig	2023-11-06 09:24:19 UTC
 +++ python/config/Make.rules
 @@ -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              ?= python3
 +PYTHON              = %%PYTHON_CMD%%
 +slice2py_path       = $(localbase)/bin/slice2py
  
  # ----------------------------------------------------------------------
  # Don't change anything below this line!
-@@ -59,7 +60,7 @@ python_cppflags         := $(filter-out -Wunreachable-
+@@ -58,7 +59,7 @@ python_cppflags         := $(filter-out -Wunreachable-
  #
  # Python installation directory
  #
--install_pythondir       = $(or $(PYTHON_INSTALLDIR),$(if $(usr_dir_install),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir),$(prefix)/python))
+-install_pythondir       = $(or $(PYTHON_INSTALLDIR),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir $(prefix)))
 +install_pythondir	= %%PYTHON_SITELIBDIR%%
  
  #
diff --git a/devel/ice37/files/patch-python-python-Makefile b/devel/ice37/files/patch-python-python-Makefile
index 671af7462679..52d4d53bd485 100644
--- a/devel/ice37/files/patch-python-python-Makefile
+++ b/devel/ice37/files/patch-python-python-Makefile
@@ -1,4 +1,4 @@
---- python/python/Makefile.orig	2021-06-21 14:44:58 UTC
+--- python/python/Makefile.orig	2023-11-06 09:24:19 UTC
 +++ python/python/Makefile
 @@ -11,7 +11,7 @@ include $(lang_srcdir)/config/Make.rules
  #
@@ -16,7 +16,7 @@
 -	$(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)
+ ifeq ($(shell $(PYTHON) -c "import sys; print(1 if sys.version_info[:2] >= (3, 5) else 0)"),1)
 -	$(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
diff --git a/devel/ice37/files/patch-scripts-Glacier2Util.py b/devel/ice37/files/patch-scripts-Glacier2Util.py
index 5fb0e391ce03..ff6983d52246 100644
--- a/devel/ice37/files/patch-scripts-Glacier2Util.py
+++ b/devel/ice37/files/patch-scripts-Glacier2Util.py
@@ -1,4 +1,4 @@
---- scripts/Glacier2Util.py.orig	2022-01-15 23:22:20 UTC
+--- scripts/Glacier2Util.py.orig	2024-04-27 11:12:29 UTC
 +++ scripts/Glacier2Util.py
 @@ -17,10 +17,13 @@ class Glacier2Router(ProcessFromBinDir, ProcessIsRelea
          return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
diff --git a/devel/ice37/files/patch-scripts-Util.py b/devel/ice37/files/patch-scripts-Util.py
index 18d8b6fb30f7..0ea1c0eed0b5 100644
--- a/devel/ice37/files/patch-scripts-Util.py
+++ b/devel/ice37/files/patch-scripts-Util.py
@@ -1,6 +1,6 @@
---- scripts/Util.py.orig	2022-01-15 23:22:20 UTC
+--- scripts/Util.py.orig	2024-04-27 11:12:29 UTC
 +++ scripts/Util.py
-@@ -263,7 +263,7 @@ class Platform(object):
+@@ -259,7 +259,7 @@ class Platform(object):
          elif Mapping.getByName("cpp"):
              cwd = Mapping.getByName("cpp").getPath()
  
@@ -9,7 +9,7 @@
          for l in output.split("\n"):
              match = re.match(r'^.*:.*: (.*) = (.*)', l)
              if match and match.group(1):
-@@ -348,6 +348,29 @@ class AIX(Platform):
+@@ -344,6 +344,29 @@ class AIX(Platform):
      def getInstallDir(self):
          return "/opt/freeware"
  
@@ -39,7 +39,7 @@
  class Linux(Platform):
  
      def __init__(self):
-@@ -1443,7 +1466,7 @@
+@@ -1441,7 +1464,7 @@ class SliceTranslator(ProcessFromBinDir, ProcessIsRele
          # Look for slice2py installed by pip if not found in the bin directory
          #
          if self.exe == "slice2py":
@@ -48,7 +48,7 @@
              if not os.path.exists(translator):
                  translator = sys.executable + " -m slice2py"
              return (translator + " " + args).strip()
-@@ -4059,6 +4082,8 @@ if sys.platform == "darwin":
+@@ -3909,6 +3932,8 @@ if sys.platform == "darwin":
      platform = Darwin()
  elif sys.platform.startswith("aix"):
      platform = AIX()
diff --git a/devel/ice37/pkg-plist b/devel/ice37/pkg-plist
index d6310a0c3715..bda92ea01928 100644
--- a/devel/ice37/pkg-plist
+++ b/devel/ice37/pkg-plist
@@ -174,7 +174,6 @@ 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
@@ -220,104 +219,80 @@ include/IceUtil/UUID.h
 include/IceUtil/UndefSysMacros.h
 %%STATIC%%lib/libGlacier2++11.a
 lib/libGlacier2++11.so
-lib/libGlacier2++11.so.3.7.6
+lib/libGlacier2++11.so.3.7.10
 lib/libGlacier2++11.so.37
 %%STATIC%%lib/libGlacier2.a
 lib/libGlacier2.so
-lib/libGlacier2.so.3.7.6
+lib/libGlacier2.so.3.7.10
 lib/libGlacier2.so.37
-lib/libGlacier2CryptPermissionsVerifier.so.3.7.6
+lib/libGlacier2CryptPermissionsVerifier.so.3.7.10
 lib/libGlacier2CryptPermissionsVerifier.so.37
 %%STATIC%%lib/libIce++11.a
 lib/libIce++11.so
-lib/libIce++11.so.3.7.6
+lib/libIce++11.so.3.7.10
 lib/libIce++11.so.37
 %%STATIC%%lib/libIce.a
 lib/libIce.so
-lib/libIce.so.3.7.6
+lib/libIce.so.3.7.10
 lib/libIce.so.37
 %%STATIC%%lib/libIceBox++11.a
 lib/libIceBox++11.so
-lib/libIceBox++11.so.3.7.6
+lib/libIceBox++11.so.3.7.10
 lib/libIceBox++11.so.37
 %%STATIC%%lib/libIceBox.a
 lib/libIceBox.so
-lib/libIceBox.so.3.7.6
+lib/libIceBox.so.3.7.10
 lib/libIceBox.so.37
-lib/libIceDB.so.3.7.6
+lib/libIceDB.so.3.7.10
 lib/libIceDB.so.37
 %%STATIC%%lib/libIceDiscovery++11.a
 lib/libIceDiscovery++11.so
-lib/libIceDiscovery++11.so.3.7.6
+lib/libIceDiscovery++11.so.3.7.10
 lib/libIceDiscovery++11.so.37
 %%STATIC%%lib/libIceDiscovery.a
 lib/libIceDiscovery.so
-lib/libIceDiscovery.so.3.7.6
+lib/libIceDiscovery.so.3.7.10
 lib/libIceDiscovery.so.37
 %%STATIC%%lib/libIceGrid++11.a
 lib/libIceGrid++11.so
-lib/libIceGrid++11.so.3.7.6
+lib/libIceGrid++11.so.3.7.10
 lib/libIceGrid++11.so.37
 %%STATIC%%lib/libIceGrid.a
 lib/libIceGrid.so
-lib/libIceGrid.so.3.7.6
+lib/libIceGrid.so.3.7.10
 lib/libIceGrid.so.37
 %%STATIC%%lib/libIceLocatorDiscovery++11.a
 lib/libIceLocatorDiscovery++11.so
-lib/libIceLocatorDiscovery++11.so.3.7.6
+lib/libIceLocatorDiscovery++11.so.3.7.10
 lib/libIceLocatorDiscovery++11.so.37
 %%STATIC%%lib/libIceLocatorDiscovery.a
 lib/libIceLocatorDiscovery.so
-lib/libIceLocatorDiscovery.so.3.7.6
+lib/libIceLocatorDiscovery.so.3.7.10
 lib/libIceLocatorDiscovery.so.37
 %%STATIC%%lib/libIcePatch2.a
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.7.6
+lib/libIcePatch2.so.3.7.10
 lib/libIcePatch2.so.37
 %%STATIC%%lib/libIceSSL++11.a
 lib/libIceSSL++11.so
-lib/libIceSSL++11.so.3.7.6
+lib/libIceSSL++11.so.3.7.10
 lib/libIceSSL++11.so.37
 %%STATIC%%lib/libIceSSL.a
 lib/libIceSSL.so
-lib/libIceSSL.so.3.7.6
+lib/libIceSSL.so.3.7.10
 lib/libIceSSL.so.37
 %%STATIC%%lib/libIceStorm++11.a
 lib/libIceStorm++11.so
-lib/libIceStorm++11.so.3.7.6
+lib/libIceStorm++11.so.3.7.10
 lib/libIceStorm++11.so.37
 %%STATIC%%lib/libIceStorm.a
 lib/libIceStorm.so
-lib/libIceStorm.so.3.7.6
+lib/libIceStorm.so.3.7.10
 lib/libIceStorm.so.37
-lib/libIceStormService.so.3.7.6
+lib/libIceStormService.so.3.7.10
 lib/libIceStormService.so.37
-lib/libIceXML.so.3.7.6
+lib/libIceXML.so.3.7.10
 lib/libIceXML.so.37
-share/man/man1/glacier2router.1.gz
-share/man/man1/icebox.1.gz
-share/man/man1/iceboxadmin.1.gz
-share/man/man1/icebridge.1.gz
-share/man/man1/icegridadmin.1.gz
-share/man/man1/icegriddb.1.gz
-share/man/man1/icegridnode.1.gz
-share/man/man1/icegridregistry.1.gz
-share/man/man1/icepatch2calc.1.gz
-share/man/man1/icepatch2client.1.gz
-share/man/man1/icepatch2server.1.gz
-share/man/man1/icestormadmin.1.gz
-share/man/man1/icestormdb.1.gz
-share/man/man1/slice2cpp.1.gz
-share/man/man1/slice2cs.1.gz
-share/man/man1/slice2html.1.gz
-share/man/man1/slice2java.1.gz
-share/man/man1/slice2js.1.gz
-share/man/man1/slice2matlab.1.gz
-share/man/man1/slice2objc.1.gz
-share/man/man1/slice2php.1.gz
-share/man/man1/slice2py.1.gz
-share/man/man1/slice2rb.1.gz
-share/man/man1/slice2swift.1.gz
 %%DATADIR%%/Glacier2/Metrics.ice
 %%DATADIR%%/Glacier2/PermissionsVerifier.ice
 %%DATADIR%%/Glacier2/PermissionsVerifierF.ice
@@ -388,3 +363,27 @@ share/man/man1/slice2swift.1.gz
 %%DATADIR%%/config/templates.xml
 %%DOCSDIR%%/ICE_LICENSE
 %%DOCSDIR%%/LICENSE
+share/man/man1/glacier2router.1.gz
+share/man/man1/icebox.1.gz
+share/man/man1/iceboxadmin.1.gz
+share/man/man1/icebridge.1.gz
+share/man/man1/icegridadmin.1.gz
+share/man/man1/icegriddb.1.gz
+share/man/man1/icegridnode.1.gz
+share/man/man1/icegridregistry.1.gz
+share/man/man1/icepatch2calc.1.gz
+share/man/man1/icepatch2client.1.gz
+share/man/man1/icepatch2server.1.gz
+share/man/man1/icestormadmin.1.gz
+share/man/man1/icestormdb.1.gz
+share/man/man1/slice2cpp.1.gz
+share/man/man1/slice2cs.1.gz
+share/man/man1/slice2html.1.gz
+share/man/man1/slice2java.1.gz
+share/man/man1/slice2js.1.gz
+share/man/man1/slice2matlab.1.gz
+share/man/man1/slice2objc.1.gz
+share/man/man1/slice2php.1.gz
+share/man/man1/slice2py.1.gz
+share/man/man1/slice2rb.1.gz
+share/man/man1/slice2swift.1.gz