From nobody Fri Mar 25 14:06:44 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A32461A41948; Fri, 25 Mar 2022 14:06:45 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3mj1q8sz3vYB; Fri, 25 Mar 2022 14:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648217205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cIBL+iDtoQ/YwWItHFCyqy6cvxvYZDdn8dxzb2boEw=; b=qRKDnN/9a4yX6Eckl8RgFbJ4vDm74PBRT+PV/6kPbHLAqsugjteG80jQ/qPcWISKaMOdWN VIalRhC9vD3FukMViNDvWtW439xlTN0XewGiweonSnEPGmQgwNyJB/bR87tCiTuvqYMayv JraEKrOuwQuKMmdwgx08e+FuPaJtoogi5WpQF0IFB6HFGzVqpmC5j1H9B6W9JDv6NqXUaE NyDd4G9UpdmOg14l+gpddrJt/t9lFOsnD7Q5eqHTtoAM3xAKtHfyuL1ouHloyVY3jETIHn 6hOM0FmPSDTKcitvckLZgrYwWZ5FPrlpfi60DulZGD3fvDNKxA7lqBfLycO2Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D851E5CB8; Fri, 25 Mar 2022 14:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PE6ikI059503; Fri, 25 Mar 2022 14:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PE6iGL059502; Fri, 25 Mar 2022 14:06:44 GMT (envelope-from git) Date: Fri, 25 Mar 2022 14:06:44 GMT Message-Id: <202203251406.22PE6iGL059502@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0683f5c25025 - main - science/lammps: Update patch_7Jan2022 -> patch_24Mar2022 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0683f5c2502573743fe2a7490fa12d0bb765de4b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648217205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cIBL+iDtoQ/YwWItHFCyqy6cvxvYZDdn8dxzb2boEw=; b=QJOXudw4nQ74axJ8kHUmvIDDhakRb2h/u5C1ZW9xplrKTkirU3QvYemOri0igEIpGiAwJ9 ouwY80ATyMIVv6i2kzOhLjODAsWyuhIgYAMN4tcaai5ZA+jG7MueRw71I83HYRl1mWbSwj QbVpej0vkPNRu2NVqixxHCPf+f4egAxeWli4hNM6/Y59IYjiQqrcw1d7ffDz7Auvq7R3Xm 3blvHURAKkpfOydJ4uB6duJfB5VLY37ZDDuOEnr0Oy7cUG4ziaM8QyyfkntMgnfSEvI3NK qKO5KK5lm1S0faa2r+fRbmk+i8rZFhZv4mdsQo5DDCEwgB+eolWkRVKhYJiLlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648217205; a=rsa-sha256; cv=none; b=KQJw9ffnmHC5uD5FCTyzvRM+DnklNyyCTlZNy/UOD2QuyRSbBcZgV6LzpK0+5F5X222BHm cLcBsB8MvoyGUeU/CLYhsl19JOUNlaPChSTiE+Fh/wK59joBUYjLFQoPKrmLAJepTSNz2P MnuOiSJwDQpHZwrCMnQKIB/S/qM7B8IoEjMGQp9l8JXdC+WIizGrhqOverWiU6dU7KA1l0 AW8U+oWno8FpUpoq5RhsTeduaWmnQeo3C786kKbOpq3P54yZo1c2hVb/xW1sgoyhaBi7IN bDOadpS4ccDaGRJd+FcvRbMabNA61zH57MH7Rm2YeKMwIbHghR4+VW2Xt/NNDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0683f5c2502573743fe2a7490fa12d0bb765de4b commit 0683f5c2502573743fe2a7490fa12d0bb765de4b Author: Yuri Victorovich AuthorDate: 2022-03-25 14:06:11 +0000 Commit: Yuri Victorovich CommitDate: 2022-03-25 14:06:42 +0000 science/lammps: Update patch_7Jan2022 -> patch_24Mar2022 --- science/lammps/Makefile | 17 +++++++++++------ science/lammps/distinfo | 6 +++--- science/lammps/pkg-plist | 2 ++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/science/lammps/Makefile b/science/lammps/Makefile index 4d3ddd9d7c80..6bf4fdcb17d1 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= libevent.so:devel/libevent \ libssh2.so:security/libssh2 \ libzstd.so:archivers/zstd -USES= blaslapack:openblas cmake:noninja compiler:c++14-lang eigen:3 fortran gnome localbase:ldflags python:build shebangfix +USES= blaslapack:openblas cmake:noninja compiler:c++14-lang eigen:3 fortran gnome localbase:ldflags python shebangfix USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PYTHON= cython USE_GITHUB= yes -GH_TAGNAME= patch_7Jan2022 +GH_TAGNAME= patch_24Mar2022 SHEBANG_GLOB= *.sh *.bash SHEBANG_FILES= lib/kokkos/bin/nvcc_wrapper @@ -127,14 +127,19 @@ PORTSCOUT= ignore:1 # due to a special version tagging scheme that this project CMAKE_ARGS+= -DBUILD_OMP:BOOL=true .endif -post-patch: +xpost-patch: # adjust SHELL in Makefile @${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/Makefile # fix python version, also see https://github.com/lammps/lammps/issues/3098, https://github.com/lammps/lammps/issues/3099 @${FIND} ${WRKSRC} -name "CMakeLists.txt" -o -name "*.cmake" | ${XARGS} ${REINPLACE_CMD} -e ' \ - s|find_package(Python |find_package(Python $${FREEBSD_PYTHON_VER} EXACT |; \ - s|find_package(Python3 3.6 |find_package(Python3 |; \ - s|find_package(Python3 |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT | \ + s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \ + s|find_package(Python 3.5 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \ + s|find_package(Python 3.6 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \ + s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \ + s|find_package(Python COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \ + s|find_package(Python3 COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \ + s|find_package(Python QUIET COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS |; \ + s|find_package(Python REQUIRED COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS | \ ' post-patch-FFMPEG-off: diff --git a/science/lammps/distinfo b/science/lammps/distinfo index 2725cf434b06..7ee4a58c93f8 100644 --- a/science/lammps/distinfo +++ b/science/lammps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643126318 -SHA256 (lammps-lammps-2022.01.7-patch_7Jan2022_GH0.tar.gz) = fbf6c6814968ae0d772d7b6783079ff4f249a8faeceb39992c344969e9f1edbb -SIZE (lammps-lammps-2022.01.7-patch_7Jan2022_GH0.tar.gz) = 121770953 +TIMESTAMP = 1648168879 +SHA256 (lammps-lammps-2022.03.24-patch_24Mar2022_GH0.tar.gz) = d791cc93eedfc345fdf87bfa5b6f7e17e461f86ba197f9e9c3d477ce8657a7ef +SIZE (lammps-lammps-2022.03.24-patch_24Mar2022_GH0.tar.gz) = 117161592 diff --git a/science/lammps/pkg-plist b/science/lammps/pkg-plist index 433033605f3d..64a280d1f998 100644 --- a/science/lammps/pkg-plist +++ b/science/lammps/pkg-plist @@ -77,6 +77,7 @@ man/man1/lmp.1.gz %%DATADIR%%/potentials/CH.airebo %%DATADIR%%/potentials/CH.airebo-m %%DATADIR%%/potentials/CH.rebo +%%DATADIR%%/potentials/CHAu.ILP %%DATADIR%%/potentials/CH_taper.KC %%DATADIR%%/potentials/CdTe.bop.table %%DATADIR%%/potentials/CdTe.sw @@ -145,6 +146,7 @@ man/man1/lmp.1.gz %%DATADIR%%/potentials/Mo5.2.mgpt.README %%DATADIR%%/potentials/Mo5.2.mgpt.parmin %%DATADIR%%/potentials/Mo5.2.mgpt.potin +%%DATADIR%%/potentials/MoS2.ILP %%DATADIR%%/potentials/Mo_Chen_PRM2017.snap %%DATADIR%%/potentials/Mo_Chen_PRM2017.snapcoeff %%DATADIR%%/potentials/Mo_Chen_PRM2017.snapparam