3 files changed, 98 insertions, 45 deletions

diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 1d6b06f7f31e..913f30ff160f 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -5,15 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=		kimdaba
-PORTVERSION=		1.1
-PORTREVISION=		2
+PORTVERSION=		2.0
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://ktown.kde.org/kimdaba/download/
 
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Image database for KDE
 
-EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+RUN_DEPENDS=		kipidcrawclient:${PORTSDIR}/graphics/kipi-plugins
+BUILD_DEPENDS=		${RUN_DEPENDS}
+
+EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-configure
 
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
diff --git a/graphics/kphotoalbum/distinfo b/graphics/kphotoalbum/distinfo
index 8ea3e387c8e5..407f54cc548a 100644
--- a/graphics/kphotoalbum/distinfo
+++ b/graphics/kphotoalbum/distinfo
@@ -1,2 +1,2 @@
-MD5 (kimdaba-1.1.tar.bz2) = 2d7a8b49dd1957f9011451c6ccad4f40
-SIZE (kimdaba-1.1.tar.bz2) = 6727859
+MD5 (kimdaba-2.0.tar.bz2) = d37b18559cd0bd626171177ec6802029
+SIZE (kimdaba-2.0.tar.bz2) = 9468638
diff --git a/graphics/kphotoalbum/pkg-plist b/graphics/kphotoalbum/pkg-plist
index d03c00031b96..5d9c7783586a 100644
--- a/graphics/kphotoalbum/pkg-plist
+++ b/graphics/kphotoalbum/pkg-plist
@@ -1,4 +1,5 @@
 bin/kimdaba
+share/applications/kde/kimdaba-import.desktop
 share/applications/kde/kimdaba.desktop
 share/apps/kimdaba/default-setup
 share/apps/kimdaba/demo/CategoryImages/Keywords-beers.jpg
@@ -41,15 +42,21 @@ share/apps/kimdaba/icons/hicolor/16x16/actions/linetool.png
 share/apps/kimdaba/icons/hicolor/16x16/actions/recttool.png
 share/apps/kimdaba/icons/hicolor/16x16/actions/selecttool.png
 share/apps/kimdaba/icons/hicolor/16x16/actions/texttool.png
-share/apps/kimdaba/infobox.js
+share/apps/kimdaba/icons/hicolor/16x16/actions/video.png
+share/apps/kimdaba/icons/hicolor/22x22/actions/key.png
 share/apps/kimdaba/kimdabaui.rc
 share/apps/kimdaba/pics/multiconfig.jpg
 share/apps/kimdaba/pics/search.jpg
+share/apps/kimdaba/pics/splash-large.png
 share/apps/kimdaba/pics/splash.png
 share/apps/kimdaba/themes/blue/imagepage.html
 share/apps/kimdaba/themes/blue/kimdaba.theme
 share/apps/kimdaba/themes/blue/mainpage.css
 share/apps/kimdaba/themes/blue/mainpage.html
+share/apps/kimdaba/themes/grey/imagepage.html
+share/apps/kimdaba/themes/grey/kimdaba.theme
+share/apps/kimdaba/themes/grey/mainpage.css
+share/apps/kimdaba/themes/grey/mainpage.html
 share/apps/kimdaba/themes/rounded/downbar.png
 share/apps/kimdaba/themes/rounded/downleft.png
 share/apps/kimdaba/themes/rounded/downright.png
@@ -66,10 +73,12 @@ share/apps/kimdaba/tips
 share/doc/HTML/da/kimdaba/browsing.docbook
 share/doc/HTML/da/kimdaba/common
 share/doc/HTML/da/kimdaba/generating-html.docbook
+share/doc/HTML/da/kimdaba/importexport.docbook
 share/doc/HTML/da/kimdaba/index.cache.bz2
 share/doc/HTML/da/kimdaba/index.docbook
 share/doc/HTML/da/kimdaba/introduction.docbook
 share/doc/HTML/da/kimdaba/options.docbook
