Index: Makefile
===================================================================
--- Makefile	(revision 511980)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	darktable
 PORTVERSION=	2.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
@@ -12,6 +12,9 @@
 
 LICENSE=	GPLv3
 
+ONLY_FOR_ARCHS=		amd64
+ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
+
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		xsltproc:textproc/libxslt \
 		po4a-translate:textproc/po4a
@@ -25,15 +28,13 @@
 		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
+		gl gnome jpeg pkgconfig sqlite tar:xz xorg
 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	\
@@ -99,15 +100,7 @@
 .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}
-
-LIB_DEPENDS+=	libomp.so:devel/llvm${LLVM_VER}
+LIB_DEPENDS+=	libomp.so:devel/openmp
 .endif
 
 .if defined(WITH_DEBUG)
Index: files/patch-src_CMakeLists.txt
===================================================================
--- files/patch-src_CMakeLists.txt	(revision 511980)
+++ files/patch-src_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- src/CMakeLists.txt.orig
+--- src/CMakeLists.txt.orig	2019-03-20 08:14:56 UTC
 +++ src/CMakeLists.txt
 @@ -336,7 +336,7 @@ if(USE_OPENJPEG)
      add_definitions("-DHAVE_OPENJPEG")
Index: files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake
===================================================================
--- files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake	(revision 511980)
+++ files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake	(working copy)
@@ -1,6 +1,6 @@
---- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig	2018-01-18 18:05:10 UTC
+--- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig	2019-01-30 18:42:57 UTC
 +++ src/external/rawspeed/cmake/Modules/CheckZLIB.cmake
-@@ -38,7 +38,7 @@ endif()
+@@ -40,7 +40,7 @@ endif()
  CHECK_PROTOTYPE_DEFINITION(zError
   "const char* zError(int zErrorCode)"
   "NULL"