- Belatedly update to version 0.9

- Build is now CMake-based instead of GNU make
- Remove libglade-2.0 dependency: while being listed as mandatory, it does
  not seems to be really required
- Whenever possible, make dependencies OPTIONal (gconf2, dbus-glib, gphoto2)
  and only enable camera support by default, since it is what likely most
  users want

4 files changed, 135 insertions, 164 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 64ee7672c2d3..0680be4b3c43 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	darktable
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.9
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7
+MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A virtual lighttable and darkroom for photographers
@@ -18,44 +17,91 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		lensfun.2:${PORTSDIR}/graphics/lensfun \
-		lcms.1:${PORTSDIR}/graphics/lcms \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		lcms2.2:${PORTSDIR}/graphics/lcms2 \
 		curl.6:${PORTSDIR}/ftp/curl
 
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
+CMAKE_OUTSOURCE=	yes
+CMAKE_VERBOSE=	yes
 USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	libglade2 librsvg2 gconf2
-GCONF_SCHEMAS=	${PORTNAME}.schemas
+USE_GNOME=	librsvg2
 USE_SQLITE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-silent-rules --disable-gkeyring
+USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 MAN1=		${PORTNAME}.1
 
+OPTIONS=	GCONF	"Enable GConf backend"			off \
+		GPHOTO	"Enable camera support via libgphoto2"	on \
+		FLICKR	"Enable Flickr support via flickcurl"	off \
+		KWALLET	"Enable KWallet support (requires dbus-glib)" off \
+		GKEYRING "Enable GNOME Keyring support"		off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GCONF)
+USE_GNOME+=	gconf2
+CMAKE_ARGS+=	-DDONT_INSTALL_GCONF_SCHEMAS:BOOL=ON	# bogus name, no typo
+GCONF_SCHEMAS=	${PORTNAME}.schemas
+.else
+CMAKE_ARGS+=	-DUSE_GCONF_BACKEND:BOOL=OFF
+PLIST_FILES+=	share/darktable/darktablerc
+.endif
+
+.if defined(WITH_GPHOTO)
+LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+PLIST_FILES+=	lib/darktable/plugins/lighttable/libcamera.so \
+		lib/darktable/plugins/lighttable/libcapture.so \
+		lib/darktable/views/libcapture.so
+.else
+CMAKE_ARGS+=	-DUSE_CAMERA_SUPPORT:BOOL=OFF
+.endif
+
+.if defined(WITH_FLICKR)
+LIB_DEPENDS+=	flickcurl.0:${PORTSDIR}/www/flickcurl
+PLIST_FILES+=	lib/darktable/plugins/imageio/storage/libflickr.so
+.endif
+
+.if defined(WITH_KWALLET)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.endif
+
+.if defined(WITH_GKEYRING)
+LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+.endif
+
 post-patch:
