- Update DigiKam to 1.8.0 release

Approved by:	maintainer (implicit)
Feature safe:	yes

4 files changed, 43 insertions, 17 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index a04e29c49872..3acf5e0a4ced 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	digikam
-DISTVERSION=	1.4.0
-PORTREVISION=	1
+DISTVERSION=	1.8.0
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF
@@ -20,7 +19,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.6:${PORTSDIR}/graphics/png \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		lqr-1.3:${PORTSDIR}/graphics/liblqr-1 \
-		kipi.7:${PORTSDIR}/graphics/kdegraphics4
+		kipi.8:${PORTSDIR}/graphics/kdegraphics4
 
 LATEST_LINK=	${PORTNAME}-kde4
 
@@ -58,7 +57,7 @@ CMAKE_ARGS+=	-DWITH_LensFun:BOOL=OFF
 .endif
 
 .if defined(WITH_MARBLE)
-LIB_DEPENDS+=	marblewidget.10:${PORTSDIR}/astro/marble
+LIB_DEPENDS+=	marblewidget.11:${PORTSDIR}/astro/marble
 PLIST_SUB+=		MARBLE=""
 .else
 CMAKE_ARGS+=	-DWITH_MarbleWidget:BOOL=OFF
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index b7dfc1831661..5596cf20d957 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,3 +1,2 @@
-MD5 (digikam-1.4.0.tar.bz2) = 748518d6b24cc2c44acad5cb9df8d21a
-SHA256 (digikam-1.4.0.tar.bz2) = d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
-SIZE (digikam-1.4.0.tar.bz2) = 14907229
+SHA256 (digikam-1.8.0.tar.bz2) = 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
+SIZE (digikam-1.8.0.tar.bz2) = 23376636
diff --git a/graphics/digikam-kde4/files/patch-CMakeLists.txt b/graphics/digikam-kde4/files/patch-CMakeLists.txt
index 5cedd5a8c47b..48ccab68d213 100644
--- a/graphics/digikam-kde4/files/patch-CMakeLists.txt
+++ b/graphics/digikam-kde4/files/patch-CMakeLists.txt
@@ -1,16 +1,16 @@
 --- CMakeLists.txt.orig	2010-03-29 01:26:06.000000000 +0300
 +++ CMakeLists.txt	2010-03-30 09:42:27.978741828 +0300
-@@ -134,9 +134,6 @@
+@@ -137,9 +137,6 @@
  FIND_PACKAGE(PNG)
  FIND_PACKAGE(TIFF)
  FIND_PACKAGE(Jasper)
 -FIND_PACKAGE(Kdcraw)
 -FIND_PACKAGE(Kexiv2)
 -FIND_PACKAGE(Kipi)
+ FIND_PACKAGE(PGF)
+ FIND_PACKAGE(CLAPACK)
  
- # Extract version of libjpeg so that we can use the appropriate dir
- # See bug #227313, #228483
-@@ -150,31 +147,50 @@
+@@ -163,31 +160,50 @@
      SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
  ENDIF ("${jpeglib_version}" LESS 80)
  
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index 18e304a187b4..9f6a18889cc8 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -10,8 +10,6 @@ include/digikam/cbfilter.h
 include/digikam/cbsettings.h
 include/digikam/cietonguewidget.h
 include/digikam/colorgradientwidget.h
-include/digikam/curvesbox.h
-include/digikam/curveswidget.h
 include/digikam/dcolor.h
 include/digikam/dcolorblend.h
 include/digikam/dcolorcomposer.h
@@ -26,9 +24,6 @@ include/digikam/dpopupmenu.h
 include/digikam/dprogressdlg.h
 include/digikam/dzoombar.h
 include/digikam/exifwidget.h
-include/digikam/histogrambox.h
-include/digikam/histogrampainter.h
-include/digikam/histogramwidget.h
 include/digikam/hslfilter.h
 include/digikam/iccpreviewwidget.h
 include/digikam/iccprofileinfodlg.h
