Index: head/science/lammps/Makefile
===================================================================
--- head/science/lammps/Makefile	(revision 533734)
+++ head/science/lammps/Makefile	(revision 533735)
@@ -1,98 +1,106 @@
 # $FreeBSD$
 
 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
+PORTREVISION=	3
 CATEGORIES=	science
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	89f119e8aa44ab31139cf4caceacb546c08f199d.patch:-p1 \
+		c18efdbfa70f42390a3d535ccb1b8a423260f63a.patch:-p1 \
+		613b8a759666b4e2e15fca38323cf5455e154a6c.patch:-p1 \
+		2b542eacb7def4c6da6ff94ab716cb012111551e.patch:-p1 \
+		795e2cb133b99ed3b77fc73f367fff7bc9368b78.patch:-p1 # https://github.com/lammps/lammps/pull/2051
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Classical molecular dynamics code with a focus on materials modeling
 
 LICENSE=	GPLv2
 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
+CMAKE_ON+=	PKG_USER-MANIFOLD PKG_USER-MEAMC PKG_USER-MGPT PKG_USER-MISC PKG_USER-MOFFF PKG_USER-MOLFILE
 # 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
 
-OPTIONS_DEFINE=		JPEG PNG GZIP FFMPEG KOKKOS VORONOI LATTE
+OPTIONS_DEFINE=		JPEG PNG GZIP FFMPEG
 OPTIONS_DEFINE_clang=	OPENMP
 OPTIONS_GROUP=		PARALLEL PACKAGES
 OPTIONS_DEFAULT=	MPI JPEG PNG GZIP FFMPEG KOKKOS VORONOI LATTE ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_DEFAULT_clang=	OPENMP
 OPTIONS_SUB=		yes
 PARALLEL_DESC=		Enable parallelizations:
 PACKAGES_DESC=		Enable packages:
 OPTIONS_GROUP_PARALLEL=	MPI ${OPTIONS_DEFINE_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_GROUP_PACKAGES=	KOKKOS VORONOI LATTE
 
 MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_USES=		compiler:c11
 
 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=	libpng.so:graphics/png
 
 GZIP_DESC=		Enable GZIP support
 GZIP_CMAKE_BOOL=	WITH_GZIP
 
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
 KOKKOS_DESC=		kokkos package based on the libkokkos library
 KOKKOS_CMAKE_BOOL=	PKG_KOKKOS EXTERNAL_KOKKOS
 KOKKOS_LIB_DEPENDS=	libkokkoscore.so:devel/kokkos
 
 VORONOI_DESC=		voro++, Voronoi tessellation package
 VORONOI_CMAKE_BOOL=	PKG_VORONOI
 VORONOI_LIB_DEPENDS=	libvoro++.so:science/voro++
 
 LATTE_DESC=		latte package based on the liblatte library
 LATTE_CMAKE_BOOL=	PKG_LATTE
 LATTE_LIB_DEPENDS=	liblatte.so:science/latte
 
 PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project uses portscout fails to find new versions, watching their GitHub release page instead
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
 CMAKE_ARGS+=	-DBUILD_OMP:BOOL=true
 .endif
 
 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}/cmake/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/python*
 
 .include <bsd.port.mk>
Index: head/science/lammps/distinfo
===================================================================
--- head/science/lammps/distinfo	(revision 533734)
+++ head/science/lammps/distinfo	(revision 533735)
@@ -1,3 +1,13 @@
-TIMESTAMP = 1587356019
+TIMESTAMP = 1588473333
 SHA256 (lammps-lammps-2020.04.15-patch_15Apr2020_GH0.tar.gz) = 16f246a32b7bb74520a6f8a5dbcb7f31b769db5458494a333648f78eaf8092c3
 SIZE (lammps-lammps-2020.04.15-patch_15Apr2020_GH0.tar.gz) = 124312978
+SHA256 (89f119e8aa44ab31139cf4caceacb546c08f199d.patch) = a2ca2d3b59154947db637789905c84a4b464d23f42f3cc65730d3419ca4ff0ff
+SIZE (89f119e8aa44ab31139cf4caceacb546c08f199d.patch) = 1115
+SHA256 (c18efdbfa70f42390a3d535ccb1b8a423260f63a.patch) = e7ac2062355485644899824b2f7a88f4bdecb069f3ee3cd2721a51c1ad4cf591
+SIZE (c18efdbfa70f42390a3d535ccb1b8a423260f63a.patch) = 960
+SHA256 (613b8a759666b4e2e15fca38323cf5455e154a6c.patch) = 8f524d960e6922dbfc27fb4fe2d956c3cf4fea511d715742fb30024fabc0bb53
+SIZE (613b8a759666b4e2e15fca38323cf5455e154a6c.patch) = 2257
+SHA256 (2b542eacb7def4c6da6ff94ab716cb012111551e.patch) = fd563d2a2bfc7f32bcc9009f9b73cc0e24fae4dae35690318384093c68728f28
+SIZE (2b542eacb7def4c6da6ff94ab716cb012111551e.patch) = 665
+SHA256 (795e2cb133b99ed3b77fc73f367fff7bc9368b78.patch) = 86ca2e8500cafebe1791947ebf01828ca0ce6f68a1c8bf474fbbecc48f5c00a4
+SIZE (795e2cb133b99ed3b77fc73f367fff7bc9368b78.patch) = 867