git: 0683f5c25025 - main - science/lammps: Update patch_7Jan2022 -> patch_24Mar2022

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 25 Mar 2022 14:06:44 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0683f5c2502573743fe2a7490fa12d0bb765de4b

commit 0683f5c2502573743fe2a7490fa12d0bb765de4b
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-03-25 14:06:11 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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