@@ -36,7 +31,6 @@ include/digikam/iccprofilewidget.h
 include/digikam/icctransform.h
 include/digikam/imagecurves.h
 include/digikam/imagedialog.h
-include/digikam/imagehistogram.h
 include/digikam/imageiface.h
 include/digikam/imagelevels.h
 include/digikam/imageplugin.h
@@ -149,6 +143,7 @@ share/apps/digikam/data/pine-pattern.png
 share/apps/digikam/data/pink-pattern.png
 share/apps/digikam/data/rain-pattern.png
 share/apps/digikam/data/rock-pattern.png
+share/apps/digikam/data/sample-aix.png
 share/apps/digikam/data/splash-digikam.png
 share/apps/digikam/data/stone-pattern.png
 share/apps/digikam/data/stone-texture.png
@@ -564,6 +559,37 @@ share/apps/digikam/icons/hicolor/scalable/actions/superimpose.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/texture.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/tonemap.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/whitebalance.svgz
+share/apps/digikam/lensfun/6x6.xml
+share/apps/digikam/lensfun/compact-canon.xml
+share/apps/digikam/lensfun/compact-casio.xml
+share/apps/digikam/lensfun/compact-fujifilm.xml
+share/apps/digikam/lensfun/compact-kodak.xml
+share/apps/digikam/lensfun/compact-konica-minolta.xml
+share/apps/digikam/lensfun/compact-leica.xml
+share/apps/digikam/lensfun/compact-nikon.xml
+share/apps/digikam/lensfun/compact-olympus.xml
+share/apps/digikam/lensfun/compact-panasonic.xml
+share/apps/digikam/lensfun/compact-pentax.xml
+share/apps/digikam/lensfun/compact-ricoh.xml
+share/apps/digikam/lensfun/compact-sigma.xml
+share/apps/digikam/lensfun/compact-sony.xml
+share/apps/digikam/lensfun/generic.xml
+share/apps/digikam/lensfun/rf-leica.xml
+share/apps/digikam/lensfun/slr-canon.xml
+share/apps/digikam/lensfun/slr-contax.xml
+share/apps/digikam/lensfun/slr-hasselblad.xml
+share/apps/digikam/lensfun/slr-konica-minolta.xml
+share/apps/digikam/lensfun/slr-nikon.xml
+share/apps/digikam/lensfun/slr-olympus.xml
+share/apps/digikam/lensfun/slr-panasonic.xml
+share/apps/digikam/lensfun/slr-pentax.xml
+share/apps/digikam/lensfun/slr-samsung.xml
+share/apps/digikam/lensfun/slr-schneider.xml
+share/apps/digikam/lensfun/slr-sigma.xml
+share/apps/digikam/lensfun/slr-sony.xml
+share/apps/digikam/lensfun/slr-tamron.xml
+share/apps/digikam/lensfun/slr-tokina.xml
+share/apps/digikam/lensfun/slr-ussr.xml
 share/apps/digikam/lighttablewindowui.rc
 share/apps/digikam/queuemgrwindowui.rc
 share/apps/digikam/themes/Blue
@@ -642,6 +668,7 @@ share/locale/km/LC_MESSAGES/digikam.mo
 share/locale/ko/LC_MESSAGES/digikam.mo
 share/locale/lt/LC_MESSAGES/digikam.mo
 share/locale/lv/LC_MESSAGES/digikam.mo
+share/locale/ms/LC_MESSAGES/digikam.mo
 share/locale/nb/LC_MESSAGES/digikam.mo
 share/locale/nds/LC_MESSAGES/digikam.mo
 share/locale/ne/LC_MESSAGES/digikam.mo
@@ -667,6 +694,7 @@ share/locale/zh_TW/LC_MESSAGES/digikam.mo
 @dirrm share/apps/showfoto
 @dirrm share/apps/digikam/utils
 @dirrm share/apps/digikam/themes
+@dirrm share/apps/digikam/lensfun
 @dirrm share/apps/digikam/icons/hicolor/scalable/actions
 @dirrm share/apps/digikam/icons/hicolor/scalable
 @dirrm share/apps/digikam/icons/hicolor/64x64/mimetypes