diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile index 0aaf8624ef42..340c948f19d9 100644 --- a/devel/ice37/Makefile +++ b/devel/ice37/Makefile @@ -1,147 +1,146 @@ PORTNAME= Ice -PORTVERSION= 3.7.6 -PORTREVISION= 1 +PORTVERSION= 3.7.10 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMESUFFIX?= 37 MAINTAINER= grembo@FreeBSD.org COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+ WWW= http://www.zeroc.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 USE_CXXSTD= c++14 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 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 .if ${PREFIX} != ${LOCALBASE} PYSITEDIR= ${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||} .else PYSITEDIR= ${PYTHON_SITELIBDIR} .endif .if defined(PYTHON_VER) && ${PYTHON_VER} == "2.7" PLIST_SUB+= PYTHONGT27="@comment " .else PLIST_SUB+= PYTHONGT27="" .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|%%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 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,15 +1,15 @@ ---- 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 +#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 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 - #endif - -+#if defined(__FreeBSD__) -+# include -+#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,40 +1,40 @@ ---- 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); - 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); -@@ -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") { - 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); -@@ -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") { - test(udpinfo->remoteAddress == defaultHost); - test(udpinfo->localAddress == defaultHost); + 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,30 +1,30 @@ ---- 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(); } +# if defined(LIBRESSL_VERSION_NUMBER) + const string anonCiphers = "ADH"; +# else const string anonCiphers = openSSLVersion >= 0x10100000L ? "ADH:@SECLEVEL=0" : "ADH"; +# endif #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 } { +#if !defined(LIBRESSL_VERSION_NUMBER) // // 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,28 +1,28 @@ ---- 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 # # 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 @@ -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 9076196cc46e..f26c98be8a2e 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 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 +install_phplibdir = $(prefix)/lib/php/$(PHP_EXT_DIR) + ifneq ($(USE_NAMESPACES),yes) slice2php_flags = --no-namespace endif 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,11 +1,11 @@ ---- 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 # -$(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 8878487979ba..214c405b354f 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 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%% # # Rules to build a python module. We just compute the name of the python module 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,28 +1,28 @@ ---- 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 # # Load C++ dependencies # -$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2py)) +#$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2py)) .NOTPARALLEL: @@ -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) + 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 + $(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-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,17 +1,17 @@ ---- 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 def setup(self, current): + glacier2router = self.getMapping(current).getCommandLine(current, self, self.exe, "") + 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 18d8b6fb30f7..0ea1c0eed0b5 100644 --- a/devel/ice37/files/patch-scripts-Util.py +++ b/devel/ice37/files/patch-scripts-Util.py @@ -1,59 +1,59 @@ ---- 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() - 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): -@@ -348,6 +348,29 @@ class AIX(Platform): +@@ -344,6 +344,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): -@@ -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": - 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": +@@ -3909,6 +3932,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 d6310a0c3715..bda92ea01928 100644 --- a/devel/ice37/pkg-plist +++ b/devel/ice37/pkg-plist @@ -1,390 +1,389 @@ 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.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 %%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 +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