Date: Sat, 24 Nov 2018 03:10:29 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485723 - in head/math/moab: . files Message-ID: <201811240310.wAO3ATaC056399@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat Nov 24 03:10:29 2018 New Revision: 485723 URL: https://svnweb.freebsd.org/changeset/ports/485723 Log: math/moab: Update 4.6.3 -> 5.0.0 Port changes: * Change MASTER_SITES to bitbucket where official releases are * Change to CMAKE * Add MPI option * Fix WWW Reported by: portscout Deleted: head/math/moab/files/patch-configure.ac head/math/moab/files/patch-src_io_NCHelper.cpp head/math/moab/files/patch-src_io_ReadABAQUS.cpp Modified: head/math/moab/Makefile head/math/moab/distinfo head/math/moab/files/patch-src_io_WriteNCDF.cpp head/math/moab/pkg-descr head/math/moab/pkg-plist Modified: head/math/moab/Makefile ============================================================================== --- head/math/moab/Makefile Sat Nov 24 02:56:55 2018 (r485722) +++ head/math/moab/Makefile Sat Nov 24 03:10:29 2018 (r485723) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= moab -DISTVERSION= 4.6.3 +DISTVERSION= 5.0.0 CATEGORIES= math -MASTER_SITES= http://ftp.mcs.anl.gov/pub/fathom/ +MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ MAINTAINER= yuri@FreeBSD.org COMMENT= Component for representing and evaluating mesh data @@ -12,15 +12,25 @@ LICENSE= BSD2CLAUSE xLICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libhdf5.so:science/hdf5 \ - libnetcdf.so:science/netcdf + libnetcdf.so:science/netcdf \ + libopenblas.so:math/openblas -USES= autoreconf gmake libtool localbase:ldflags -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static --with-netcdf=${LOCALBASE} +USES= cmake:outsource,noninja eigen:3 fortran USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS +CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -PORTDOCS= * +BB_ACCOUNT= fathomteam +BB_PROJECT= ${PORTNAME} +BB_COMMIT= c4eed56fd6d2 + +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +OPTIONS_DEFINE= MPI +OPTIONS_DEFAULT= MPI +OPTIONS_SUB= yes + +MPI_CMAKE_BOOL= ENABLE_MPI +MPI_LIB_DEPENDS= libmpi.so:net/openmpi .include <bsd.port.mk> Modified: head/math/moab/distinfo ============================================================================== --- head/math/moab/distinfo Sat Nov 24 02:56:55 2018 (r485722) +++ head/math/moab/distinfo Sat Nov 24 03:10:29 2018 (r485723) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541374760 -SHA256 (moab-4.6.3.tar.gz) = a25933254a05013811d3769e5d96b01cc7b5d67026acacbaae4f3568ce18fd7f -SIZE (moab-4.6.3.tar.gz) = 21861257 +TIMESTAMP = 1543026884 +SHA256 (moab-5.0.0.tar.gz) = 80fd376e71bc40b1cdf1c5ebd9c14e8cfe185e7554ff352431cbcb82a44920e3 +SIZE (moab-5.0.0.tar.gz) = 12370425 Modified: head/math/moab/files/patch-src_io_WriteNCDF.cpp ============================================================================== --- head/math/moab/files/patch-src_io_WriteNCDF.cpp Sat Nov 24 02:56:55 2018 (r485722) +++ head/math/moab/files/patch-src_io_WriteNCDF.cpp Sat Nov 24 03:10:29 2018 (r485723) @@ -1,13 +1,13 @@ ---- src/io/WriteNCDF.cpp.orig 2018-11-05 01:47:40 UTC +--- src/io/WriteNCDF.cpp.orig 2018-11-23 06:26:09 UTC +++ src/io/WriteNCDF.cpp -@@ -154,8 +154,8 @@ void WriteNCDF::time_and_date(char* time +@@ -161,8 +161,8 @@ void WriteNCDF::time_and_date(char* time strftime(date_string, TIME_STR_LEN, "%m/%d/%Y", local_time); - // terminate with NULL character + // 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, + ErrorCode WriteNCDF::write_file(const char *exodus_file_name, Modified: head/math/moab/pkg-descr ============================================================================== --- head/math/moab/pkg-descr Sat Nov 24 02:56:55 2018 (r485722) +++ head/math/moab/pkg-descr Sat Nov 24 03:10:29 2018 (r485723) @@ -12,4 +12,4 @@ provenance information for the mesh. Because the data abstract, conventions are useful for describing how meta-data is stored into that data model. -WWW: http://sigma.mcs.anl.gov/moab-library/ +WWW: https://press3.mcs.anl.gov/sigma/moab-library/ Modified: head/math/moab/pkg-plist ============================================================================== --- head/math/moab/pkg-plist Sat Nov 24 02:56:55 2018 (r485722) +++ head/math/moab/pkg-plist Sat Nov 24 03:10:29 2018 (r485723) @@ -1,54 +1,31 @@ -bin/dagmc_preproc -bin/h5minfo -bin/h5mvalidate bin/hexmodops bin/mbconvert bin/mbdepth bin/mbgsets +bin/mbhonodes bin/mbmem +bin/mbquality bin/mbsize bin/mbskin +bin/mbslavepart bin/mbsurfplot bin/mbtagprop -bin/spheredecomp -include/DagMC.hpp -include/MBAdaptiveKDTree.hpp -include/MBBSPTree.hpp -include/MBBSPTreePoly.hpp +bin/mbumr +%%MPI%%include/Coupler.hpp +%%MPI%%include/ElemUtil.hpp include/MBCN.h -include/MBCN.hpp include/MBCN_protos.h -include/MBCartVect.hpp -include/MBCore.hpp -include/MBEntityHandle.h include/MBEntityType.h -include/MBForward.hpp -include/MBGeomUtil.hpp -include/MBInterface.hpp -include/MBOrientedBoxTreeTool.hpp -include/MBParallelComm.hpp -include/MBParallelData.hpp -include/MBProcConfig.hpp -include/MBRange.hpp -include/MBReadUtilIface.hpp -include/MBReaderIface.hpp -include/MBReaderWriterSet.hpp -include/MBSkinner.hpp +%%MPI%%include/MBParallelConventions.h include/MBTagConventions.hpp -include/MBTypes.h -include/MBUnknownInterface.hpp -include/MBUtil.hpp -include/MBVersion.h -include/MBWriteUtilIface.hpp -include/MBWriterIface.hpp include/MBiMesh.hpp -include/MBmpi.h -include/MOAB_FCDefs.h 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_extensions_protos.h include/iMesh_f.h include/iMesh_protos.h include/moab/AdaptiveKDTree.hpp @@ -66,27 +43,44 @@ include/moab/ElemEvaluator.hpp include/moab/EntityHandle.hpp include/moab/EntityType.hpp include/moab/Error.hpp +include/moab/ErrorHandler.hpp include/moab/ExoIIInterface.hpp include/moab/FBEngine.hpp include/moab/FileOptions.hpp include/moab/FindPtFuncs.h include/moab/Forward.hpp +include/moab/GeomQueryTool.hpp include/moab/GeomTopoTool.hpp include/moab/GeomUtil.hpp +include/moab/HalfFacetRep.hpp include/moab/HigherOrderFactory.hpp include/moab/HomXform.hpp include/moab/Interface.hpp -include/moab/LinearHex.hpp -include/moab/LinearQuad.hpp -include/moab/LinearTet.hpp -include/moab/LinearTri.hpp +include/moab/IntxMesh/Intx2Mesh.hpp +include/moab/IntxMesh/Intx2MeshInPlane.hpp +include/moab/IntxMesh/Intx2MeshOnSphere.hpp +include/moab/IntxMesh/IntxRllCssphere.hpp +include/moab/IntxMesh/IntxUtils.hpp include/moab/LloydSmoother.hpp +include/moab/LocalDiscretization/LinearHex.hpp +include/moab/LocalDiscretization/LinearQuad.hpp +include/moab/LocalDiscretization/LinearTet.hpp +include/moab/LocalDiscretization/LinearTri.hpp +include/moab/LocalDiscretization/QuadraticHex.hpp +include/moab/MOABConfig.h include/moab/Matrix3.hpp include/moab/MergeMesh.hpp +include/moab/MeshGeneration.hpp include/moab/MeshTopoUtil.hpp +include/moab/NestedRefine.hpp +include/moab/NestedRefineTemplates.hpp +include/moab/OrientedBox.hpp include/moab/OrientedBoxTreeTool.hpp +%%MPI%%include/moab/ParallelComm.hpp +%%MPI%%include/moab/ParallelData.hpp +%%MPI%%include/moab/ParallelMergeMesh.hpp +%%MPI%%include/moab/ProcConfig.hpp include/moab/ProgOptions.hpp -include/moab/QuadraticHex.hpp include/moab/Range.hpp include/moab/RangeMap.hpp include/moab/ReadUtilIface.hpp @@ -105,9 +99,12 @@ include/moab/TupleList.hpp include/moab/Types.hpp include/moab/UnknownInterface.hpp include/moab/Util.hpp -include/moab/Version.h +include/moab/VtkUtil.hpp include/moab/WriteUtilIface.hpp include/moab/WriterIface.hpp +%%MPI%%include/moab/gs.hpp +include/moab/iMOAB.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 include/moab/point_locater/element_maps/quadratic_hex_map.hpp @@ -118,17 +115,19 @@ include/moab/point_locater/point_locater.hpp include/moab/point_locater/tree/bvh_tree.hpp include/moab/point_locater/tree/common_tree.hpp include/moab/point_locater/tree/element_tree.hpp -lib/MOABConfig.cmake +include/moab/verdict.h +include/moab/verdict/VerdictWrapper.hpp +%%MPI%%include/moab_mpi.h +%%MPI%%include/moab_mpi_config.h +lib/cmake/MOAB/MOABConfig.cmake +lib/cmake/MOAB/MOABTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/MOAB/MOABTargets.cmake lib/iMesh-Defs.inc lib/libMOAB.so -lib/libMOAB.so.0 -lib/libMOAB.so.0.0.0 -lib/libdagmc.so -lib/libdagmc.so.0 -lib/libdagmc.so.0.0.0 +lib/libMOAB.so.5 +lib/libMOAB.so.5.0.0 lib/libiMesh.so -lib/libiMesh.so.0 -lib/libiMesh.so.0.0.0 -lib/moab.config +lib/libiMesh.so.5 +lib/libiMesh.so.5.0.0 +%%MPI%%lib/libmbcoupler.so lib/moab.make -man/man1/mbconvert.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811240310.wAO3ATaC056399>