-# BSD readlink(1) is incompatible with one from GNU coreutils
-	@${REINPLACE_CMD} -e 's,readlink -f,realpath,' \
-		${WRKSRC}/tools/create_version_h.sh
-# Adjust location of `gnome-keyring.h' header file
-	@${REINPLACE_CMD} -e 's,gnome-keyring\.h,gnome-keyring-1/&,' \
-		${WRKSRC}/src/common/pwstorage/backend_gkeyring.c
-# Remove `-g' from C[PP]FLAGS
-	@${REINPLACE_CMD} -e 's, -g$$,,' \
-		${WRKSRC}/src/LibRaw/Makefile.in \
-		${WRKSRC}/src/iop/Makefile.in
-	@${REINPLACE_CMD} -E 's,[[:blank:]]-g([^t]),\1,' \
-		${WRKSRC}/src/imageio/format/Makefile.in \
-		${WRKSRC}/src/imageio/storage/Makefile.in \
-		${WRKSRC}/src/libs/Makefile.in \
-		${WRKSRC}/src/iop/Makefile.in \
-		${WRKSRC}/src/views/Makefile.in
-# Drop `-Werror' to fix the build of `common/image.c' on i386
-	@${REINPLACE_CMD} -e 's,-Werror ,,' ${WRKSRC}/src/Makefile.in
-# Do not install useless documentation files
-	@${REINPLACE_CMD} -e 's, install-dtdocDATA,,' ${WRKSRC}/Makefile.in
+# Do not install useless (to end-user) documentation files
+	@${REINPLACE_CMD} -e '/DOC_FILES/d' ${WRKSRC}/doc/CMakeLists.txt
+# Respect CFLAGS for release builds; also disable -Werror for Unix since
+# unfortunately build fails with it for now
+	@${REINPLACE_CMD} -e '/-O3/s,^,#, ; s,NOT APPLE,& AND NOT UNIX,' \
+		${WRKSRC}/src/CMakeLists.txt
+# Remove `-g' from common CFLAGS which are used for release builds as well
+	@${REINPLACE_CMD} -e '/-msse2/s, -g,,' ${WRKSRC}/src/CMakeLists.txt
+# In FreeBSD, <malloc.h> has been replaced by <stdlib.h>
+	@${REINPLACE_CMD} -e '/include/s,<malloc,<stdlib,' \
+		${WRKSRC}/src/rawspeed/RawSpeed/StdAfx.h
+# Fix GConf schemas installation prefix
+	@${REINPLACE_CMD} -e 's,/etc/gconf/schemas,.&,' \
+		${WRKSRC}/data/CMakeLists.txt
+# Adjust manpages path
+	@${REINPLACE_CMD} -e 's,share/man/man1,man/man1,' \
+		${WRKSRC}/doc/CMakeLists.txt
+# Comment out optional components to prevent unregistered dependencies if
+# they are not explicitly selected via OPTIONS (make config)
+.if !defined(WITH_FLICKR)
+	@${REINPLACE_CMD} -e '/FLICKCURL/s,^find_package,#&,' \
+		${WRKSRC}/src/CMakeLists.txt
+.endif
+.if !defined(WITH_KWALLET)
+	@${REINPLACE_CMD} -e '/DBUSGLIB/s,^find_package,#&,' \
+		${WRKSRC}/src/CMakeLists.txt
+.endif
+.if !defined(WITH_GKEYRING)
+	@${REINPLACE_CMD} -e '/GnomeKeyring/s,^find_package,#&,' \
+		${WRKSRC}/src/CMakeLists.txt
+.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 0bccdf1dc32d..895f27c1cb0f 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (darktable-0.7.1.tar.gz) = 15aaef52f3795334c337d2725638beae253f7ffef6b5ade9062b8ffb8adb0f20
-SIZE (darktable-0.7.1.tar.gz) = 1515605
+SHA256 (darktable-0.9.tar.gz) = 638e9d955e3940155b14bfba81cda291607ba689f216a7979db8a1aeb858a403
+SIZE (darktable-0.9.tar.gz) = 2187367
diff --git a/graphics/darktable/files/patch-src__common__exif.cc b/graphics/darktable/files/patch-src__common__exif.cc
deleted file mode 100644
index bd9aa18f9fc6..000000000000
--- a/graphics/darktable/files/patch-src__common__exif.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/common/exif.cc.orig	2010-12-07 12:49:56.000000000 +0100
-+++ ./src/common/exif.cc	2011-04-24 12:43:20.476146336 +0200
-@@ -29,11 +29,7 @@
- #include "common/imageio.h"
- }
- // #include <libexif/exif-data.h>
--#include <exiv2/xmp.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/canonmn.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <sqlite3.h>
- #include <iostream>
- #include <fstream>
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index eaa5962aae71..d9a470ba10c4 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -1,8 +1,20 @@
 bin/darktable
-%%DATADIR%%/darktable.glade
+bin/darktable-cltest
+bin/darktable-faster
 %%DATADIR%%/darktable.gtkrc
+%%DATADIR%%/kernels/atrous.cl
+%%DATADIR%%/kernels/basic.cl
+%%DATADIR%%/kernels/blendop.cl
+%%DATADIR%%/kernels/demosaic_ppg.cl
+%%DATADIR%%/kernels/highpass.cl
+%%DATADIR%%/kernels/nlmeans.cl
+%%DATADIR%%/kernels/programs.conf
+%%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png
+%%DATADIR%%/pixmaps/plugins/darkroom/atrous.png
 %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png
-%%DATADIR%%/pixmaps/plugins/darkroom/bilateral.png
+%%DATADIR%%/pixmaps/plugins/darkroom/bloom.png
+%%DATADIR%%/pixmaps/plugins/darkroom/borders.png
+%%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.png
 %%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.png
 %%DATADIR%%/pixmaps/plugins/darkroom/clahe.png
 %%DATADIR%%/pixmaps/plugins/darkroom/clipping.png
