science/lammps: Add the PLUMED option

Also:
* Change USER-LB to be available only for MPI=on
* Sort options alphabetically

1 files changed, 21 insertions, 16 deletions

diff --git a/science/lammps/Makefile b/science/lammps/Makefile
index 85d7b8e74eca..e533605d54db 100644
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@@ -2,7 +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=	8
+PORTREVISION=	9
 CATEGORIES=	science
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -41,26 +41,27 @@ 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_MISC 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-ATC PKG_USER-AWPMD PKG_USER-BOCS PKG_USER-CGDNA PKG_USER-MESODPD PKG_USER-CGSDK PKG_USER-COLVARS
-CMAKE_ON+=	PKG_USER-DIFFRACTION PKG_USER-DPD PKG_USER-DRUDE PKG_USER-EFF PKG_USER-FEP PKG_USER-LB
+CMAKE_ON+=	PKG_USER-DIFFRACTION PKG_USER-DPD PKG_USER-DRUDE PKG_USER-EFF PKG_USER-FEP
 CMAKE_ON+=	PKG_USER-MANIFOLD PKG_USER-MEAMC PKG_USER-MGPT PKG_USER-MISC PKG_USER-MOFFF PKG_USER-MOLFILE
 CMAKE_ON+=	PKG_USER-PHONON PKG_USER-PTM PKG_USER-QTB PKG_USER-REACTION
 CMAKE_ON+=	PKG_USER-REAXC PKG_USER-SDPD PKG_USER-SMD PKG_USER-SMTBQ PKG_USER-SPH PKG_USER-TALLY
 CMAKE_ON+=	PKG_USER-UEF PKG_USER-QMMM PKG_USER-YAFF
-# Packages requiring extra downloades or dependencies: PKG_MSCG PKG_USER-ADIOS2 PKG_USER-NETCDF PKG_USER-QUIP PKG_USER-PLUMED PKG_USER-SCAFACOS
+# Packages requiring extra downloades or dependencies: PKG_MSCG PKG_USER-ADIOS2 PKG_USER-NETCDF PKG_USER-QUIP PKG_USER-SCAFACOS
 
 OPTIONS_DEFINE=		JPEG PNG GZIP FFMPEG
 OPTIONS_GROUP=		PARALLEL PACKAGES
-OPTIONS_DEFAULT=	MPI OPENMP JPEG PNG GZIP FFMPEG H5MD KOKKOS VORONOI KIM LATTE ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
+OPTIONS_DEFAULT=	MPI OPENMP JPEG PNG GZIP FFMPEG H5MD KIM KOKKOS LATTE PLUMED VORONOI ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_SUB=		yes
 PARALLEL_DESC=		Enable parallelizations:
 PACKAGES_DESC=		Enable packages:
 OPTIONS_GROUP_PARALLEL=	MPI OPENMP ${OPTIONS_DEFINE_${CHOSEN_COMPILER_TYPE}}
-OPTIONS_GROUP_PACKAGES=	H5MD KOKKOS VORONOI KIM LATTE VTK
+OPTIONS_GROUP_PACKAGES=	H5MD KIM KOKKOS LATTE PLUMED VORONOI VTK
 
-MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO
+MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO PKG_USER-LB
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_USES=		compiler:c11
 
+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_BUILD_DEPENDS=	ffmpeg:multimedia/ffmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
@@ -73,21 +74,11 @@ PNG_LIB_DEPENDS=	libpng.so:graphics/png
 GZIP_DESC=		Enable GZIP support
 GZIP_CMAKE_BOOL=	WITH_GZIP
 
-FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
-
 H5MD_DESC=		USER-H5MD package based on libhdf5
 H5MD_CMAKE_BOOL=	PKG_USER-H5MD
 H5MD_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/szip
 
-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++
-
 KIM_DESC=		KIM package based on the OpenKim library/repository
 KIM_USES=		pkgconfig
 KIM_CMAKE_BOOL=		PKG_KIM
@@ -96,10 +87,24 @@ KIM_LIB_DEPENDS=	libkim-api.so:science/kim-api \
 			libcurl.so:ftp/curl
 KIM_RUN_DEPENDS=	openkim-models>0:science/openkim-models
 
+KOKKOS_DESC=		kokkos package based on the libkokkos library
+KOKKOS_CMAKE_BOOL=	PKG_KOKKOS EXTERNAL_KOKKOS
+KOKKOS_LIB_DEPENDS=	libkokkoscore.so:devel/kokkos
+
 LATTE_DESC=		latte package based on the liblatte library
 LATTE_CMAKE_BOOL=	PKG_LATTE
 LATTE_LIB_DEPENDS=	liblatte.so:science/latte
 
+PLUMED_DESC=		plumed package based on the plumed library
+PLUMED_USES=		pkgconfig
+PLUMED_CMAKE_BOOL=	PKG_USER-PLUMED
+PLUMED_CMAKE_ON=	-DPLUMED_MODE=shared
+PLUMED_LIB_DEPENDS=	libplumed.so:science/plumed
+
+VORONOI_DESC=		voro++, Voronoi tessellation package
+VORONOI_CMAKE_BOOL=	PKG_VORONOI
+VORONOI_LIB_DEPENDS=	libvoro++.so:science/voro++
+
 VTK_DESC=		USER-VTK package based on the external vtk package
 VTK_CMAKE_BOOL=		PKG_USER-VTK
 VTK_CMAKE_ON=		-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2