From owner-svn-ports-all@freebsd.org Tue Nov 6 21:31:44 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8AA6110170F; Tue, 6 Nov 2018 21:31:43 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62501708D4; Tue, 6 Nov 2018 21:31:43 +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 43761480C; Tue, 6 Nov 2018 21:31:43 +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 wA6LVhuN099853; Tue, 6 Nov 2018 21:31:43 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6LVgF7099851; Tue, 6 Nov 2018 21:31:42 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201811062131.wA6LVgF7099851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 6 Nov 2018 21:31:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484356 - head/science/lammps X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/science/lammps X-SVN-Commit-Revision: 484356 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 62501708D4 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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: Tue, 06 Nov 2018 21:31:44 -0000 Author: yuri Date: Tue Nov 6 21:31:42 2018 New Revision: 484356 URL: https://svnweb.freebsd.org/changeset/ports/484356 Log: science/lammps: Add port options for additional functionality Modified: head/science/lammps/Makefile head/science/lammps/distinfo Modified: head/science/lammps/Makefile ============================================================================== --- head/science/lammps/Makefile Tue Nov 6 21:26:49 2018 (r484355) +++ head/science/lammps/Makefile Tue Nov 6 21:31:42 2018 (r484356) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= lammps -PORTVERSION= ${GH_TAGNAME:C/stable_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\3.\2.\1/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 +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 @@ -11,24 +11,63 @@ COMMENT= Classical molecular dynamics code with a focu LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpng16.so:graphics/png \ - libmpi_cxx.so:net/openmpi +CONFLICTS_BUILD= ga # conflicts with include/error.h, already fixed in the head -USES= cmake:outsource eigen:3 jpeg shebangfix +USES= blaslapack:openblas cmake:outsource,noninja eigen:3 fortran shebangfix USE_GITHUB= yes GH_TAGNAME= stable_22Aug2018 SHEBANG_GLOB= *.sh *.bash SHEBANG_FILES= lib/kokkos/bin/nvcc_wrapper CMAKE_SOURCE_PATH= ${WRKSRC}/cmake +CMAKE_ARGS= -DBLA_VENDOR:STRING="OpenBLAS" -OPTIONS_DEFINE= FFMPEG -OPTIONS_DEFAULT= FFMPEG +OPTIONS_DEFINE= JPEG PNG GZIP FFMPEG VORONOI LATTE +OPTIONS_GROUP= PARALLEL +OPTIONS_GROUP_PARALLEL= MPI OPENMP +OPTIONS_DEFAULT= MPI OPENMP JPEG PNG GZIP FFMPEG VORONOI LATTE +PARALLEL_DESC= Enable parallelizations: +MPI_CMAKE_BOOL= BUILD_MPI +MPI_LIB_DEPENDS= libmpi.so:net/openmpi + +OPENMP_CMAKE_BOOL= BUILD_OMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp + FFMPEG_BUILD_DEPENDS= ffmpeg:multimedia/ffmpeg FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg +JPEG_CMAKE_BOOL= WITH_JPEG +JPEG_USES= jpeg + +PNG_CMAKE_BOOL= WITH_PNG +PNG_LIB_DEPENDS= libpng16.so:graphics/png + +GZIP_CMAKE_BOOL= WITH_GZIP + +FFMPEG_CMAKE_BOOL= WITH_FFMPEG + +VORONOI_DESC= Use voro++, Voronoi tessellation package +VORONOI_CMAKE_BOOL= PKG_VORONOI +LIB_DEPENDS= libvoro++.so:science/voro++ + +LATTE_DESC= Use LATTE package +LATTE_CMAKE_BOOL= PKG_LATTE +LATTE_LIB_DEPENDS= liblatte.so:science/latte + +# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 +LLVM_VER= 60 +BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} +CPP= clang-cpp${LLVM_VER} +CC= clang${LLVM_VER} +CXX= clang++${LLVM_VER} + +MAKE_ARGS= VERBOSE=1 + +post-patch: + @${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/Makefile + post-patch-FFMPEG-off: - @${REINPLACE_CMD} 's|find_program(FFMPEG_EXECUTABLE|#&|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} 's|find_program(FFMPEG_EXECUTABLE|#&|' ${WRKSRC}/cmake/CMakeLists.txt .include Modified: head/science/lammps/distinfo ============================================================================== --- head/science/lammps/distinfo Tue Nov 6 21:26:49 2018 (r484355) +++ head/science/lammps/distinfo Tue Nov 6 21:31:42 2018 (r484356) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536211844 +TIMESTAMP = 1540967816 SHA256 (lammps-lammps-2018.08.22-stable_22Aug2018_GH0.tar.gz) = 78e7b389523d2fd5243a6f2daab72667907980d31bee22e44b64122c3afc9f04 SIZE (lammps-lammps-2018.08.22-stable_22Aug2018_GH0.tar.gz) = 108761541