Index: graphics/darktable/Makefile
===================================================================
--- graphics/darktable/Makefile
+++ graphics/darktable/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	darktable
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
@@ -95,21 +95,26 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
-# Enable OpenMP support with Clang 3.7.
-BUILD_DEPENDS+=	clang37:devel/llvm37
-RUN_DEPENDS+=	clang37:devel/llvm37
-
-CPP=		clang-cpp37
-CC=		clang37
-CXX=		clang++37
+.if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang
+# Enable OpenMP support with Clang 3.9.
+LLVM_VER=	39
+BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
+
+CPP=		clang-cpp${LLVM_VER}
+CC=		clang${LLVM_VER}
+CXX=		clang++${LLVM_VER}
 
 # FIXME: At least in 3.7.0 and 3.7.1, Clang doesn't find libomp.so
 # itself. Furthermore, there may be a regression in 3.7.1 because we now
-# need to explicitly link to libm.so as well.
-OPENMP_FLAGS=	-L${LOCALBASE}/llvm37/lib -lm -lomp
+# need to explicitly link to libm.so as well. This remains true with
+# Clang 3.9.1.
+OPENMP_FLAGS=	-L${LOCALBASE}/llvm${LLVM_VER}/lib -lm -lomp
 LDFLAGS+=	${OPENMP_FLAGS}
 
+# Depend on devel/openmp instead of the full LLVM at runtime. Required
+# for a consistent libomp experience.
+LIB_DEPENDS+=	libomp.so.0:devel/openmp
+
 # Last but not least, there is a second change or regression in CMake
 # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
 # anymore. The CMP0056 policy must be explicitly set to NEW to ensure
Index: graphics/darktable/distinfo
===================================================================
--- graphics/darktable/distinfo
+++ graphics/darktable/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483541541
-SHA256 (darktable-2.2.1.tar.xz) = da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc
-SIZE (darktable-2.2.1.tar.xz) = 3058236
+TIMESTAMP = 1485537770
+SHA256 (darktable-2.2.2.tar.xz) = 766d7d734e7bd5a33f6a6932a43b15cc88435c64ad9a0b20410ba5b4706941c2
+SIZE (darktable-2.2.2.tar.xz) = 3079424