@@ -11,182 +23,107 @@ bin/darktable
 %%DATADIR%%/pixmaps/plugins/darkroom/colorout.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png
-%%DATADIR%%/pixmaps/plugins/darkroom/equalizer.png
+%%DATADIR%%/pixmaps/plugins/darkroom/demosaic.png
 %%DATADIR%%/pixmaps/plugins/darkroom/exposure.png
 %%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.png
 %%DATADIR%%/pixmaps/plugins/darkroom/grain.png
 %%DATADIR%%/pixmaps/plugins/darkroom/highlights.png
+%%DATADIR%%/pixmaps/plugins/darkroom/highpass.png
+%%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png
 %%DATADIR%%/pixmaps/plugins/darkroom/lens.png
+%%DATADIR%%/pixmaps/plugins/darkroom/localc.png
+%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png
 %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png
+%%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.png
+%%DATADIR%%/pixmaps/plugins/darkroom/overexposed.png
 %%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.png
+%%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png
 %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png
 %%DATADIR%%/pixmaps/plugins/darkroom/relight.png
 %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png
+%%DATADIR%%/pixmaps/plugins/darkroom/soften.png
 %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png
+%%DATADIR%%/pixmaps/plugins/darkroom/spots.png
+%%DATADIR%%/pixmaps/plugins/darkroom/stuckpixels.png
 %%DATADIR%%/pixmaps/plugins/darkroom/temperature.png
 %%DATADIR%%/pixmaps/plugins/darkroom/template.png
 %%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.png
+%%DATADIR%%/pixmaps/plugins/darkroom/tonemap.png
 %%DATADIR%%/pixmaps/plugins/darkroom/velvia.png
 %%DATADIR%%/pixmaps/plugins/darkroom/vignette.png
 %%DATADIR%%/pixmaps/plugins/darkroom/watermark.png
 %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png
+%%DATADIR%%/rawspeed/cameras.xml
+%%DATADIR%%/rawspeed/showcameras.xsl
+%%DATADIR%%/style/favicon.ico
+%%DATADIR%%/style/style.css
 %%DATADIR%%/watermarks/darktable.svg
 %%DATADIR%%/watermarks/promo.svg
-lib/darktable/libdarktable.a
-lib/darktable/libdarktable.la
 lib/darktable/libdarktable.so
-lib/darktable/plugins/imageio/format/libexr.a
-lib/darktable/plugins/imageio/format/libexr.la
+lib/darktable/plugins/imageio/format/libcopy.so
 lib/darktable/plugins/imageio/format/libexr.so
-lib/darktable/plugins/imageio/format/libjpeg.a
-lib/darktable/plugins/imageio/format/libjpeg.la
 lib/darktable/plugins/imageio/format/libjpeg.so
-lib/darktable/plugins/imageio/format/libpfm.a
-lib/darktable/plugins/imageio/format/libpfm.la
 lib/darktable/plugins/imageio/format/libpfm.so
-lib/darktable/plugins/imageio/format/libpng.a
-lib/darktable/plugins/imageio/format/libpng.la
 lib/darktable/plugins/imageio/format/libpng.so
-lib/darktable/plugins/imageio/format/libppm.a
-lib/darktable/plugins/imageio/format/libppm.la
 lib/darktable/plugins/imageio/format/libppm.so
-lib/darktable/plugins/imageio/format/libtiff.a
-lib/darktable/plugins/imageio/format/libtiff.la
 lib/darktable/plugins/imageio/format/libtiff.so
-lib/darktable/plugins/imageio/storage/libdisk.a
-lib/darktable/plugins/imageio/storage/libdisk.la
 lib/darktable/plugins/imageio/storage/libdisk.so
-lib/darktable/plugins/imageio/storage/libemail.a
-lib/darktable/plugins/imageio/storage/libemail.la
 lib/darktable/plugins/imageio/storage/libemail.so
-lib/darktable/plugins/imageio/storage/libpicasa.a
-lib/darktable/plugins/imageio/storage/libpicasa.la
+lib/darktable/plugins/imageio/storage/libgallery.so
 lib/darktable/plugins/imageio/storage/libpicasa.so
-lib/darktable/plugins/libbasecurve.a
-lib/darktable/plugins/libbasecurve.la
+lib/darktable/plugins/libatrous.so
 lib/darktable/plugins/libbasecurve.so
-lib/darktable/plugins/libbilateral.a
-lib/darktable/plugins/libbilateral.la
 lib/darktable/plugins/libbilateral.so
