Index: head/graphics/darktable/Makefile
===================================================================
--- head/graphics/darktable/Makefile	(revision 501240)
+++ head/graphics/darktable/Makefile	(revision 501241)
@@ -1,120 +1,118 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	darktable
 PORTVERSION=	2.6.2
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	Virtual lighttable and darkroom for photographers
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		xsltproc:textproc/libxslt \
 		po4a-translate:textproc/po4a
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexiv2.so:graphics/exiv2 \
 		libjson-glib-1.0.so:devel/json-glib \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		libpng.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
 
 USES=		cmake compiler:c++11-lib desktop-file-utils	\
 		gl gnome jpeg pkgconfig sqlite tar:xz
 USE_GL=		glu
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_XORG=	ice sm x11 xext xrandr
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	COLORD DOCS FLICKR GEO GPHOTO GRAPHMAGICK	\
 		LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT WEBP
 
 GEO_DESC=	Support geotagging
 LIBSECRET_DESC=	Support libsecret as password backend
 
 OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA OPENEXR OPENJPEG	\
 		PRINT WEBP
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
 
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
 CMAKE_ARGS+=	-DBUILD_CMSTEST:BOOL=ON
 CMAKE_ARGS+=	-DUSE_KWALLET:BOOL=ON
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-fopenmp
 
 COLORD_LIB_DEPENDS=	libcolord.so:graphics/colord \
 			libcolord-gtk.so:graphics/colord-gtk
 COLORD_CMAKE_OFF=	-DUSE_COLORD:BOOL=OFF
 
 FLICKR_LIB_DEPENDS=	libflickcurl.so:www/flickcurl
 FLICKR_CMAKE_OFF=	-DUSE_FLICKR:BOOL=OFF
 
 GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
 GEO_CMAKE_OFF=		-DUSE_MAP:BOOL=OFF
 
 GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO_CMAKE_OFF=	-DUSE_CAMERA_SUPPORT:BOOL=OFF
 
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_CMAKE_OFF=	-DUSE_GRAPHICSMAGICK:BOOL=OFF
 
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 LIBSECRET_CMAKE_OFF=	-DUSE_LIBSECRET:BOOL=OFF
 
 LUA_USES=		lua:53
 LUA_CMAKE_OFF=		-DUSE_LUA:BOOL=OFF
 
 # FIXME: Even with NLS turned off, darktable(1) is still linked to
 # libintl.so.
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime
 NLS_CMAKE_OFF=		-DUSE_NLS:BOOL=OFF
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
 			libIlmThread.so:graphics/ilmbase
 OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
 
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_OFF=	-DBUILD_PRINT:BOOL=OFF
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_OFF=		-DUSE_WEBP:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang
 # Enable OpenMP support with Clang 6.0.
 LLVM_VER=	60
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 
-# Depend on devel/openmp instead of the full LLVM at runtime. Required
-# for a consistent libomp experience.
-LIB_DEPENDS+=	libomp.so:devel/openmp
+LIB_DEPENDS+=	libomp.so:devel/llvm${LLVM_VER}
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 .include <bsd.port.post.mk>
Index: head/science/agrum/Makefile
===================================================================
--- head/science/agrum/Makefile	(revision 501240)
+++ head/science/agrum/Makefile	(revision 501241)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	agrum
 DISTVERSION=	0.15.0
 CATEGORIES=	science math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical modeler for Bayesian networks, influence diagrams, etc
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_ACCOUNT=	agrumery
 GL_PROJECT=	aGrUM
 GL_COMMIT=	7df29be4ed6146f318aed810d02511a60d8afb2d
 
 CMAKE_OFF=	USE_SWIG
 
 OPTIONS_DEFINE=		ODBC OPENMP PYTHON
 OPTIONS_DEFAULT=	OPENMP PYTHON
 OPTIONS_SUB=		yes
 
 ODBC_CMAKE_BOOL=	USE_NANODBC
 ODBC_USES=		localbase:ldflags
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
-OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp
+OPENMP_LIB_DEPENDS=	libomp.so:devel/llvm${LLVM_DEFAULT}
 
 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>