+share/doc/HTML/da/kimdaba/plugins.docbook
 share/doc/HTML/da/kimdaba/setting-properties.docbook
 share/doc/HTML/da/kimdaba/thumbnail-view.docbook
 share/doc/HTML/da/kimdaba/viewer.docbook
@@ -86,6 +95,7 @@ share/doc/HTML/en/kimdaba/empty-browser-window.png
 share/doc/HTML/en/kimdaba/generating-html.docbook
 share/doc/HTML/en/kimdaba/image-config-window.png
 share/doc/HTML/en/kimdaba/imagesForPersons.png
+share/doc/HTML/en/kimdaba/importexport.docbook
 share/doc/HTML/en/kimdaba/index.cache.bz2
 share/doc/HTML/en/kimdaba/index.docbook
 share/doc/HTML/en/kimdaba/introduction.docbook
@@ -94,7 +104,10 @@ share/doc/HTML/en/kimdaba/offline-mode.png
 share/doc/HTML/en/kimdaba/options-general.png
 share/doc/HTML/en/kimdaba/options-groups.png
 share/doc/HTML/en/kimdaba/options-member.png
+share/doc/HTML/en/kimdaba/options-thumbnailview.png
+share/doc/HTML/en/kimdaba/options-viewer.png
 share/doc/HTML/en/kimdaba/options.docbook
+share/doc/HTML/en/kimdaba/plugins.docbook
 share/doc/HTML/en/kimdaba/redisplay-frames.png
 share/doc/HTML/en/kimdaba/search.png
 share/doc/HTML/en/kimdaba/setting-properties.docbook
@@ -105,6 +118,12 @@ share/doc/HTML/en/kimdaba/viewer-contextmenu.png
 share/doc/HTML/en/kimdaba/viewer.docbook
 share/doc/HTML/en/kimdaba/viewer.png
 share/doc/HTML/en/kimdaba/zoomed-view.png
+share/doc/HTML/es/kimdaba/browsing.docbook
+share/doc/HTML/es/kimdaba/introduction.docbook
+share/doc/HTML/es/kimdaba/options.docbook
+share/doc/HTML/es/kimdaba/setting-properties.docbook
+share/doc/HTML/es/kimdaba/thumbnail-view.docbook
+share/doc/HTML/es/kimdaba/viewer.docbook
 share/doc/HTML/et/kimdaba/browsing.docbook
 share/doc/HTML/et/kimdaba/common
 share/doc/HTML/et/kimdaba/generating-html.docbook
@@ -115,15 +134,62 @@ share/doc/HTML/et/kimdaba/options.docbook
 share/doc/HTML/et/kimdaba/setting-properties.docbook
 share/doc/HTML/et/kimdaba/thumbnail-view.docbook
 share/doc/HTML/et/kimdaba/viewer.docbook
+share/doc/HTML/it/kimdaba/browser-for-jesper.png
+share/doc/HTML/it/kimdaba/browser-for-persons.png
+share/doc/HTML/it/kimdaba/browser-with-images.png
 share/doc/HTML/it/kimdaba/browsing.docbook
+share/doc/HTML/it/kimdaba/categoryEditor.png
 share/doc/HTML/it/kimdaba/common
+share/doc/HTML/it/kimdaba/delete-images.png
+share/doc/HTML/it/kimdaba/draw-on-image.png
+share/doc/HTML/it/kimdaba/edit-properies-menu.png
+share/doc/HTML/it/kimdaba/empty-browser-window.png
+share/doc/HTML/it/kimdaba/generating-html.docbook
+share/doc/HTML/it/kimdaba/image-config-window.png
+share/doc/HTML/it/kimdaba/imagesForPersons.png
+share/doc/HTML/it/kimdaba/importexport.docbook
 share/doc/HTML/it/kimdaba/index.cache.bz2
 share/doc/HTML/it/kimdaba/index.docbook
 share/doc/HTML/it/kimdaba/introduction.docbook