-lib/darktable/plugins/libchannelmixer.a
-lib/darktable/plugins/libchannelmixer.la
+lib/darktable/plugins/libbloom.so
+lib/darktable/plugins/libborders.so
+lib/darktable/plugins/libcacorrect.so
 lib/darktable/plugins/libchannelmixer.so
-lib/darktable/plugins/libclahe.a
-lib/darktable/plugins/libclahe.la
 lib/darktable/plugins/libclahe.so
-lib/darktable/plugins/libclipping.a
-lib/darktable/plugins/libclipping.la
 lib/darktable/plugins/libclipping.so
-lib/darktable/plugins/libcolorcorrection.a
-lib/darktable/plugins/libcolorcorrection.la
+lib/darktable/plugins/libcolorcontrast.so
 lib/darktable/plugins/libcolorcorrection.so
-lib/darktable/plugins/libcolorin.a
-lib/darktable/plugins/libcolorin.la
 lib/darktable/plugins/libcolorin.so
-lib/darktable/plugins/libcolorout.a
-lib/darktable/plugins/libcolorout.la
 lib/darktable/plugins/libcolorout.so
-lib/darktable/plugins/libcolortransfer.a
-lib/darktable/plugins/libcolortransfer.la
-lib/darktable/plugins/libcolortransfer.so
-lib/darktable/plugins/libcolorzones.a
-lib/darktable/plugins/libcolorzones.la
 lib/darktable/plugins/libcolorzones.so
-lib/darktable/plugins/libequalizer.a
-lib/darktable/plugins/libequalizer.la
+lib/darktable/plugins/libdemosaic.so
 lib/darktable/plugins/libequalizer.so
-lib/darktable/plugins/libexposure.a
-lib/darktable/plugins/libexposure.la
 lib/darktable/plugins/libexposure.so
-lib/darktable/plugins/libgamma.a
-lib/darktable/plugins/libgamma.la
 lib/darktable/plugins/libgamma.so
-lib/darktable/plugins/libgraduatednd.a
-lib/darktable/plugins/libgraduatednd.la
 lib/darktable/plugins/libgraduatednd.so
-lib/darktable/plugins/libgrain.a
-lib/darktable/plugins/libgrain.la
 lib/darktable/plugins/libgrain.so
-lib/darktable/plugins/libhighlights.a
-lib/darktable/plugins/libhighlights.la
 lib/darktable/plugins/libhighlights.so
-lib/darktable/plugins/liblens.a
-lib/darktable/plugins/liblens.la
+lib/darktable/plugins/libhighpass.so
+lib/darktable/plugins/libhotpixels.so
 lib/darktable/plugins/liblens.so
-lib/darktable/plugins/libmonochrome.a
-lib/darktable/plugins/libmonochrome.la
+lib/darktable/plugins/liblowlight.so
 lib/darktable/plugins/libmonochrome.so
-lib/darktable/plugins/libprofile_gamma.a
-lib/darktable/plugins/libprofile_gamma.la
+lib/darktable/plugins/libnlmeans.so
+lib/darktable/plugins/liboverexposed.so
 lib/darktable/plugins/libprofile_gamma.so
-lib/darktable/plugins/librawimport.a
-lib/darktable/plugins/librawimport.la
-lib/darktable/plugins/librawimport.so
-lib/darktable/plugins/librelight.a
-lib/darktable/plugins/librelight.la
+lib/darktable/plugins/librawdenoise.so
 lib/darktable/plugins/librelight.so
-lib/darktable/plugins/libsharpen.a
-lib/darktable/plugins/libsharpen.la
 lib/darktable/plugins/libsharpen.so
-lib/darktable/plugins/libsplittoning.a
-lib/darktable/plugins/libsplittoning.la
+lib/darktable/plugins/libsoften.so
 lib/darktable/plugins/libsplittoning.so
-lib/darktable/plugins/libtemperature.a
-lib/darktable/plugins/libtemperature.la
+lib/darktable/plugins/libspots.so
 lib/darktable/plugins/libtemperature.so
-lib/darktable/plugins/libtonecurve.a
-lib/darktable/plugins/libtonecurve.la
 lib/darktable/plugins/libtonecurve.so
-lib/darktable/plugins/libvelvia.a
-lib/darktable/plugins/libvelvia.la
+lib/darktable/plugins/libtonemap.so
 lib/darktable/plugins/libvelvia.so
