- Update digiKam and Kipi Plugins to 4.2.0

- New ports for exporting images to Dropbox and Google Drive:
	graphics/kipi-plugin-dropbox
	graphics/kipi-plugin-googledrive

Excerpt from area51 commit logs:
------------------------------------------------------------------------
r10303 | jhale | 2014-09-19 04:04:57 +0000 (Fri, 19 Sep 2014) | 13 lines

- Update digikam and friends to 4.2.0
- Drop "Enable" from Digikam options descriptions
- For kipi-plugins, only extract what we need to reduce extraction time
  and file I/O

------------------------------------------------------------------------
r10183 | makc | 2014-07-18 22:07:34 +0000 (Fri, 18 Jul 2014) | 21 lines

Update DigiKam and Kipi plugins to 4.1.0. This incomplete update is based
on the patch submitted by Oleg Sidorkin <osidorkin@gmail.com> via
kde-freebsd mailing list.

astro/libkgeomap:
- Don't build demo application and thus remove dependence on libkexiv2
- Add build dependency on boost headers

graphics/kipi-plugin-gpssync
- Add build dependency on boost headers

5 files changed, 36 insertions, 25 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 36acd21a142e..dec3a21a1e49 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	digikam
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	graphics kde
 
@@ -28,7 +27,7 @@ USES+=		pkgconfig shebangfix
 USE_KDE4+=	libkdcraw libkexiv2 libkipi
 USE_QT4+=	sql-sqlite3_run
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DWITH_Sqlite2=off
+CMAKE_ARGS+=	-DWITH_Sqlite2:BOOL=OFF
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/core
 SHEBANG_FILES=	utilities/scripts/digitaglinktree/digitaglinktree
@@ -42,13 +41,14 @@ DOCS_RUN_DEPENDS=	digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-
 
 NLS_RUN_DEPENDS=	digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
 
-GPHOTO2_DESC=		Enable gphoto2 camera support
+GPHOTO2_DESC=		Gphoto2 camera support
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 GPHOTO2_CMAKE_OFF=	-DWITH_Gphoto2:BOOL=OFF
 
-PIMLIBS_DESC=		Enable address book support
+PIMLIBS_DESC=		Address book support
 PIMLIBS_USE=		KDE4=pimlibs
-PIMLIBS_CMAKE_OFF=	-DWITH_KdepimLibs:BOOL=OFF
+PIMLIBS_CMAKE_ON=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
+PIMLIBS_CMAKE_OFF=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
 
 MYSQL_USE=		MYSQL=server QT4=sql-mysql_run
 MYSQL_BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index efdce7c56310..e545d314f081 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -3,8 +3,8 @@
 # Make sure when DIGIKAM_VER is updated that the following ports are updated:
 #	astro/libkgeomap
 #	graphics/digikam-kde4
-#	digikam-kde4-doc
-#	digikam-kde4-l10n
+#	graphics/digikam-kde4-doc
+#	graphics/digikam-kde4-l10n
 #	graphics/kipi-plugin-*
 #	graphics/kipi-plugins-kde4
 #	graphics/libkface
@@ -12,9 +12,8 @@
 #	net/libkvkontakte
 #	net/libmediawiki
 
-DIGIKAM_VER=	3.5.0
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/digikam
+DIGIKAM_VER=	4.2.0
+MASTER_SITES=	KDE/stable/digikam
 
 KIPI_PLUGINS_ALL=	acquireimages \
 			advancedslideshow \
@@ -22,11 +21,13 @@ KIPI_PLUGINS_ALL=	acquireimages \
 			calendar \
 			debianscreenshots \
 			dngconverter \
+			dropbox \
 			expoblending \
 			facebook \
 			flashexport \
 			flickrexport \
 			galleryexport \
+			googledrive \
 			gpssync \
 			htmlexport \
 			imageshackexport \
@@ -68,16 +69,18 @@ acquireimages_DESC=	Acquire images using flat scanner
 advancedslideshow_DESC=	Slide images with 2D and 3D effects using OpenGL
 batchprocess_DESC=	Batch process images (convert, resize, rename, etc.)
 calendar_DESC=		Create calendars
-# broken
-# dlnaexport_DESC=	Export collection on DLNA network service
 debianscreenshots_DESC=	Export images to Debian Screenshots web service
+# builds and media server shows up, but files are not accessible
+# dlnaexport_DESC=	Export collection on DLNA network service
 dngconverter_DESC=	Convert Raw Image to Digital NeGative
+dropbox_DESC=		Export images to Dropbox cloud service
 expoblending_DESC=	Create pseudo HDR image with a stack of bracketed images
 facebook_DESC=		Import/export images to/from a remote Facebook web service
 flashexport_DESC=	Export images to Flash using SimpleViewer
 flickrexport_DESC=	Export images to a remote Flickr based web service
-gpssync_DESC=		Geolocalize images
 galleryexport_DESC=	Export images to a remote Gallery
+googledrive_DESC=	Export images to Google Drive cloud service
+gpssync_DESC=		Geolocalize images
 htmlexport_DESC=	Export images collections into a static XHTML page
 imageshackexport_DESC=	Export images to ImageShack web service
 imageviewer_DESC=	Preview images using OpenGL
@@ -119,11 +122,13 @@ USES+=		tar:bzip2
 
 .if !defined(NO_BUILD)
 USES+=		cmake
