From nobody Fri Apr 26 17:11:09 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQzlK3SRbz5HqmV; Fri, 26 Apr 2024 17:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQzlK1TMTz4s5f; Fri, 26 Apr 2024 17:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714151469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xNtmFLx1u6sSaG3jH9/DAdmKXOPAmYyVzcoB7rehaBI=; b=a/0VZdet5Pe9umTHd7rxHL+MLvjWDGxTYf16ZRfYhsr6GPSs4s8IBNUnzNNKqv2JmPm27Y DzA+tcCeX0Y8iAmK9GVBIQAWGfnHw0hkIuHXjkmGGU9TDgy6wTcfwaOSLQEX1p4mUI9hy8 yh8x93BoX9ivvTme2a5VhCVsl4PodB4DOlMaCpRlv2ibjf41VeyA59AEfNGdpnvX77fmTF nGoEBpr+YFGW7Wsdq5HtxXN9ILFUzPacoHGHZJWtut4FWxjZ+BIYZQRUA4xZRpLDvfJWBd oxnNd6X1AnKS3YosV1d8ysOkfypLoT3mEkQqfNuoXHl4R5Qiyq7TzmdrrOsngg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714151469; a=rsa-sha256; cv=none; b=am3b+u/+jzBF5GxGbJXzVnqDOsYkdGKuM0YMklAxbN1mK7mDDu4bM7EKX6uJm4zyJln8fp 6WYOWwEc2y9YIDXBARYvbbJwjMMAUM5c1j1HZ8TdoqT3GNKuhI/kq1sj9k/G6kDOpOOx8/ jKwMRb7Qp/QO2qcxnB51OG1m05sOAHkW2otEIAkLU0XRAWoGNR1ZxGuAZ7mc/p5smXOY7Z P2bmutmhVsjVbjWj0+vxSh8PwyDfylwlQSYjidJMbSezhZ9A3ZSxu/hbsLpFl3Wb/JQz0k F8XzwElCS3SJhAVwshPuSZ6vFSwPImoJQFeyiAeDLbtSdZ5x7+twC/XLlLSlcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714151469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xNtmFLx1u6sSaG3jH9/DAdmKXOPAmYyVzcoB7rehaBI=; b=JnTJMWNfQVCEOALdCDPSe7DndIVh0hfkng9On2sy+S9a6na6w+yTgcTLNkkaj8BNKJ8/2V V8452+gJaybZu0lpOPrWNHxYAnn7DWI9iAI7wH/mzjMd6xhoG1+AX0LwQlbiZ/ouZgY3+/ 0KYRMvfX4Vg7dKCr/N4AiIszRk5paQtId67DVqPab22lymQ5jm7fNQGEbiPi/2sL0Q5bOO ETdgWFMCtnj7HrGq69BfoVDiSi2+47/UHEzarSuTKrZbhnoMjw39N95s3nXcjWif/qil/Z vbZXCZnsi1gDte/kQOU6YG1EG5gqve13dP5QPxAVE22ZWXpZbzG3W4We3qZ+JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQzlK131Yzr1n; Fri, 26 Apr 2024 17:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43QHB9cB029227; Fri, 26 Apr 2024 17:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QHB978029224; Fri, 26 Apr 2024 17:11:09 GMT (envelope-from git) Date: Fri, 26 Apr 2024 17:11:09 GMT Message-Id: <202404261711.43QHB978029224@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4a867fcd6708 - main - math/moab: update 5.3.1 =?utf-8?Q?=E2=86=92?= 5.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a867fcd67087bcd7b9497d70615582f28639dbe Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a867fcd67087bcd7b9497d70615582f28639dbe commit 4a867fcd67087bcd7b9497d70615582f28639dbe Author: Yuri Victorovich AuthorDate: 2024-04-26 16:46:46 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-26 17:11:03 +0000 math/moab: update 5.3.1 → 5.5.1 Reported by: portscout --- math/moab/Makefile | 7 +++-- math/moab/distinfo | 6 ++--- math/moab/files/patch-CMakeLists.txt | 42 ------------------------------ math/moab/files/patch-src_io_WriteNCDF.cpp | 15 ----------- math/moab/pkg-plist | 19 ++------------ 5 files changed, 8 insertions(+), 81 deletions(-) diff --git a/math/moab/Makefile b/math/moab/Makefile index fd30b69bff6a..bb948edf7cc7 100644 --- a/math/moab/Makefile +++ b/math/moab/Makefile @@ -1,6 +1,5 @@ PORTNAME= moab -DISTVERSION= 5.3.1 -PORTREVISION= 5 +DISTVERSION= 5.5.1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ @@ -24,7 +23,7 @@ CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \ BB_ACCOUNT= fathomteam BB_PROJECT= ${PORTNAME} -BB_COMMIT= 65880ffe833d +BB_COMMIT= 0c84f0d50f3f WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} @@ -36,7 +35,7 @@ MPI_CMAKE_BOOL= ENABLE_MPI MPI_LIB_DEPENDS= libmpi_cxx.so:net/openmpi4 MPI_VARS= CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPI_VARS+= CONFLICTS_BUILD=mpich # otherwise bin/hexmodops gets linked with libmpi.so:net/mpich -MPI_VARS_OFF= USES=compiler:c++11-lang +MPI_VARS_OFF= USES+=compiler:c++11-lang post-install: # docs are just readmes diff --git a/math/moab/distinfo b/math/moab/distinfo index 31a92c3013aa..f9c4688f2913 100644 --- a/math/moab/distinfo +++ b/math/moab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653069812 -SHA256 (moab-5.3.1.tar.gz) = 4471b7b0124b47dba8bd83891d8a595fc403e41ffa0da731a3330cf1eed47026 -SIZE (moab-5.3.1.tar.gz) = 17561771 +TIMESTAMP = 1714146317 +SHA256 (moab-5.5.1.tar.gz) = 598a9e72b0d03cf487c49aee2defb60ab5c19bd9194de9a3134f0fd04d376f13 +SIZE (moab-5.5.1.tar.gz) = 19527072 diff --git a/math/moab/files/patch-CMakeLists.txt b/math/moab/files/patch-CMakeLists.txt deleted file mode 100644 index 0c92f1b054cc..000000000000 --- a/math/moab/files/patch-CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -- workaround for https://bitbucket.org/fathomteam/moab/issues/148/530-cmake-error-at-cmake_installcmake-68 - ---- CMakeLists.txt.orig 2021-11-12 00:54:52 UTC -+++ CMakeLists.txt -@@ -618,7 +618,7 @@ endif(CLANG_TIDY_EXE) - CONFIGURE_FILE(config/MOABConfig.cmake.h.in "${PROJECT_BINARY_DIR}/src/moab/MOABConfig.h" @ONLY) - - CONFIGURE_FILE(config/MOABConfig.cmake.cmake "${PROJECT_BINARY_DIR}/MOABConfig.cmake" @ONLY) --CONFIGURE_FILE(moab.make.cmake "${PROJECT_BINARY_DIR}/lib/moab.make" @ONLY) -+CONFIGURE_FILE(moab.make.cmake "lib/moab.make" @ONLY) - if ( MOAB_HAVE_FBIGEOM ) - CONFIGURE_FILE(itaps/fbigeom/FBiGeom-Defs.inc.in "${PROJECT_BINARY_DIR}/lib/FBiGeom-Defs.inc" @ONLY) - install( -@@ -636,23 +636,23 @@ if ( MOAB_HAVE_IMESH ) - endif ( MOAB_HAVE_IMESH ) - INSTALL( - FILES "${PROJECT_BINARY_DIR}/lib/moab.make" -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ DESTINATION lib - ) - INSTALL( - CODE -- "file(APPEND ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )" -+ "file(APPEND ${FREEBSD_STAGEDIR}${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )" - ) - INSTALL( - CODE -- "file(APPEND ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )" -+ "file(APPEND ${FREEBSD_STAGEDIR}${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )" - ) - INSTALL( - FILES "${PROJECT_BINARY_DIR}/MOABConfig.cmake" -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MOAB/ -+ DESTINATION lib/cmake/MOAB/ - ) - INSTALL( - FILES "${PROJECT_SOURCE_DIR}/config/ResolveCompilerPaths.cmake" -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MOAB -+ DESTINATION lib/cmake/MOAB - ) - - ADD_CUSTOM_TARGET( diff --git a/math/moab/files/patch-src_io_WriteNCDF.cpp b/math/moab/files/patch-src_io_WriteNCDF.cpp deleted file mode 100644 index bba6c59dcfd1..000000000000 --- a/math/moab/files/patch-src_io_WriteNCDF.cpp +++ /dev/null @@ -1,15 +0,0 @@ -- workaround for https://bitbucket.org/fathomteam/moab/issues/157/please-do-not-convert-null-to-char-this - ---- src/io/WriteNCDF.cpp.orig 2021-11-12 00:54:52 UTC -+++ src/io/WriteNCDF.cpp -@@ -160,8 +160,8 @@ void WriteNCDF::time_and_date( char* time_string, char - strftime( date_string, TIME_STR_LEN, "%m/%d/%Y", local_time ); - - // Terminate with NULL character -- time_string[10] = (char)NULL; -- date_string[10] = (char)NULL; -+ time_string[10] = (char)0; -+ date_string[10] = (char)0; - } - - ErrorCode WriteNCDF::write_file( const char* exodus_file_name, const bool overwrite, const FileOptions& opts, diff --git a/math/moab/pkg-plist b/math/moab/pkg-plist index 8b3bb286b66d..2bf7abe3d9b6 100644 --- a/math/moab/pkg-plist +++ b/math/moab/pkg-plist @@ -18,18 +18,9 @@ include/MBCN_protos.h include/MBEntityType.h %%MPI%%include/MBParallelConventions.h include/MBTagConventions.hpp -include/MBiMesh.hpp include/iBase.h include/iBase_f.h -include/iMesh.h -%%MPI%%include/iMeshP.h -%%MPI%%include/iMeshP_f.h -%%MPI%%include/iMeshP_protos.h -include/iMesh_extensions.h -include/iMesh_f.h -include/iMesh_protos.h -%%MPI%%include/mbcoupler/Coupler.hpp -%%MPI%%include/mbcoupler/ElemUtil.hpp +include/imoab.mod include/moab/AdaptiveKDTree.hpp include/moab/BSPTree.hpp include/moab/BSPTreePoly.hpp @@ -110,7 +101,6 @@ include/moab/WriteUtilIface.hpp include/moab/WriterIface.hpp %%MPI%%include/moab/gs.hpp include/moab/iMOAB.h -include/moab/imoab_protos.h include/moab/mhdf_public.h include/moab/point_locater/element_maps/linear_hex_map.hpp include/moab/point_locater/element_maps/linear_tet_map.hpp @@ -132,14 +122,9 @@ lib/cmake/MOAB/MOABConfig.cmake lib/cmake/MOAB/MOABTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/MOAB/MOABTargets.cmake lib/cmake/MOAB/ResolveCompilerPaths.cmake -lib/iMesh-Defs.inc lib/libMOAB.so lib/libMOAB.so.5 -lib/libMOAB.so.5.3.1 -lib/libiMesh.so -lib/libiMesh.so.5 -lib/libiMesh.so.5.3.1 -%%MPI%%lib/libmbcoupler.so +lib/libMOAB.so.5.5.1 lib/moab.make libdata/pkgconfig/MOAB.pc share/man/man1/mbconvert.1.gz