+share/doc/HTML/it/kimdaba/marking-zoom-rectangle.png
+share/doc/HTML/it/kimdaba/offline-mode.png
+share/doc/HTML/it/kimdaba/options-general.png
+share/doc/HTML/it/kimdaba/options-groups.png
+share/doc/HTML/it/kimdaba/options-member.png
 share/doc/HTML/it/kimdaba/options.docbook
+share/doc/HTML/it/kimdaba/plugins.docbook
+share/doc/HTML/it/kimdaba/redisplay-frames.png
+share/doc/HTML/it/kimdaba/search.png
 share/doc/HTML/it/kimdaba/setting-properties.docbook
 share/doc/HTML/it/kimdaba/thumbnail-view.docbook
+share/doc/HTML/it/kimdaba/thumbnailview.png
+share/doc/HTML/it/kimdaba/usa-as-a-member.png
+share/doc/HTML/it/kimdaba/viewer-contextmenu.png
 share/doc/HTML/it/kimdaba/viewer.docbook
+share/doc/HTML/it/kimdaba/viewer.png
+share/doc/HTML/it/kimdaba/zoomed-view.png
+share/doc/HTML/pt/kimdaba/browsing.docbook
+share/doc/HTML/pt/kimdaba/common
+share/doc/HTML/pt/kimdaba/generating-html.docbook
+share/doc/HTML/pt/kimdaba/importexport.docbook
+share/doc/HTML/pt/kimdaba/index.cache.bz2
+share/doc/HTML/pt/kimdaba/index.docbook
+share/doc/HTML/pt/kimdaba/introduction.docbook
+share/doc/HTML/pt/kimdaba/options.docbook
+share/doc/HTML/pt/kimdaba/plugins.docbook
+share/doc/HTML/pt/kimdaba/setting-properties.docbook
+share/doc/HTML/pt/kimdaba/thumbnail-view.docbook
+share/doc/HTML/pt/kimdaba/viewer.docbook
+share/doc/HTML/ru/kimdaba/browsing.docbook
+share/doc/HTML/ru/kimdaba/common
+share/doc/HTML/ru/kimdaba/generating-html.docbook
+share/doc/HTML/ru/kimdaba/index.cache.bz2
+share/doc/HTML/ru/kimdaba/index.docbook
+share/doc/HTML/ru/kimdaba/introduction.docbook
+share/doc/HTML/ru/kimdaba/options.docbook
+share/doc/HTML/ru/kimdaba/setting-properties.docbook
+share/doc/HTML/ru/kimdaba/thumbnail-view.docbook
+share/doc/HTML/ru/kimdaba/viewer.docbook
 share/doc/HTML/sv/kimdaba/browser-for-jesper.png
 share/doc/HTML/sv/kimdaba/browser-for-persons.png
 share/doc/HTML/sv/kimdaba/browser-with-images.png
@@ -137,6 +203,7 @@ share/doc/HTML/sv/kimdaba/empty-browser-window.png
 share/doc/HTML/sv/kimdaba/generating-html.docbook
 share/doc/HTML/sv/kimdaba/image-config-window.png
 share/doc/HTML/sv/kimdaba/imagesForPersons.png
+share/doc/HTML/sv/kimdaba/importexport.docbook
 share/doc/HTML/sv/kimdaba/index.cache.bz2
 share/doc/HTML/sv/kimdaba/index.docbook
 share/doc/HTML/sv/kimdaba/introduction.docbook
@@ -145,7 +212,11 @@ share/doc/HTML/sv/kimdaba/offline-mode.png
 share/doc/HTML/sv/kimdaba/options-general.png
 share/doc/HTML/sv/kimdaba/options-groups.png
 share/doc/HTML/sv/kimdaba/options-member.png