-USE_KDE4+=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4+=	automoc4 kdeprefix kdelibs
 USE_QT4+=	qmake_build moc_build rcc_build uic_build
 
 WRKSRC?=	${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
 
+PLIST_SUB+=	SHLIB_VER=${DIGIKAM_VER}
+
 . if defined(KIPI_PLUGIN)
 CONFLICTS_INSTALL=	kipi-plugins-2.*
 
@@ -135,6 +140,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMak
 LIB_DEPENDS+=	libkipiplugins.so:${PORTSDIR}/graphics/libkipiplugins
 .endif
 
+EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions ${DISTNAME}/extra/kipi-plugins
 WRKSRC=		${WRKDIR}/${DISTNAME}/extra/kipi-plugins
 BUILD_WRKSRC=	${WRKSRC}/${${KIPI_PLUGIN}_DIR}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index 3792348eb3ce..12640b701c8b 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (digikam-3.5.0.tar.bz2) = 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a
-SIZE (digikam-3.5.0.tar.bz2) = 65698806
+SHA256 (digikam-4.2.0.tar.bz2) = e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08
+SIZE (digikam-4.2.0.tar.bz2) = 68849613
diff --git a/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake b/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake
new file mode 100644
index 000000000000..90125bab5c00
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/MacroUtils.cmake.orig	2014-09-18 04:17:31 UTC
++++ cmake/modules/MacroUtils.cmake
+@@ -112,7 +112,7 @@
+     
+     ENDIF()
+ 
+-ENDMACRO(PRINT_PLUGIN_COMPILE_STATUS)
++ENDMACRO(PRINT_COMPONENT_COMPILE_STATUS)
+ 
+ # -------------------------------------------------------------------------
+ 
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index be9100e405b7..d62fd43e98b7 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -14,11 +14,9 @@ lib/kde4/kio_digikamsearch.so
 lib/kde4/kio_digikamtags.so
 %%MYSQL%%lib/kde4/libexec/digikamdatabaseserver
 lib/libdigikamcore.so
-lib/libdigikamcore.so.3
-lib/libdigikamcore.so.3.0.0
+lib/libdigikamcore.so.%%SHLIB_VER%%
 lib/libdigikamdatabase.so
-lib/libdigikamdatabase.so.3
-lib/libdigikamdatabase.so.3.0.0
+lib/libdigikamdatabase.so.%%SHLIB_VER%%
 man/man1/cleanup_digikamdb.1.gz
 man/man1/digitaglinktree.1.gz
 share/applications/kde4/digikam.desktop
@@ -140,6 +138,7 @@ share/apps/digikam/icons/hicolor/128x128/actions/restoration.png
 share/apps/digikam/icons/hicolor/128x128/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/128x128/actions/shear.png
 share/apps/digikam/icons/hicolor/128x128/actions/superimpose.png
+share/apps/digikam/icons/hicolor/128x128/actions/tag.png
 share/apps/digikam/icons/hicolor/128x128/actions/texture.png
 share/apps/digikam/icons/hicolor/128x128/actions/tonemap.png
 share/apps/digikam/icons/hicolor/128x128/actions/viewimage.png
@@ -256,7 +255,6 @@ share/apps/digikam/icons/hicolor/22x22/actions/texture.png
 share/apps/digikam/icons/hicolor/22x22/actions/tonemap.png
 share/apps/digikam/icons/hicolor/22x22/actions/viewimage.png
 share/apps/digikam/icons/hicolor/22x22/actions/whitebalance.png
-share/apps/digikam/icons/hicolor/22x22/mimetypes/raw.png
 share/apps/digikam/icons/hicolor/32x32/actions/adjustcurves.png
 share/apps/digikam/icons/hicolor/32x32/actions/adjusthsl.png
 share/apps/digikam/icons/hicolor/32x32/actions/adjustlevels.png
@@ -323,14 +321,12 @@ share/apps/digikam/icons/hicolor/32x32/actions/tag-places.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag-properties.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag-recents.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag-reset.png
-share/apps/digikam/icons/hicolor/32x32/actions/tag.png
 share/apps/digikam/icons/hicolor/32x32/actions/texture.png
 share/apps/digikam/icons/hicolor/32x32/actions/tonemap.png
 share/apps/digikam/icons/hicolor/32x32/actions/underexposure.png
 share/apps/digikam/icons/hicolor/32x32/actions/viewimage.png
 share/apps/digikam/icons/hicolor/32x32/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/32x32/actions/zoom-select-fit.png
-share/apps/digikam/icons/hicolor/32x32/mimetypes/raw.png
 share/apps/digikam/icons/hicolor/48x48/actions/adjustcurves.png
 share/apps/digikam/icons/hicolor/48x48/actions/adjusthsl.png
 share/apps/digikam/icons/hicolor/48x48/actions/adjustlevels.png
@@ -387,7 +383,6 @@ share/apps/digikam/icons/hicolor/48x48/actions/texture.png
 share/apps/digikam/icons/hicolor/48x48/actions/tonemap.png
 share/apps/digikam/icons/hicolor/48x48/actions/viewimage.png
 share/apps/digikam/icons/hicolor/48x48/actions/whitebalance.png
-share/apps/digikam/icons/hicolor/48x48/mimetypes/raw.png
 share/apps/digikam/icons/hicolor/64x64/actions/adjustcurves.png
 share/apps/digikam/icons/hicolor/64x64/actions/adjusthsl.png
 share/apps/digikam/icons/hicolor/64x64/actions/adjustlevels.png
@@ -444,7 +439,6 @@ share/apps/digikam/icons/hicolor/64x64/actions/texture.png
 share/apps/digikam/icons/hicolor/64x64/actions/tonemap.png
 share/apps/digikam/icons/hicolor/64x64/actions/viewimage.png
 share/apps/digikam/icons/hicolor/64x64/actions/whitebalance.png
-share/apps/digikam/icons/hicolor/64x64/mimetypes/raw.png
 share/apps/digikam/icons/hicolor/scalable/actions/adjustcurves.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/adjustlevels.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/adjustrgb.svgz