diff --git a/misc/ecflow/Makefile b/misc/ecflow/Makefile index 5f0a036a251d..06213cac698e 100644 --- a/misc/ecflow/Makefile +++ b/misc/ecflow/Makefile @@ -1,41 +1,41 @@ PORTNAME= ecflow -DISTVERSION= 5.12.4 +DISTVERSION= 5.13.0 CATEGORIES= misc MASTER_SITES= https://confluence.ecmwf.int/download/attachments/8650755/ DISTNAME= ecFlow-${DISTVERSION}-Source MAINTAINER= yuri@FreeBSD.org COMMENT= Workflow package that enables users to run a large number of programs WWW= https://confluence.ecmwf.int/display/ECFLOW/ecflow+home LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boost-libs>0:devel/boost-python-libs@${PY_FLAVOR} BUILD_DEPENDS= bash:shells/bash \ ${PY_DEPENDS} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs RUN_DEPENDS= ${PY_DEPENDS} USES= cmake compiler:c++17-lang gl localbase perl5 pkgconfig python qt:6 shebangfix ssl USE_QT= 5compat base charts svg tools:build USE_GL= gl opengl SHEBANG_GLOB= *.sh *.in *.py CMAKE_OFF= ENABLE_STATIC_BOOST_LIBS ENABLE_TESTS ENABLE_ALL_TESTS CXXFLAGS_armv7= -fPIC # attempt to work around compilation failure, see https://jira.ecmwf.int/browse/SUP-3688 CXXFLAGS_i386= -fPIC # attempt to work around compilation failure, see https://jira.ecmwf.int/browse/SUP-3688 CONFLICTS_BUILD= python27 # build attempts to find python-2.7 and use it .include #post-patch: #.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 # @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \ # ${WRKSRC}/ACore/src/Str.cpp #.endif .include diff --git a/misc/ecflow/distinfo b/misc/ecflow/distinfo index 9c7930782ede..257596474106 100644 --- a/misc/ecflow/distinfo +++ b/misc/ecflow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714124637 -SHA256 (ecFlow-5.12.4-Source.tar.gz) = 4ff11e420105ffcff6fa2f9d54682ac9e7f0007b6a7c52d1ce3cd6cd81cebfe5 -SIZE (ecFlow-5.12.4-Source.tar.gz) = 16863928 +TIMESTAMP = 1718929677 +SHA256 (ecFlow-5.13.0-Source.tar.gz) = a14f4e97cc9123bc6cadfb3ecbf3899e27b6deb53058590bba7a4dae12f3e029 +SIZE (ecFlow-5.13.0-Source.tar.gz) = 16918829 diff --git a/misc/ecflow/files/patch-tools_ecflow__standalone.c b/misc/ecflow/files/patch-tools_ecflow__standalone.c index 65046b4361e9..105c3f053894 100644 --- a/misc/ecflow/files/patch-tools_ecflow__standalone.c +++ b/misc/ecflow/files/patch-tools_ecflow__standalone.c @@ -1,11 +1,11 @@ ---- tools/ecflow_standalone.c.orig 2022-08-25 05:28:39 UTC +--- tools/ecflow_standalone.c.orig 2024-06-19 10:20:26 UTC +++ tools/ecflow_standalone.c -@@ -183,7 +183,7 @@ int main(argc,argv) int argc; char **argv; - for (n=3; n<65535 ;n++) fclose(n); */ +@@ -85,7 +85,7 @@ pid_t do_setsid(void) { + } - /* create a new session from the child process */ --#if defined(linux) || defined(__APPLE__) || defined(__MACH__) || defined(hpux) || defined(solaris) || defined(SGI) || defined(SVR4) || defined(AIX) || defined(SYG) || defined(alpha) -+#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(hpux) || defined(solaris) || defined(SGI) || defined(SVR4) || defined(AIX) || defined(SYG) || defined(alpha) - if( setsid() == -1 ) + pid_t do_setsid(void) { +-#if defined(linux) || defined(__APPLE__) || defined(__MACH__) || defined(hpux) || defined(solaris) || defined(SGI) || \ ++#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(hpux) || defined(solaris) || defined(SGI) || \ + defined(SVR4) || defined(AIX) || defined(SYG) || defined(alpha) || defined(__NVCOMPILER) + return setsid(); #else - if( setsid(0) == -1 )