+share/doc/HTML/sv/kimdaba/options-thumbnailview.png
+share/doc/HTML/sv/kimdaba/options-viewer.png
 share/doc/HTML/sv/kimdaba/options.docbook
+share/doc/HTML/sv/kimdaba/plugins.docbook
+share/doc/HTML/sv/kimdaba/redisplay-frames.png
 share/doc/HTML/sv/kimdaba/search.png
 share/doc/HTML/sv/kimdaba/setting-properties.docbook
 share/doc/HTML/sv/kimdaba/thumbnail-view.docbook
@@ -161,8 +232,10 @@ share/icons/hicolor/22x22/apps/kimdaba.png
 share/icons/hicolor/32x32/apps/kimdaba.png
 share/icons/hicolor/48x48/apps/kimdaba.png
 share/icons/hicolor/64x64/apps/kimdaba.png
+share/locale/br/LC_MESSAGES/kimdaba.mo
 share/locale/ca/LC_MESSAGES/kimdaba.mo
 share/locale/cs/LC_MESSAGES/kimdaba.mo
+share/locale/cy/LC_MESSAGES/kimdaba.mo
 share/locale/da/LC_MESSAGES/kimdaba.mo
 share/locale/de/LC_MESSAGES/kimdaba.mo
 share/locale/en_GB/LC_MESSAGES/kimdaba.mo
@@ -170,7 +243,12 @@ share/locale/es/LC_MESSAGES/kimdaba.mo
 share/locale/et/LC_MESSAGES/kimdaba.mo
 share/locale/fi/LC_MESSAGES/kimdaba.mo
 share/locale/fr/LC_MESSAGES/kimdaba.mo
+share/locale/ga/LC_MESSAGES/kimdaba.mo
+share/locale/is/LC_MESSAGES/kimdaba.mo
 share/locale/it/LC_MESSAGES/kimdaba.mo
+share/locale/nb/LC_MESSAGES/kimdaba.mo
+share/locale/nl/LC_MESSAGES/kimdaba.mo
+share/locale/pl/LC_MESSAGES/kimdaba.mo
 share/locale/pt/LC_MESSAGES/kimdaba.mo
 share/locale/pt_BR/LC_MESSAGES/kimdaba.mo
 share/locale/ro/LC_MESSAGES/kimdaba.mo
@@ -180,45 +258,9 @@ share/locale/sv/LC_MESSAGES/kimdaba.mo
 share/locale/ta/LC_MESSAGES/kimdaba.mo
 share/locale/tr/LC_MESSAGES/kimdaba.mo
 share/locale/zh_CN/LC_MESSAGES/kimdaba.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ta/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ta 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
+@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
+@unexec rmdir %D/share/mimelnk 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
@@ -235,19 +277,28 @@ share/locale/zh_CN/LC_MESSAGES/kimdaba.mo
 @unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/doc/HTML/sv/kimdaba
 @unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrm share/doc/HTML/ru/kimdaba
+@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrm share/doc/HTML/pt/kimdaba
+@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
 @dirrm share/doc/HTML/it/kimdaba
 @unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
 @dirrm share/doc/HTML/et/kimdaba
 @unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrm share/doc/HTML/es/kimdaba
+@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
 @dirrm share/doc/HTML/en/kimdaba
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @dirrm share/doc/HTML/da/kimdaba
 @unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/kimdaba/themes/rounded
+@dirrm share/apps/kimdaba/themes/grey
 @dirrm share/apps/kimdaba/themes/blue
 @dirrm share/apps/kimdaba/themes
 @dirrm share/apps/kimdaba/pics
+@dirrm share/apps/kimdaba/icons/hicolor/22x22/actions
+@dirrm share/apps/kimdaba/icons/hicolor/22x22
 @dirrm share/apps/kimdaba/icons/hicolor/16x16/actions
 @dirrm share/apps/kimdaba/icons/hicolor/16x16
 @dirrm share/apps/kimdaba/icons/hicolor