Update to version 0.6.

PR: ports/62927
Submitted by: Arjan van Leeuwen <avleeuwen@piwebs.com>

6 files changed, 154 insertions, 14 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index b97c31daff8f..740700625d74 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -6,20 +6,31 @@
 #
 
 PORTNAME=	digikam
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	avleeuwen@piwebs.com
-COMMENT=	A KDE frontend to gphoto2 for communicating with your digicam
+COMMENT=	Photo album manager for KDE with gphoto2 backend
 
-LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-BUILD_DEPENDS=	xml2pot:${PORTSDIR}/devel/kdesdk3
+LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif \
+		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
+USE_REINPLACE=	yes
+CONFIGURE_ARGS+=--program-prefix=''
+INSTALLS_SHLIB=	yes
 
-.include <bsd.port.mk>
+MAN1=		digikam.1 digikamcameraclient.1
+MANCOMPRESSED=	yes
+
+.include <bsd.port.pre.mk>
+
+pre-configure::
+	${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index 5654e8ec31cf..58450311131a 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1 +1,2 @@
-MD5 (digikam-0.5.1.tar.gz) = 94ec87692a673a5a479162041a10e2fc
+MD5 (digikam-0.6.tar.bz2) = c841d1bbd51d0105f545f106451d5ae5
+SIZE (digikam-0.6.tar.bz2) = 6054274
diff --git a/graphics/digikam-kde4/files/patch-digikamcameraclient-Makefile.in b/graphics/digikam-kde4/files/patch-digikamcameraclient-Makefile.in
new file mode 100644
index 000000000000..dd4e420ef471
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikamcameraclient-Makefile.in
@@ -0,0 +1,11 @@
+--- digikamcameraclient/Makefile.in.orig	Tue Feb 17 11:46:36 2004
++++ digikamcameraclient/Makefile.in	Tue Feb 17 11:46:47 2004
+@@ -272,7 +272,7 @@
+ digikamcameraclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-digikamcameraclient_LDADD = $(LIB_KDEUI) $(LIB_KFILE) \
++digikamcameraclient_LDADD = $(LIB_KDEUI) $(LIB_KFILE) $(LIBPTHREAD) \
+ 	$(top_builddir)/digikamcameraclient/cameraui/libcameraui.la \
+ 	$(top_builddir)/digikam/libdigikam.la
+ 
diff --git a/graphics/digikam-kde4/files/patch-kioslave-Makefile.in b/graphics/digikam-kde4/files/patch-kioslave-Makefile.in
new file mode 100644
index 000000000000..8b7f677098fa
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-kioslave-Makefile.in
@@ -0,0 +1,11 @@
+--- kioslave/Makefile.in.orig	Tue Feb 17 11:33:53 2004
++++ kioslave/Makefile.in	Tue Feb 17 11:37:02 2004
+@@ -259,7 +259,7 @@
+ kde_module_LTLIBRARIES = kio_digikamthumbnail.la
+ 
+ kio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp
+-kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) -ljpeg
++kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) -ljpeg $(LIBPTHREAD)
+ kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
+ 
+ protocol_DATA = digikamthumbnail.protocol
diff --git a/graphics/digikam-kde4/pkg-descr b/graphics/digikam-kde4/pkg-descr
index af0f29afe09a..bf125b4c1450 100644
--- a/graphics/digikam-kde4/pkg-descr
+++ b/graphics/digikam-kde4/pkg-descr
@@ -1,7 +1,11 @@
-Digikam is a KDE application which acts as a frontend to gphoto2 for
-communicating with your digital camera. It can preview and download images
-via a convenient GUI. It is also able to autodetect the camera connected
-to your computer.
+Digikam is a simple digital photo management application, which makes 
+importing and organizing digital photos a "snap". The photos can be organized 
+in albums which are automatically sorted chronologically. An easy to use 
+interface is provided to connect to your camera and preview images and download
+and/or delete them.
+
+Digikam also includes a very flexible plugin architecture. Install the 
+graphics/digikamplugins port to extend Digikam's features.
 
 WWW: http://digikam.sourceforge.net/
 
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index b86858d0de3a..3b18430023e5 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -1,24 +1,105 @@
 bin/digikam
+bin/digikamcameraclient
+include/digikam/albuminfo.h
+include/digikam/albummanager.h
+include/digikam/digikamio.h
+include/digikam/plugin.h
+include/digikam/thumbnailjob.h
+lib/kde3/kio_digikamthumbnail.la
+lib/kde3/kio_digikamthumbnail.so
+lib/libdigikam.la
+lib/libdigikam.so
+lib/libdigikam.so.0
 share/applnk/Graphics/digikam.desktop
 share/apps/digikam/digikam-splash.png
 share/apps/digikam/digikamui.rc
