From 79c4792ad0bd788100e079b8c48936a32c77fa76 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Tue, 2 Jun 2020 02:49:07 +0000 Subject: [PATCH] science/lammps: Update 5May2020 -> 2Jun2020 Reported by: GitHub notification --- science/lammps/Makefile | 3 +-- science/lammps/distinfo | 6 +++--- science/lammps/files/patch-cmake_CMakeLists.txt | 12 ++++++------ science/lammps/pkg-plist | 12 ------------ 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/science/lammps/Makefile b/science/lammps/Makefile index defd242cb37f..4ef1c21814d3 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -2,7 +2,6 @@ PORTNAME= lammps PORTVERSION= ${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/} -PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -18,7 +17,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 USES= blaslapack:openblas cmake:noninja compiler:c++11-lang eigen:3 fortran localbase:ldflags shebangfix USE_GITHUB= yes -GH_TAGNAME= patch_5May2020 +GH_TAGNAME= patch_2Jun2020 USE_LDCONFIG= yes SHEBANG_GLOB= *.sh *.bash diff --git a/science/lammps/distinfo b/science/lammps/distinfo index d1d82a4c9439..cb76e5b59098 100644 --- a/science/lammps/distinfo +++ b/science/lammps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588639354 -SHA256 (lammps-lammps-2020.05.5-patch_5May2020_GH0.tar.gz) = c49d77fd602d28ebd8cf10f7359b9fc4d14668c72039028ed7792453d416de73 -SIZE (lammps-lammps-2020.05.5-patch_5May2020_GH0.tar.gz) = 129538875 +TIMESTAMP = 1591041459 +SHA256 (lammps-lammps-2020.06.2-patch_2Jun2020_GH0.tar.gz) = c0daa4fa6d513e8cb52efea1c751e76195b56176b197cc890a3bf98577b9facc +SIZE (lammps-lammps-2020.06.2-patch_2Jun2020_GH0.tar.gz) = 130672091 diff --git a/science/lammps/files/patch-cmake_CMakeLists.txt b/science/lammps/files/patch-cmake_CMakeLists.txt index 229575e5f7f0..7f86a1718b07 100644 --- a/science/lammps/files/patch-cmake_CMakeLists.txt +++ b/science/lammps/files/patch-cmake_CMakeLists.txt @@ -1,16 +1,16 @@ ---- cmake/CMakeLists.txt.orig 2020-04-15 20:09:52 UTC +--- cmake/CMakeLists.txt.orig 2020-06-01 19:08:09 UTC +++ cmake/CMakeLists.txt -@@ -57,11 +57,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") +@@ -65,11 +65,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") endif() if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") -- set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native") -+ set(CMAKE_TUNE_DEFAULT "-ffast-math") +- set(CMAKE_TUNE_DEFAULT "-march=native") ++ #set(CMAKE_TUNE_DEFAULT "-march=native") endif() if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") -- set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native") -+ set(CMAKE_TUNE_DEFAULT "-ffast-math") +- set(CMAKE_TUNE_DEFAULT "-march=native") ++ #set(CMAKE_TUNE_DEFAULT "-march=native") endif() # we require C++11 without extensions diff --git a/science/lammps/pkg-plist b/science/lammps/pkg-plist index 986d0618a7c0..9fcdb9b5216a 100644 --- a/science/lammps/pkg-plist +++ b/science/lammps/pkg-plist @@ -36,18 +36,6 @@ include/lammps/timer.h include/lammps/universe.h include/lammps/update.h include/lammps/variable.h -lib/cmake/LAMMPS/FindCUB.cmake -lib/cmake/LAMMPS/FindFFTW3.cmake -lib/cmake/LAMMPS/FindFFTW3F.cmake -lib/cmake/LAMMPS/FindLATTE.cmake -lib/cmake/LAMMPS/FindMKL.cmake -lib/cmake/LAMMPS/FindMSCG.cmake -lib/cmake/LAMMPS/FindNetCDF.cmake -lib/cmake/LAMMPS/FindPNetCDF.cmake -lib/cmake/LAMMPS/FindQUIP.cmake -lib/cmake/LAMMPS/FindTBB_MALLOC.cmake -lib/cmake/LAMMPS/FindVORO.cmake -lib/cmake/LAMMPS/FindZMQ.cmake lib/cmake/LAMMPS/LAMMPSConfig.cmake lib/cmake/LAMMPS/LAMMPSConfigVersion.cmake lib/cmake/LAMMPS/LAMMPS_Targets-%%CMAKE_BUILD_TYPE%%.cmake