6 files changed, 21 insertions, 124 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index dc90aedf0396..5cc818c7dbad 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	digikam
-DISTVERSION=	0.9.3
-PORTREVISION=	3
+DISTVERSION=	0.9.4
 CATEGORIES=	graphics kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SFE
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An advanced digital photo management application for KDE
@@ -33,6 +31,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
+CONFIGURE_ARGS=	--without-included-sqlite3
+
 MAN1=		digitaglinktree.1
 
 post-patch:
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index f4380436abb3..51190294f9bf 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,3 +1,3 @@
-MD5 (digikam-0.9.3.tar.bz2) = 20497c1a02394505f899ef0757ebefad
-SHA256 (digikam-0.9.3.tar.bz2) = 1706a5318a4a555b03e9a7cbeba146ecea25cbb9c445baf22c33e362cba74b4b
-SIZE (digikam-0.9.3.tar.bz2) = 10911417
+MD5 (digikam-0.9.4.tar.bz2) = b0f3fa00bd054b0497146e6ce24dab7c
+SHA256 (digikam-0.9.4.tar.bz2) = 39da391d31669a705a4a7347e259f6b9c30eeaa9dc29768ca2534ecd859f3f47
+SIZE (digikam-0.9.4.tar.bz2) = 11579318
diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp
index 6bbcd2f3bbfb..8c509b5e08bd 100644
--- a/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp
+++ b/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp
@@ -1,9 +1,9 @@
---- digikam/kioslave/digikamdates.cpp.orig	Tue Apr 11 13:53:08 2006
-+++ digikam/kioslave/digikamdates.cpp	Tue Apr 11 13:53:54 2006
-@@ -186,7 +186,7 @@
-                          .arg(moStr2)
-                          .arg(yr,4)
-                          .arg(moStr1,2),
+--- digikam/kioslave/digikamdates.cpp.orig	2008-07-16 21:05:55.000000000 +0200
++++ digikam/kioslave/digikamdates.cpp	2008-07-17 08:28:24.000000000 +0200
+@@ -199,7 +199,7 @@
+                          .arg(moEndStr, 2)
+                          .arg(yrStart, 4)
+                          .arg(moStartStr, 2),
 -                         &values, false);
 +                         &values);
  
