16 files changed, 23 insertions, 51 deletions

diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 814e48f9d286..cbdcf3ff9b6f 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	abinit
 DISTVERSION=	8.10.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	https://www.abinit.org/sites/default/files/packages/
 
@@ -34,7 +34,6 @@ OPTIONS_DEFAULT=		OPENMP MPI
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_LDFLAGS=			-lomp
-OPENMP_LIB_DEPENDS=		libomp.so:devel/openmp
 
 MPI_CONFIGURE_ENABLE=		mpi
 MPI_VARS=			FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include
diff --git a/science/agrum/Makefile b/science/agrum/Makefile
index dfee58e62136..c764fc646dc4 100644
--- a/science/agrum/Makefile
+++ b/science/agrum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	agrum
 DISTVERSION=	0.16.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -31,19 +31,9 @@ ODBC_USES=		localbase:ldflags
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
-OPENMP_LIB_DEPENDS=	libomp.so:devel/llvm${LLVM_DEFAULT}
-OPENMP_LDFLAGS=		${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libomp.so # XXX it still links to libomp.so from the openmp package when it is installed
-OPENMP_CONFLICTS_BUILD=	openmp
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_USES=		python
 PYTHON_PLIST_SUB=	PYTHON_VER_MAJ=${PYTHON_VER:R}
 
-# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-RUN_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
-
 .include <bsd.port.mk>
diff --git a/science/chrono/Makefile b/science/chrono/Makefile
index 7c668577a899..6a41074dd738 100644
--- a/science/chrono/Makefile
+++ b/science/chrono/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	chrono
 DISTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	science devel
 PKGNAMESUFFIX=	-physics-simulation-engine
 
@@ -14,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_i386=	use of overloaded operator '[]' is ambiguous (with operand types 'chrono::quaternion' and 'int'): https://github.com/projectchrono/chrono/issues/158
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi
-LIB_DEPENDS=	libomp.so:devel/openmp
 
 USES=		cmake compiler:c++14-lang eigen:3 fortran
 USE_GITHUB=	yes
diff --git a/science/erkale/Makefile b/science/erkale/Makefile
index 85e62897f858..a868cbbe10c1 100644
--- a/science/erkale/Makefile
+++ b/science/erkale/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	erkale
 DISTVERSION=	g20200110
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -44,7 +44,6 @@ CMAKE_OFF=	USE_OPENMP
 .else # parallel
 CMAKE_ON+=	USE_OPENMP
 SUFFIX=		_omp
-LIB_DEPENDS+=	libomp.so:devel/llvm${LLVM_DEFAULT}
 .endif
 
 OPTIONS_SINGLE=		LINALG
@@ -61,13 +60,6 @@ OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas
 OPENBLAS_LIB_DEPENDS=	libopenblas.so:math/openblas
 
-# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678
-# have the same compiler for both serial and parallel flavors so that performance numbers can be compared
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
-
 .if ${FLAVOR} == parallel
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/include/erkale ${STAGEDIR}${PREFIX}/include/erkale${SUFFIX}
diff --git a/science/gabedit/Makefile b/science/gabedit/Makefile
index 042b0dd596f3..ac2ccb3a155f 100644
--- a/science/gabedit/Makefile
+++ b/science/gabedit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gabedit
 DISTVERSION=	2.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 #MASTER_SITES=	http://prdownloads.sourceforge.net/${PORTNAME}/ # old SF-based source
 #DISTNAME=	GabeditSrc${DISTVERSION:S/.//g}
@@ -41,8 +41,6 @@ PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
 OPTIONS_DEFINE=		OPENMP
 OPTIONS_DEFAULT=	OPENMP
 
-OPENMP_LIB_DEPENDS=	libgomp.so:devel/openmp
-
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/|${PREFIX}/|; s| -O2| ${CFLAGS}|; s|gcc|${CC}|' ${WRKSRC}/CONFIG
 
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index dc75b92b7a56..21e8f29fb53d 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gromacs
 DISTVERSION=	2020.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
@@ -53,7 +54,6 @@ OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
 OPENMP_CMAKE_ON=	-DGMX_CXX11:BOOL=OFF
 OPENMP_CMAKE_OFF=	-DGMX_OPENMP:BOOL=OFF
-OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp
 
 SIMD_CMAKE_OFF=		-DGMX_SIMD:STRING="None"
 
diff --git a/science/lammps/Makefile b/science/lammps/Makefile
index 312e73f5e79c..0eef1956085a 100644
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@@ -2,6 +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=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -61,9 +62,7 @@ PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
-USES+=	localbase
 CMAKE_ARGS+=	-DBUILD_OMP:BOOL=true
-LIB_DEPENDS+=	libomp.so:devel/openmp
 .endif
 
 post-patch:
diff --git a/science/latte/Makefile b/science/latte/Makefile
index 75445cc95e69..2d7d60fb758c 100644
--- a/science/latte/Makefile
+++ b/science/latte/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	latte
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -32,7 +32,6 @@ DBCSR_LIB_DEPENDS=	libdbcsr.so:math/dbcsr
 DBCSR_BROKEN=		see https://github.com/lanl/LATTE/issues/92
 
 OPENMP_CMAKE_BOOL=	OPENMP
-OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp
 
 MPI_CMAKE_BOOL=		DO_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
diff --git a/science/nest/Makefile b/science/nest/Makefile
index e9f27f1138de..9977278e18f5 100644
--- a/science/nest/Makefile
+++ b/science/nest/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	nest
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.20.0
+PORTREVISION=	1
 CATEGORIES=	science biology # NEST is used in neuroscience
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_i386=	https://github.com/nest/nest-simulator/issues/1205
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
-		libltdl.so:devel/libltdl \
-		libomp.so:devel/openmp
+		libltdl.so:devel/libltdl
 
 USES=		cmake compiler:c++11-lang ncurses pkgconfig readline
 USE_GITHUB=	yes
diff --git a/science/openmx/Makefile b/science/openmx/Makefile
index 713c7a5232c7..612806700547 100644
--- a/science/openmx/Makefile
+++ b/science/openmx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openmx
 DISTVERSION=	3.8.5 # the 18June12 patch upgrades 3.8 -> 3.8.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 MASTER_SITES=	http://www.openmx-square.org/ \
 		http://www.openmx-square.org/bugfixed/18June12/:patch
@@ -23,8 +23,7 @@ BROKEN_i386=	undefined reference to `__atomic_load', see bug#229605 and https://
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich \
-		libiomp5.so:devel/openmp
+		libmpich.so:net/mpich
 
 USES=		dos2unix fortran gmake localbase:ldflags
 DOS2UNIX_FILES=	openmx_common.h
diff --git a/science/openmx/files/patch-makefile b/science/openmx/files/patch-makefile
index f70af174a079..2a21aa3db1fe 100644
--- a/science/openmx/files/patch-makefile
+++ b/science/openmx/files/patch-makefile
@@ -9,7 +9,7 @@
 -LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77
 +CC = mpicc $(CFLAGS) -fopenmp
 +FC = mpif90 $(FFLAGS) -fopenmp
-+LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -liomp5
++LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -lomp
  
  
  
diff --git a/science/py-GPy/Makefile b/science/py-GPy/Makefile
index 495ed6b30704..ab5a4ed4e664 100644
--- a/science/py-GPy/Makefile
+++ b/science/py-GPy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	GPy
 DISTVERSION=	1.9.9
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,13 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		${LOCALBASE}/lib/libomp.so:devel/openmp
+BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramz>=0.9.0:science/py-paramz@${PY_FLAVOR} \
-		${LOCALBASE}/lib/libomp.so:devel/openmp
+		${PYTHON_PKGNAMEPREFIX}paramz>=0.9.0:science/py-paramz@${PY_FLAVOR}
 
 USES=		localbase python:-3.6
 USE_PYTHON=	distutils autoplist
diff --git a/science/py-PyFR/Makefile b/science/py-PyFR/Makefile
index e0c3485d17fb..b9ef83a085cd 100644
--- a/science/py-PyFR/Makefile
+++ b/science/py-PyFR/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	PyFR
 DISTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	http://www.pyfr.org/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,8 +33,7 @@ PARALLEL_DESC=		Parallelization backends to install
 
 OPENCL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${PY_FLAVOR} \
 			clblas>0:math/clblas
-OPENMP_RUN_DEPENDS=	openmp>0:devel/openmp \
-			libxsmm>0:math/libxsmm
+OPENMP_RUN_DEPENDS=	libxsmm>0:math/libxsmm
 
 pre-build: # patch in pre-build to make the patch less error-prone (it has %%LOCALBASE%%)
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/pyfr/backends/openmp/compiler.py
diff --git a/science/py-phono3py/Makefile b/science/py-phono3py/Makefile
index febec89d1ff7..d126cd5a4d58 100644
--- a/science/py-phono3py/Makefile
+++ b/science/py-phono3py/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	phono3py
 DISTVERSION=	1.13.3.27
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,14 +18,12 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonopy>=1.13.2:science/py-phonopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${LOCALBASE}/include/lapacke.h:math/lapacke \
-		openmp>0:devel/openmp
+		${LOCALBASE}/include/lapacke.h:math/lapacke
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonopy>=1.13.2:science/py-phonopy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		openmp>0:devel/openmp
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		blaslapack:openblas localbase python
 USE_PYTHON=	distutils cython autoplist
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index 3ca67b3e8611..73d7c1d636ef 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scikit-learn
 DISTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.11.0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR}
-LIB_DEPENDS=	libomp.so:devel/openmp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python:3.5+ localbase
diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile
index 7fee8b9da918..3add2774d0b5 100644
--- a/science/qmcpack/Makefile
+++ b/science/qmcpack/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	qmcpack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -18,7 +18,6 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libhdf5.so:science/hdf5 \
 		libmpich.so:net/mpich \
-		libomp.so:devel/openmp \
 		libopenblas.so:math/openblas \
 		libsz.so:science/szip