Date: Thu, 13 Oct 2022 07:52:48 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 031b90bbfa41 - main - science/liggghts: Update 3.8.0-45 -> 3.8.0-58 Message-ID: <202210130752.29D7qmli036802@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=031b90bbfa41a33562f2062790828705f2300aac commit 031b90bbfa41a33562f2062790828705f2300aac Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-10-13 07:17:50 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-10-13 07:52:43 +0000 science/liggghts: Update 3.8.0-45 -> 3.8.0-58 --- science/liggghts/Makefile | 5 +- science/liggghts/distinfo | 6 +- science/liggghts/files/patch-CMakeLists.txt | 139 ++++++++++++++++------------ science/liggghts/pkg-plist | 28 ++++++ 4 files changed, 112 insertions(+), 66 deletions(-) diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile index f82dddcb90a7..67dbf51aa74b 100644 --- a/science/liggghts/Makefile +++ b/science/liggghts/Makefile @@ -1,7 +1,6 @@ PORTNAME= liggghts -DISTVERSION= 3.8.0-45 -DISTVERSIONSUFFIX= -g86544c3f -PORTREVISION= 1 +DISTVERSION= 3.8.0-58 +DISTVERSIONSUFFIX= -g6e28cfe3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/liggghts/distinfo b/science/liggghts/distinfo index 59bdf3cf1bef..f39c66a1ee29 100644 --- a/science/liggghts/distinfo +++ b/science/liggghts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427270 -SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-45-g86544c3f_GH0.tar.gz) = 98dd6e9dabfafabe2f3da66294e59b7cf5580ae9f7c07d797b9288a971b51607 -SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-45-g86544c3f_GH0.tar.gz) = 36278241 +TIMESTAMP = 1665627493 +SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-58-g6e28cfe3_GH0.tar.gz) = b840447b99c8235cc16c36a9cf1273018ba2253291f45fef2c9c64ebe5ce527a +SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-58-g6e28cfe3_GH0.tar.gz) = 36282727 diff --git a/science/liggghts/files/patch-CMakeLists.txt b/science/liggghts/files/patch-CMakeLists.txt index eae36a292121..52955776d79a 100644 --- a/science/liggghts/files/patch-CMakeLists.txt +++ b/science/liggghts/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- CMakeLists.txt.orig 2017-11-30 09:34:53 UTC +--- CMakeLists.txt.orig 2022-10-12 09:39:16 UTC +++ CMakeLists.txt -@@ -47,9 +47,9 @@ ENDIF() +@@ -279,9 +279,9 @@ FILE(GLOB HEADERS *.h) + ADD_LIBRARY(liggghts_obj OBJECT ${SOURCES}) - ADD_DEPENDENCIES(liggghts_obj GenerateHeaders) -ADD_LIBRARY(liggghts_static STATIC $<TARGET_OBJECTS:liggghts_obj>) -SET_TARGET_PROPERTIES(liggghts_static PROPERTIES OUTPUT_NAME liggghts) @@ -13,65 +13,84 @@ ADD_LIBRARY(liggghts_shared SHARED $<TARGET_OBJECTS:liggghts_obj>) SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES OUTPUT_NAME liggghts) -@@ -67,7 +67,7 @@ FIND_PACKAGE(VTK NO_MODULE) - IF(VTK_FOUND) - INCLUDE(${VTK_USE_FILE}) - ADD_DEFINITIONS(-DLAMMPS_VTK) -- TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES}) -+ #TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES}) - TARGET_LINK_LIBRARIES(liggghts_shared ${VTK_LIBRARIES}) - TARGET_LINK_LIBRARIES(liggghts_bin ${VTK_LIBRARIES}) - MESSAGE(STATUS "Found VTK") -@@ -82,7 +82,7 @@ FIND_PACKAGE(JPEG) - IF(JPEG_FOUND) - INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) - ADD_DEFINITIONS(-DLAMMPS_JPEG) -- TARGET_LINK_LIBRARIES(liggghts_static jpeg) -+ #TARGET_LINK_LIBRARIES(liggghts_static jpeg) - TARGET_LINK_LIBRARIES(liggghts_shared jpeg) - TARGET_LINK_LIBRARIES(liggghts_bin jpeg) - ELSE(JPEG_FOUND) -@@ -95,25 +95,25 @@ FIND_PACKAGE(MPI) +@@ -296,18 +296,18 @@ IF(ENABLE_MPI) + + IF(MPI_FOUND) + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) +- TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES}) ++ #TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES}) + TARGET_LINK_LIBRARIES(liggghts_shared ${MPI_LIBRARIES}) + TARGET_LINK_LIBRARIES(liggghts_bin ${MPI_LIBRARIES}) + + IF(MPI_COMPILE_FLAGS) +- SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") ++ #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") + SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") + SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") + ENDIF() - IF(MPI_FOUND) - INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) -- TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES}) -+ #TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES}) - TARGET_LINK_LIBRARIES(liggghts_shared ${MPI_LIBRARIES}) - TARGET_LINK_LIBRARIES(liggghts_bin ${MPI_LIBRARIES}) + IF(MPI_LINK_FLAGS) +- SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") ++ #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") + SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") + SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") + ENDIF() +@@ -328,7 +328,7 @@ IF(ENABLE_VTK) + IF(VTK_FOUND) + INCLUDE(${VTK_USE_FILE}) + ADD_DEFINITIONS(-DLAMMPS_VTK) +- TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES}) ++ #TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(liggghts_shared ${VTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(liggghts_bin ${VTK_LIBRARIES}) - IF(MPI_COMPILE_FLAGS) -- SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") -+ #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") - SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") - SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") - ENDIF() +@@ -349,7 +349,7 @@ IF(ENABLE_JPEG) + IF(JPEG_FOUND) + INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) + ADD_DEFINITIONS(-DLAMMPS_JPEG) +- TARGET_LINK_LIBRARIES(liggghts_static jpeg) ++ #TARGET_LINK_LIBRARIES(liggghts_static jpeg) + TARGET_LINK_LIBRARIES(liggghts_shared jpeg) + TARGET_LINK_LIBRARIES(liggghts_bin jpeg) + SET(ENABLED_OPTIONS "${ENABLED_OPTIONS} JPEG") +@@ -367,7 +367,7 @@ IF(ENABLE_PNG) + IF(PNG_FOUND) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + ADD_DEFINITIONS(-DLAMMPS_PNG) +- TARGET_LINK_LIBRARIES(liggghts_static ${PNG_LIBRARY}) ++ #TARGET_LINK_LIBRARIES(liggghts_static ${PNG_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_shared ${PNG_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_bin ${PNG_LIBRARY}) + SET(ENABLED_OPTIONS "${ENABLED_OPTIONS} PNG") +@@ -398,7 +398,7 @@ IF(ENABLE_FFMPEG) + ) + INCLUDE_DIRECTORIES(${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR}) + ADD_DEFINITIONS(-DLAMMPS_FFMPEG) +- TARGET_LINK_LIBRARIES(liggghts_static ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY}) ++ #TARGET_LINK_LIBRARIES(liggghts_static ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_shared ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_bin ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY}) + +@@ -436,7 +436,7 @@ IF(ENABLE_SQ) + IF(Boost_FOUND) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + ADD_DEFINITIONS(-DSUPERQUADRIC_ACTIVE_FLAG -DNONSPHERICAL_ACTIVE_FLAG) +- TARGET_LINK_LIBRARIES(liggghts_static ${Boost_LIBRARY}) ++ #TARGET_LINK_LIBRARIES(liggghts_static ${Boost_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_shared ${Boost_LIBRARY}) + TARGET_LINK_LIBRARIES(liggghts_bin ${Boost_LIBRARY}) - IF(MPI_LINK_FLAGS) -- SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") -+ #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") - SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") - SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") - ENDIF() - ELSE(MPI_FOUND) - MESSAGE(STATUS "MPI NOT found! Using MPI Stubs instead.") - ADD_SUBDIRECTORY(STUBS) -- TARGET_LINK_LIBRARIES(liggghts_static mpi_stubs) -+ #TARGET_LINK_LIBRARIES(liggghts_static mpi_stubs) - TARGET_LINK_LIBRARIES(liggghts_shared mpi_stubs) - TARGET_LINK_LIBRARIES(liggghts_bin mpi_stubs) - ENDIF(MPI_FOUND) -@@ -128,11 +128,11 @@ ENDIF(MPI_FOUND) - # RUNTIME DESTINATION bin - # LIBRARY DESTINATION lib) +@@ -494,11 +494,11 @@ MESSAGE(STATUS "Enabled models:${ENABLED_MODELS}") + MESSAGE(STATUS "=======================================") --install(TARGETS liggghts_bin liggghts_static liggghts_shared -+install(TARGETS liggghts_bin liggghts_shared - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -- PUBLIC_HEADER DESTINATION include) -+ PUBLIC_HEADER DESTINATION include/liggghts) - IF (WIN32) - install(DIRECTORY WINDOWS DESTINATION include) + #======================================= +-INSTALL(TARGETS liggghts_bin liggghts_static liggghts_shared ++INSTALL(TARGETS liggghts_bin liggghts_shared + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +- PUBLIC_HEADER DESTINATION include) ++ PUBLIC_HEADER DESTINATION include/liggghts) + IF(WIN32) + INSTALL(DIRECTORY WINDOWS DESTINATION include) ENDIF() diff --git a/science/liggghts/pkg-plist b/science/liggghts/pkg-plist index b48b3b3b1e41..3d8e7df415bd 100644 --- a/science/liggghts/pkg-plist +++ b/science/liggghts/pkg-plist @@ -412,6 +412,34 @@ include/liggghts/sph_kernel_wendland.h include/liggghts/sph_kernel_wendland2D.h include/liggghts/sph_kernels.h include/liggghts/string_liggghts.h +include/liggghts/style_angle.h +include/liggghts/style_atom.h +include/liggghts/style_body.h +include/liggghts/style_bond.h +include/liggghts/style_cfd_datacoupling.h +include/liggghts/style_cfd_regionmodel.h +include/liggghts/style_cohesion_model.h +include/liggghts/style_command.h +include/liggghts/style_compute.h +include/liggghts/style_contact_model.h +include/liggghts/style_dihedral.h +include/liggghts/style_dump.h +include/liggghts/style_fix.h +include/liggghts/style_improper.h +include/liggghts/style_integrate.h +include/liggghts/style_kspace.h +include/liggghts/style_lb.h +include/liggghts/style_mesh_module.h +include/liggghts/style_mesh_mover.h +include/liggghts/style_minimize.h +include/liggghts/style_normal_model.h +include/liggghts/style_pair.h +include/liggghts/style_reader.h +include/liggghts/style_region.h +include/liggghts/style_rolling_model.h +include/liggghts/style_sph_kernel.h +include/liggghts/style_surface_model.h +include/liggghts/style_tangential_model.h include/liggghts/suffix.h include/liggghts/superquadric.h include/liggghts/surface_mesh.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210130752.29D7qmli036802>