-share/doc/HTML/en/digikam/common
+share/apps/digikam/icons/hicolor/32x32/actions/addimagefolder.png
+share/apps/digikam/icons/hicolor/32x32/actions/albumfoldercomment.png
+share/apps/digikam/icons/hicolor/32x32/actions/albumfoldernew.png
+share/apps/digikam/icons/hicolor/32x32/actions/digitalcam.png
+share/apps/digikam/icons/hicolor/32x32/actions/editimage.png
+share/apps/digikam/icons/hicolor/32x32/actions/exifinfo.png
+share/apps/digikam/icons/hicolor/32x32/actions/imagecomment.png
+share/apps/digikam/icons/hicolor/32x32/actions/importfolders2albums.png
+share/apps/digikamcameraclient/digikamcameraui.rc
+share/apps/digikamcameraclient/icons/documents.png
+share/apps/digikamcameraclient/icons/generic.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/cameraconnect.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/camerainfo.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/deleteimage.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/downloadcamera.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/hidecamerafolders.png
+share/apps/digikamcameraclient/icons/hicolor/32x32/actions/uploadcamera.png
+share/apps/digikamcameraclient/icons/multimedia.png
+share/apps/digikamcameraclient/icons/new.png
+share/apps/digikamcameraclient/icons/pictures.png
+share/apps/digikamcameraclient/icons/sound.png
+share/doc/HTML/de/digikam/addcamera.png
+share/doc/HTML/de/digikam/cameraclient.png
+share/doc/HTML/de/digikam/imageviewer.png
+share/doc/HTML/de/digikam/index.docbook
+share/doc/HTML/de/digikam/index_de.po
+share/doc/HTML/de/digikam/mainwindow.png
+share/doc/HTML/de/digikam/setupalbum.png
+share/doc/HTML/en/digikam/addcamera.png
+share/doc/HTML/en/digikam/cameraclient.png
+share/doc/HTML/en/digikam/imageviewer.png
 share/doc/HTML/en/digikam/index.cache.bz2
 share/doc/HTML/en/digikam/index.docbook
 share/doc/HTML/en/digikam/index_en.pot
-share/doc/HTML/fr/digikam/common
-share/doc/HTML/fr/digikam/index.cache.bz2
+share/doc/HTML/en/digikam/mainwindow.png
+share/doc/HTML/en/digikam/setupalbum.png
+share/doc/HTML/fr/digikam/addcamera.png
+share/doc/HTML/fr/digikam/cameraclient.png
+share/doc/HTML/fr/digikam/imageviewer.png
 share/doc/HTML/fr/digikam/index.docbook
 share/doc/HTML/fr/digikam/index_fr.po
+share/doc/HTML/fr/digikam/mainwindow.png
+share/doc/HTML/fr/digikam/setupalbum.png
 share/icons/hicolor/16x16/apps/digikam.png
+share/icons/hicolor/16x16/apps/digikamcameraclient.png
 share/icons/hicolor/22x22/apps/digikam.png
+share/icons/hicolor/22x22/apps/digikamcameraclient.png
 share/icons/hicolor/32x32/apps/digikam.png
+share/icons/hicolor/32x32/apps/digikamcameraclient.png
 share/icons/hicolor/48x48/apps/digikam.png
+share/icons/hicolor/48x48/apps/digikamcameraclient.png
 share/icons/locolor/16x16/apps/digikam.png
+share/icons/locolor/16x16/apps/digikamcameraclient.png
 share/icons/locolor/22x22/apps/digikam.png
+share/icons/locolor/22x22/apps/digikamcameraclient.png
 share/icons/locolor/32x32/apps/digikam.png
+share/icons/locolor/32x32/apps/digikamcameraclient.png
 share/icons/locolor/48x48/apps/digikam.png
+share/icons/locolor/48x48/apps/digikamcameraclient.png
+share/locale/cs/LC_MESSAGES/digikam.mo
+share/locale/da/LC_MESSAGES/digikam.mo
+share/locale/de/LC_MESSAGES/digikam.mo
+share/locale/es/LC_MESSAGES/digikam.mo
 share/locale/fr/LC_MESSAGES/digikam.mo
+share/locale/hu/LC_MESSAGES/digikam.mo
+share/locale/it/LC_MESSAGES/digikam.mo
+share/services/digikamthumbnail.protocol
+share/servicetypes/digikamplugin.desktop
+@dirrm share/servicetypes
+@dirrm share/services
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
+@dirrm share/locale/fr/LC_MESSAGES
+@dirrm share/locale/fr
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale
 @dirrm share/icons/locolor/48x48/apps
 @dirrm share/icons/locolor/48x48
 @dirrm share/icons/locolor/32x32/apps
@@ -27,6 +108,7 @@ share/locale/fr/LC_MESSAGES/digikam.mo
 @dirrm share/icons/locolor/22x22
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
@@ -35,8 +117,28 @@ share/locale/fr/LC_MESSAGES/digikam.mo
 @dirrm share/icons/hicolor/22x22
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/fr/digikam
 @dirrm share/doc/HTML/fr
+@dirrm share/doc/HTML/en/digikam/common
 @dirrm share/doc/HTML/en/digikam
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/digikam
+@dirrm share/doc/HTML/de
+@dirrm share/doc/HTML
+@dirrm share/apps/digikamcameraclient/icons/hicolor/32x32/actions
+@dirrm share/apps/digikamcameraclient/icons/hicolor/32x32
+@dirrm share/apps/digikamcameraclient/icons/hicolor
+@dirrm share/apps/digikamcameraclient/icons
+@dirrm share/apps/digikamcameraclient
+@dirrm share/apps/digikam/icons/hicolor/32x32/actions
+@dirrm share/apps/digikam/icons/hicolor/32x32
+@dirrm share/apps/digikam/icons/hicolor
+@dirrm share/apps/digikam/icons
 @dirrm share/apps/digikam
+@dirrm share/apps
 @dirrm share/applnk/Graphics
+@dirrm share/applnk
+@dirrm lib/kde3
+@dirrm include/digikam