3 files changed, 24 insertions, 22 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index fad57a24ceb8..54d7ae15c27d 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	darktable
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
@@ -12,13 +12,16 @@ COMMENT=	Virtual lighttable and darkroom for photographers
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xsltproc:textproc/libxslt
+BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:graphics/squish \
+		xsltproc:textproc/libxslt
 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 \
+		libpng16.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
+		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff
 
 ONLY_FOR_ARCHS=		amd64
@@ -26,23 +29,21 @@ ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils	\
 		jpeg ninja pkgconfig sqlite tar:xz
-USE_GNOME=	gtk30 intltool librsvg2 libxml2
+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
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	COLORD DOCS FLICKR GEO GNOMEKEYRING GPHOTO GRAPHMAGICK	\
-		LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT RAWSPEED	\
-		SLIDESHOW SQUISH WEBP
+		LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT SLIDESHOW WEBP
 
 GEO_DESC=	Support geotagging
 LIBSECRET_DESC=	Support libsecret as password backend
-SQUISH_DESC=	Compress thumbnail via libsquish
-RAWSPEED_DESC=	Compile with rawspeed backend
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
 
 OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA OPENEXR OPENJPEG	\
-		PRINT RAWSPEED SLIDESHOW SQUISH WEBP
+		PRINT SLIDESHOW WEBP
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
@@ -53,14 +54,14 @@ CMAKE_ARGS+=	-DUSE_KWALLET:BOOL=ON
 
 # darktable 1.4+ can use colord but provides its own libcolord,
 # statically linked to libdarktable.so.
-COLORD_LIB_DEPENDS=	libcolord-gtk.so:graphics/colord-gtk
+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 \
-			libsoup-2.4.so:devel/libsoup
+GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
 GEO_CMAKE_OFF=		-DUSE_GEO:BOOL=OFF
 
 GNOMEKEYRING_LIB_DEPENDS=libgnome-keyring.so:security/libgnome-keyring
@@ -78,10 +79,15 @@ LIBSECRET_CMAKE_OFF=	-DUSE_LIBSECRET:BOOL=OFF
 LUA_USES=		lua:52
 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
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+			libIlmThread-2_2.so:graphics/ilmbase
 OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
@@ -90,14 +96,9 @@ OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_OFF=	-DBUILD_PRINT:BOOL=OFF
 
-RAWSPEED_CMAKE_OFF=	-DDONT_USE_RAWSPEED:BOOL=ON
-
 SLIDESHOW_USE=		GL=gl SDL=sdl
 SLIDESHOW_CMAKE_OFF=	-DBUILD_SLIDESHOW:BOOL=OFF
 
-SQUISH_BUILD_DEPENDS=	${LOCALBASE}/lib/libsquish.a:graphics/squish
-SQUISH_CMAKE_OFF=	-DUSE_SQUISH:BOOL=OFF
-
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_OFF=		-DUSE_WEBP:BOOL=OFF
 
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 48fc049c2374..196b435628fc 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (darktable-2.0.4.tar.xz) = 80e448622ff060bca1d64bf6151c27de34dea8fe6b7ddb708e1e3526a5961e62
-SIZE (darktable-2.0.4.tar.xz) = 3013676
+TIMESTAMP = 1467836994
+SHA256 (darktable-2.0.5.tar.xz) = 898b71b94e7ef540eb1c87c829daadc8d8d025b1705d4a9471b1b9ed91b90a02
+SIZE (darktable-2.0.5.tar.xz) = 3015380
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index 9ebf7c536d5f..a1e20d45f93b 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -296,8 +296,8 @@ share/applications/darktable.desktop
 %%DATADIR%%/pixmaps/plugins/darkroom/watermark.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png
 %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.svg
-%%RAWSPEED%%%%DATADIR%%/rawspeed/cameras.xml
-%%RAWSPEED%%%%DATADIR%%/rawspeed/showcameras.xsl
+%%DATADIR%%/rawspeed/cameras.xml
+%%DATADIR%%/rawspeed/showcameras.xsl
 %%DATADIR%%/style/bullet.gif
 %%DATADIR%%/style/close.gif
 %%DATADIR%%/style/closelabel.gif