diff --git a/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp b/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp
deleted file mode 100644
index 2d528b387f9e..000000000000
--- a/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- digikam/utilities/imageeditor/editor/editorwindow.cpp.orig	2008-03-15 12:21:58.000000000 +0100
-+++ digikam/utilities/imageeditor/editor/editorwindow.cpp	2008-03-15 12:36:19.000000000 +0100
-@@ -885,8 +885,12 @@
-         m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB;
- 
-     m_IOFileSettings->rawDecodingSettings.sixteenBitsImage        = config->readBoolEntry("SixteenBitsImage", false);
--    m_IOFileSettings->rawDecodingSettings.automaticColorBalance   = config->readBoolEntry("AutomaticColorBalance", true);
--    m_IOFileSettings->rawDecodingSettings.cameraColorBalance      = config->readBoolEntry("CameraColorBalance", true);
-+    if (config->readBoolEntry("CameraColorBalance", true))
-+        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::CAMERA;
-+    else if (config->readBoolEntry("AutomaticColorBalance", true)) 
-+        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::AUTO;
-+    else
-+        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::NONE;
-     m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors   = config->readBoolEntry("RGBInterpolate4Colors", false);
-     m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false);
-     m_IOFileSettings->rawDecodingSettings.enableNoiseReduction    = config->readBoolEntry("EnableNoiseReduction", false);
diff --git a/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp b/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp
deleted file mode 100644
index 73af8e12ac4e..000000000000
--- a/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- digikam/utilities/setup/setupdcraw.cpp.orig	2008-03-15 13:24:50.000000000 +0100
-+++ digikam/utilities/setup/setupdcraw.cpp	2008-03-15 13:32:56.000000000 +0100
-@@ -89,8 +89,8 @@
-     KConfig* config = kapp->config();
-     config->setGroup("ImageViewer Settings");
-     config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits());
--    config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB());
--    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance());
-+    config->writeEntry("CameraColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::CAMERA);
-+    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::AUTO);
-     config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor());
-     config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels());
-     config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction());
-@@ -116,8 +116,12 @@
-     d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0));
-     d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false));
-     d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0));
--    d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true));
--    d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true));
-+    if (config->readBoolEntry("CameraColorBalance", true))
-+        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::CAMERA);
-+    else if (config->readBoolEntry("AutomaticColorBalance", true))
-+        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::AUTO);
-+    else
-+        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::NONE);
-     d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
-     d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality)
-                                   config->readNumEntry("RAWQuality",
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index 4ff30a1a1811..5c7328a1a2a4 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -33,6 +33,7 @@ include/digikam/iccprofileinfodlg.h
 include/digikam/iccprofilewidget.h
 include/digikam/icctransform.h
 include/digikam/imagecurves.h
+include/digikam/imagedialog.h
 include/digikam/imagedlgbase.h
 include/digikam/imageguidedlg.h
 include/digikam/imageguidewidget.h
@@ -48,9 +49,11 @@ include/digikam/listboxpreviewitem.h
 include/digikam/paniconwidget.h
 include/digikam/photoinfocontainer.h
 include/digikam/previewwidget.h
+include/digikam/rawcameradlg.h
 include/digikam/searchtextbar.h
 include/digikam/sidebar.h
 include/digikam/squeezedcombobox.h
+include/digikam/statusled.h
 include/digikam/statusnavigatebar.h
 include/digikam/statusprogressbar.h
 include/digikam/statuszoombar.h
@@ -185,6 +188,7 @@ share/apps/digikam/about/main.html
 share/apps/digikam/about/top-left.png
 share/apps/digikam/about/top-middle.png
 share/apps/digikam/about/top-right-digikam.png
+share/apps/digikam/data/banner-digikam.png
 share/apps/digikam/data/bluejean-texture.png
 share/apps/digikam/data/bothhorz.png
 share/apps/digikam/data/bothvert.png
@@ -212,9 +216,11 @@ share/apps/digikam/data/histogram-log.png
 share/apps/digikam/data/ice-pattern.png
 share/apps/digikam/data/image-full.png
 share/apps/digikam/data/image-selection.png
+share/apps/digikam/data/indicator-gray.png
+share/apps/digikam/data/indicator-green.png
+share/apps/digikam/data/indicator-red.png
 share/apps/digikam/data/leaf-pattern.png
 share/apps/digikam/data/logo-cimg.png
-share/apps/digikam/data/logo-digikam.png
 share/apps/digikam/data/logo-exiv2.png
 share/apps/digikam/data/logo-gphoto.png
 share/apps/digikam/data/logo-lcms.png
@@ -696,64 +702,23 @@ share/apps/digikam/themes/Dreary
 share/apps/digikam/themes/Gray
 share/apps/digikam/themes/Marine
 share/apps/digikam/themes/OrangeCrush
+share/apps/digikam/themes/Rose
 share/apps/digikam/themes/Sandy
 share/apps/digikam/tips
 share/apps/digikam/utils/digikam-camera
 share/apps/konqueror/servicemenus/digikam-download.desktop
 share/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
 share/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-share/apps/showfoto/icons/crystalsvg/128x128/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/128x128/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/16x16/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/16x16/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/22x22/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/22x22/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/32x32/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/32x32/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/48x48/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/48x48/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/64x64/actions/crop.png
-share/apps/showfoto/icons/crystalsvg/64x64/actions/rotate_cw.png
-share/apps/showfoto/icons/crystalsvg/scalable/actions/crop.svgz
-share/apps/showfoto/icons/crystalsvg/scalable/actions/rotate_cw.svgz
-share/apps/showfoto/icons/hicolor/128x128/actions/flip.png
-share/apps/showfoto/icons/hicolor/128x128/actions/histogram.png
-share/apps/showfoto/icons/hicolor/128x128/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/128x128/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/128x128/apps/showfoto.png
-share/apps/showfoto/icons/hicolor/16x16/actions/flip.png
-share/apps/showfoto/icons/hicolor/16x16/actions/histogram.png
-share/apps/showfoto/icons/hicolor/16x16/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/16x16/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/16x16/apps/showfoto.png
-share/apps/showfoto/icons/hicolor/22x22/actions/flip.png
-share/apps/showfoto/icons/hicolor/22x22/actions/histogram.png
-share/apps/showfoto/icons/hicolor/22x22/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/22x22/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/22x22/apps/showfoto.png
 share/apps/showfoto/icons/hicolor/22x22/mimetypes/raw.png
-share/apps/showfoto/icons/hicolor/32x32/actions/flip.png
-share/apps/showfoto/icons/hicolor/32x32/actions/histogram.png
-share/apps/showfoto/icons/hicolor/32x32/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/32x32/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/32x32/apps/showfoto.png
 share/apps/showfoto/icons/hicolor/32x32/mimetypes/raw.png
-share/apps/showfoto/icons/hicolor/48x48/actions/flip.png
-share/apps/showfoto/icons/hicolor/48x48/actions/histogram.png
-share/apps/showfoto/icons/hicolor/48x48/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/48x48/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/48x48/apps/showfoto.png
 share/apps/showfoto/icons/hicolor/48x48/mimetypes/raw.png
-share/apps/showfoto/icons/hicolor/64x64/actions/flip.png
-share/apps/showfoto/icons/hicolor/64x64/actions/histogram.png
-share/apps/showfoto/icons/hicolor/64x64/actions/resize_image.png
-share/apps/showfoto/icons/hicolor/64x64/actions/slideshow.png
 share/apps/showfoto/icons/hicolor/64x64/apps/showfoto.png
 share/apps/showfoto/icons/hicolor/64x64/mimetypes/raw.png
-share/apps/showfoto/icons/hicolor/scalable/actions/flip.svgz
-share/apps/showfoto/icons/hicolor/scalable/actions/histogram.svgz
-share/apps/showfoto/icons/hicolor/scalable/actions/resize_image.svgz
-share/apps/showfoto/icons/hicolor/scalable/actions/slideshow.svgz
 share/apps/showfoto/menusidepixmap.png
 share/apps/showfoto/showfoto-splash.png
 share/apps/showfoto/showfotoui.rc
@@ -851,46 +816,23 @@ share/services/digikamsearch.protocol
 share/services/digikamtags.protocol
 share/services/digikamthumbnail.protocol
 share/servicetypes/digikamimageplugin.desktop
-@dirrm share/apps/showfoto/icons/hicolor/scalable/actions
-@dirrm share/apps/showfoto/icons/hicolor/scalable
 @dirrm share/apps/showfoto/icons/hicolor/64x64/mimetypes
 @dirrm share/apps/showfoto/icons/hicolor/64x64/apps
-@dirrm share/apps/showfoto/icons/hicolor/64x64/actions
 @dirrm share/apps/showfoto/icons/hicolor/64x64
 @dirrm share/apps/showfoto/icons/hicolor/48x48/mimetypes
 @dirrm share/apps/showfoto/icons/hicolor/48x48/apps
-@dirrm share/apps/showfoto/icons/hicolor/48x48/actions
 @dirrm share/apps/showfoto/icons/hicolor/48x48
 @dirrm share/apps/showfoto/icons/hicolor/32x32/mimetypes
 @dirrm share/apps/showfoto/icons/hicolor/32x32/apps
-@dirrm share/apps/showfoto/icons/hicolor/32x32/actions
 @dirrm share/apps/showfoto/icons/hicolor/32x32
 @dirrm share/apps/showfoto/icons/hicolor/22x22/mimetypes
 @dirrm share/apps/showfoto/icons/hicolor/22x22/apps
-@dirrm share/apps/showfoto/icons/hicolor/22x22/actions
 @dirrm share/apps/showfoto/icons/hicolor/22x22
 @dirrm share/apps/showfoto/icons/hicolor/16x16/apps
-@dirrm share/apps/showfoto/icons/hicolor/16x16/actions
 @dirrm share/apps/showfoto/icons/hicolor/16x16
 @dirrm share/apps/showfoto/icons/hicolor/128x128/apps
-@dirrm share/apps/showfoto/icons/hicolor/128x128/actions
 @dirrm share/apps/showfoto/icons/hicolor/128x128
 @dirrm share/apps/showfoto/icons/hicolor
-@dirrm share/apps/showfoto/icons/crystalsvg/scalable/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/scalable
-@dirrm share/apps/showfoto/icons/crystalsvg/64x64/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/64x64
-@dirrm share/apps/showfoto/icons/crystalsvg/48x48/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/48x48
-@dirrm share/apps/showfoto/icons/crystalsvg/32x32/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/32x32
-@dirrm share/apps/showfoto/icons/crystalsvg/22x22/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/22x22
-@dirrm share/apps/showfoto/icons/crystalsvg/16x16/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/16x16
-@dirrm share/apps/showfoto/icons/crystalsvg/128x128/actions
-@dirrm share/apps/showfoto/icons/crystalsvg/128x128
-@dirrm share/apps/showfoto/icons/crystalsvg
 @dirrm share/apps/showfoto/icons
 @dirrm share/apps/showfoto
 @dirrmtry share/apps/konqueror/servicemenus