-lib/darktable/plugins/libvignette.a
-lib/darktable/plugins/libvignette.la
 lib/darktable/plugins/libvignette.so
-lib/darktable/plugins/libwatermark.a
-lib/darktable/plugins/libwatermark.la
 lib/darktable/plugins/libwatermark.so
-lib/darktable/plugins/libzonesystem.a
-lib/darktable/plugins/libzonesystem.la
 lib/darktable/plugins/libzonesystem.so
-lib/darktable/plugins/lighttable/libcamera.a
-lib/darktable/plugins/lighttable/libcamera.la
-lib/darktable/plugins/lighttable/libcamera.so
-lib/darktable/plugins/lighttable/libcapture.a
-lib/darktable/plugins/lighttable/libcapture.la
-lib/darktable/plugins/lighttable/libcapture.so
-lib/darktable/plugins/lighttable/libcollect.a
-lib/darktable/plugins/lighttable/libcollect.la
 lib/darktable/plugins/lighttable/libcollect.so
-lib/darktable/plugins/lighttable/libcopy_history.a
-lib/darktable/plugins/lighttable/libcopy_history.la
 lib/darktable/plugins/lighttable/libcopy_history.so
-lib/darktable/plugins/lighttable/libexport.a
-lib/darktable/plugins/lighttable/libexport.la
 lib/darktable/plugins/lighttable/libexport.so
-lib/darktable/plugins/lighttable/libimage.a
-lib/darktable/plugins/lighttable/libimage.la
 lib/darktable/plugins/lighttable/libimage.so
-lib/darktable/plugins/lighttable/libselect.a
-lib/darktable/plugins/lighttable/libselect.la
+lib/darktable/plugins/lighttable/libmetadata.so
+lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
-lib/darktable/plugins/lighttable/libstyles.a
-lib/darktable/plugins/lighttable/libstyles.la
 lib/darktable/plugins/lighttable/libstyles.so
-lib/darktable/plugins/lighttable/libtagging.a
-lib/darktable/plugins/lighttable/libtagging.la
 lib/darktable/plugins/lighttable/libtagging.so
-lib/darktable/views/libcapture.a
-lib/darktable/views/libcapture.la
-lib/darktable/views/libcapture.so
-lib/darktable/views/libdarkroom.a
-lib/darktable/views/libdarkroom.la
 lib/darktable/views/libdarkroom.so
-lib/darktable/views/libfilmstrip.a
-lib/darktable/views/libfilmstrip.la
 lib/darktable/views/libfilmstrip.so
-lib/darktable/views/liblighttable.a
-lib/darktable/views/liblighttable.la
 lib/darktable/views/liblighttable.so
 share/applications/darktable.desktop
 share/icons/hicolor/16x16/apps/darktable.png
@@ -203,11 +140,14 @@ share/locale/fi/LC_MESSAGES/darktable.mo
 share/locale/fr/LC_MESSAGES/darktable.mo
 share/locale/gl/LC_MESSAGES/darktable.mo
 share/locale/it/LC_MESSAGES/darktable.mo
+share/locale/ja/LC_MESSAGES/darktable.mo
 share/locale/nl/LC_MESSAGES/darktable.mo
 share/locale/pl/LC_MESSAGES/darktable.mo
+share/locale/ro/LC_MESSAGES/darktable.mo
 share/locale/ru/LC_MESSAGES/darktable.mo
 share/locale/sq/LC_MESSAGES/darktable.mo
 share/locale/sv/LC_MESSAGES/darktable.mo
+share/locale/th/LC_MESSAGES/darktable.mo
 @dirrmtry share/applications
 @dirrm lib/darktable/views
 @dirrm lib/darktable/plugins/lighttable
@@ -217,10 +157,10 @@ share/locale/sv/LC_MESSAGES/darktable.mo
 @dirrm lib/darktable/plugins
 @dirrm lib/darktable
 @dirrm %%DATADIR%%/watermarks
+@dirrm %%DATADIR%%/style
+@dirrm %%DATADIR%%/rawspeed
 @dirrm %%DATADIR%%/pixmaps/plugins/darkroom
 @dirrm %%DATADIR%%/pixmaps/plugins
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/color/out
-@dirrm %%DATADIR%%/color/in
-@dirrm %%DATADIR%%/color
+@dirrm %%DATADIR%%/kernels
 @dirrm %%DATADIR%%