From owner-svn-ports-all@freebsd.org Sat May 2 08:03:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B0382C7AB6; Sat, 2 May 2020 08:03:49 +0000 (UTC) (envelope-from yuri@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49DhTK1nVxz3PH8; Sat, 2 May 2020 08:03:49 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 387CB1E81A; Sat, 2 May 2020 08:03:49 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04283nBF000308; Sat, 2 May 2020 08:03:49 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04283m6w000304; Sat, 2 May 2020 08:03:48 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202005020803.04283m6w000304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 2 May 2020 08:03:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533673 - in head/science/lammps: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/lammps: . files X-SVN-Commit-Revision: 533673 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 May 2020 08:03:49 -0000 Author: yuri Date: Sat May 2 08:03:48 2020 New Revision: 533673 URL: https://svnweb.freebsd.org/changeset/ports/533673 Log: science/lammps: Add internal packages that were off by default; Change to shared libraries; Add GZIP_DESC Added: head/science/lammps/files/patch-lib_message_cslib_src_cslib__wrap.h (contents, props changed) Modified: head/science/lammps/Makefile head/science/lammps/files/patch-cmake_CMakeLists.txt head/science/lammps/pkg-plist Modified: head/science/lammps/Makefile ============================================================================== --- head/science/lammps/Makefile Sat May 2 08:02:06 2020 (r533672) +++ head/science/lammps/Makefile Sat May 2 08:03:48 2020 (r533673) @@ -2,6 +2,7 @@ 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= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -13,16 +14,29 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= undefined reference to `__atomic_load' CONFLICTS_BUILD= ga mpich mpich2 # conflicts with include/error.h from ga, already fixed in the head +LIB_DEPENDS= libfftw3.so:math/fftw3 + USES= blaslapack:openblas cmake:noninja eigen:3 fortran localbase:ldflags shebangfix USE_GITHUB= yes GH_TAGNAME= patch_15Apr2020 +USE_LDCONFIG= yes + SHEBANG_GLOB= *.sh *.bash SHEBANG_FILES= lib/kokkos/bin/nvcc_wrapper +CMAKE_ON= BUILD_SHARED_LIBS CMAKE_SOURCE_PATH= ${WRKSRC}/cmake CMAKE_ARGS= -DBLA_VENDOR:STRING="OpenBLAS" ${CMAKE_ARGS_${CHOSEN_COMPILER_TYPE}} CMAKE_ARGS_gcc= -DBUILD_OMP:BOOL=false +# enable packages (for a complete list see STANDARD_PACKAGES in cmake/CMakeLists.txt) +CMAKE_ON+= PKG_ASPHERE PKG_BODY PKG_CLASS2 PKG_COLLOID PKG_COMPRESS PKG_DIPOLE +CMAKE_ON+= PKG_GRANULAR PKG_KSPACE PKG_MANYBODY PKG_MC PKG_MESSAGE PKG_MOLECULE PKG_PERI PKG_POEMS PKG_QEQ +CMAKE_ON+= PKG_REPLICA PKG_RIGID PKG_SHOCK PKG_SPIN PKG_SNAP PKG_SRD +# PKG_MISC is broken: https://github.com/lammps/lammps/issues/2057 +# PKG_KIM is broken: https://github.com/lammps/lammps/issues/2059 +# Packages requiring extra downloades or dependencies: PKG_MSCG PKG_KOKKOS + OPTIONS_DEFINE= JPEG PNG GZIP FFMPEG VORONOI LATTE OPTIONS_DEFINE_clang= OPENMP OPTIONS_GROUP= PARALLEL @@ -32,7 +46,7 @@ OPTIONS_DEFAULT_clang= OPENMP OPTIONS_SUB= yes PARALLEL_DESC= Enable parallelizations: -MPI_CMAKE_BOOL= BUILD_MPI +MPI_CMAKE_BOOL= BUILD_MPI PKG_MPIIO MPI_LIB_DEPENDS= libmpi.so:net/openmpi MPI_USES= compiler:c11 @@ -45,6 +59,7 @@ JPEG_USES= jpeg PNG_CMAKE_BOOL= WITH_PNG PNG_LIB_DEPENDS= libpng.so:graphics/png +GZIP_DESC= Enable GZIP support GZIP_CMAKE_BOOL= WITH_GZIP FFMPEG_CMAKE_BOOL= WITH_FFMPEG @@ -70,5 +85,8 @@ post-patch: post-patch-FFMPEG-off: @${REINPLACE_CMD} 's|find_program(FFMPEG_EXECUTABLE|#&|' ${WRKSRC}/cmake/CMakeLists.txt + +post-install: + @${RM} -r ${STAGEDIR}${PREFIX}/lib/python* .include Modified: head/science/lammps/files/patch-cmake_CMakeLists.txt ============================================================================== --- head/science/lammps/files/patch-cmake_CMakeLists.txt Sat May 2 08:02:06 2020 (r533672) +++ head/science/lammps/files/patch-cmake_CMakeLists.txt Sat May 2 08:03:48 2020 (r533673) @@ -1,6 +1,6 @@ ---- cmake/CMakeLists.txt.orig 2020-04-03 13:58:20 UTC +--- cmake/CMakeLists.txt.orig 2020-04-15 20:09:52 UTC +++ cmake/CMakeLists.txt -@@ -62,11 +62,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") +@@ -57,11 +57,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") endif() if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") @@ -13,4 +13,4 @@ + set(CMAKE_TUNE_DEFAULT "-ffast-math") endif() - # we require C++11 + # we require C++11 without extensions Added: head/science/lammps/files/patch-lib_message_cslib_src_cslib__wrap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/lammps/files/patch-lib_message_cslib_src_cslib__wrap.h Sat May 2 08:03:48 2020 (r533673) @@ -0,0 +1,11 @@ +--- lib/message/cslib/src/cslib_wrap.h.orig 2020-05-02 07:55:51 UTC ++++ lib/message/cslib/src/cslib_wrap.h +@@ -16,6 +16,8 @@ + ifdefs allow this file to be included in a C program + */ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif Modified: head/science/lammps/pkg-plist ============================================================================== --- head/science/lammps/pkg-plist Sat May 2 08:02:06 2020 (r533672) +++ head/science/lammps/pkg-plist Sat May 2 08:03:48 2020 (r533673) @@ -51,8 +51,8 @@ lib/cmake/LAMMPS/LAMMPSConfig.cmake lib/cmake/LAMMPS/LAMMPSConfigVersion.cmake lib/cmake/LAMMPS/LAMMPS_Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LAMMPS/LAMMPS_Targets.cmake -lib/liblammps.a -%%NO_MPI%%lib/liblammps_mpi_stubs.a +lib/liblammps.so +lib/liblammps.so.0 libdata/pkgconfig/liblammps.pc man/man1/lmp.1.gz %%DATADIR%%/potentials/Ag_u3.eam