Fix build with KDE 4.5

14 files changed, 16 insertions, 149 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index cf7566f5464c..9bb3ee36b7d6 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 93e1f12463c6..7d24bd4bdaa4 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -654,10 +654,6 @@ share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
 @dirrmtry share/locale/x-test/LC_MESSAGES
 @dirrmtry share/locale/x-test
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
-@dirrmtry share/locale/sr@ijekavianlatin
 @dirrmtry share/apps/desktoptheme/Amarok-Mockup/widgets
 @dirrmtry share/apps/desktoptheme/Amarok-Mockup
 @dirrm share/apps/amarok/scripts/script_console
diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile
index bbce8ef4dc45..0f7d7b6c9c80 100644
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	akonadi-googledata
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://libgcal.googlecode.com/files/
 
diff --git a/databases/akonadi-googledata/pkg-plist b/databases/akonadi-googledata/pkg-plist
index bca093e4d0a8..c4d58a0e0e9f 100644
--- a/databases/akonadi-googledata/pkg-plist
+++ b/databases/akonadi-googledata/pkg-plist
@@ -38,10 +38,6 @@ share/locale/tr/LC_MESSAGES/akonadi_gcal_resource.mo
 share/locale/uk/LC_MESSAGES/akonadi_gcal_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_gcal_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_gcal_resource.mo
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
-@dirrmtry share/locale/sr@ijekavianlatin
 @dirrmtry share/akonadi/agents
 @dirrmtry share/akonadi
 @dirrmtry include/KDE
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index 2bd768034545..821e99b60f32 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kphotoalbum
 PORTVERSION=	${APP_VER}.${EXTRA_VER}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${EXTRA_VER}/src/extragear
diff --git a/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt b/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..7ca6f1cb4174
--- /dev/null
+++ b/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./CMakeLists.txt.orig	2010-02-12 00:53:08.000000000 +0300
++++ ./CMakeLists.txt	2010-08-21 11:54:14.712632655 +0400
+@@ -339,5 +339,3 @@
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+ add_subdirectory( po )
+-add_subdirectory( doc-translations )
+-add_subdirectory( doc )
diff --git a/graphics/kphotoalbum-kde4/pkg-plist b/graphics/kphotoalbum-kde4/pkg-plist
index 866081cb8a2c..2065d55aace7 100644
--- a/graphics/kphotoalbum-kde4/pkg-plist
+++ b/graphics/kphotoalbum-kde4/pkg-plist
@@ -87,127 +87,6 @@ share/apps/kphotoalbum/themes/rounded/upleft.png
 share/apps/kphotoalbum/themes/rounded/upright.png
 share/apps/kphotoalbum/tips
 share/config/kphotoalbumrc
-share/doc/HTML/de/kphotoalbum/browsing.docbook
-share/doc/HTML/de/kphotoalbum/common
-share/doc/HTML/de/kphotoalbum/datebar.docbook
-share/doc/HTML/de/kphotoalbum/generating-html.docbook
-share/doc/HTML/de/kphotoalbum/importexport.docbook
-share/doc/HTML/de/kphotoalbum/index.cache.bz2
-share/doc/HTML/de/kphotoalbum/index.docbook
-share/doc/HTML/de/kphotoalbum/introduction.docbook
-share/doc/HTML/de/kphotoalbum/options.docbook
-share/doc/HTML/de/kphotoalbum/plugins.docbook
-share/doc/HTML/de/kphotoalbum/setting-properties.docbook
-share/doc/HTML/de/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/de/kphotoalbum/viewer.docbook
-share/doc/HTML/en/kphotoalbum/browser-for-jesper.png
-share/doc/HTML/en/kphotoalbum/browser-for-persons.png
-share/doc/HTML/en/kphotoalbum/browser-with-images.png
-share/doc/HTML/en/kphotoalbum/browsing.docbook
-share/doc/HTML/en/kphotoalbum/categoryEditor.png
-share/doc/HTML/en/kphotoalbum/common
-share/doc/HTML/en/kphotoalbum/datebar-for-minutes.png
-share/doc/HTML/en/kphotoalbum/datebar.docbook
-share/doc/HTML/en/kphotoalbum/datebar.png
-share/doc/HTML/en/kphotoalbum/delete-images.png
-share/doc/HTML/en/kphotoalbum/draw-on-image.png
-share/doc/HTML/en/kphotoalbum/edit-properies-menu.png
-share/doc/HTML/en/kphotoalbum/empty-browser-window.png
-share/doc/HTML/en/kphotoalbum/generating-html.docbook
-share/doc/HTML/en/kphotoalbum/image-config-window.png
-share/doc/HTML/en/kphotoalbum/images-with-tokens.png
-share/doc/HTML/en/kphotoalbum/imagesForPersons.png
-share/doc/HTML/en/kphotoalbum/import-dialog.png
-share/doc/HTML/en/kphotoalbum/importexport.docbook
-share/doc/HTML/en/kphotoalbum/index.cache.bz2
-share/doc/HTML/en/kphotoalbum/index.docbook
-share/doc/HTML/en/kphotoalbum/introduction.docbook
-share/doc/HTML/en/kphotoalbum/marking-zoom-rectangle.png
-share/doc/HTML/en/kphotoalbum/member-group-setting.png
-share/doc/HTML/en/kphotoalbum/offline-mode.png
-share/doc/HTML/en/kphotoalbum/options-general.png
-share/doc/HTML/en/kphotoalbum/options-groups.png
-share/doc/HTML/en/kphotoalbum/options-member.png
-share/doc/HTML/en/kphotoalbum/options-thumbnailview.png
-share/doc/HTML/en/kphotoalbum/options-viewer.png
-share/doc/HTML/en/kphotoalbum/options.docbook
-share/doc/HTML/en/kphotoalbum/plugins.docbook
-share/doc/HTML/en/kphotoalbum/redisplay-frames.png
-share/doc/HTML/en/kphotoalbum/search.png
-share/doc/HTML/en/kphotoalbum/setting-properties.docbook
-share/doc/HTML/en/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/en/kphotoalbum/thumbnailview.png
-share/doc/HTML/en/kphotoalbum/tokens-in-browser.png
-share/doc/HTML/en/kphotoalbum/usa-as-a-member.png
-share/doc/HTML/en/kphotoalbum/viewer-contextmenu.png
-share/doc/HTML/en/kphotoalbum/viewer.docbook
-share/doc/HTML/en/kphotoalbum/viewer.png
-share/doc/HTML/en/kphotoalbum/zoomed-view.png
-share/doc/HTML/et/kphotoalbum/browsing.docbook
-share/doc/HTML/et/kphotoalbum/common
-share/doc/HTML/et/kphotoalbum/datebar.docbook
-share/doc/HTML/et/kphotoalbum/generating-html.docbook
-share/doc/HTML/et/kphotoalbum/importexport.docbook
-share/doc/HTML/et/kphotoalbum/index.cache.bz2
-share/doc/HTML/et/kphotoalbum/index.docbook
-share/doc/HTML/et/kphotoalbum/introduction.docbook
-share/doc/HTML/et/kphotoalbum/options.docbook
-share/doc/HTML/et/kphotoalbum/plugins.docbook
-share/doc/HTML/et/kphotoalbum/setting-properties.docbook
-share/doc/HTML/et/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/et/kphotoalbum/viewer.docbook
-share/doc/HTML/it/kphotoalbum/browsing.docbook
-share/doc/HTML/it/kphotoalbum/common
-share/doc/HTML/it/kphotoalbum/datebar.docbook
-share/doc/HTML/it/kphotoalbum/generating-html.docbook
-share/doc/HTML/it/kphotoalbum/importexport.docbook
-share/doc/HTML/it/kphotoalbum/index.cache.bz2
-share/doc/HTML/it/kphotoalbum/index.docbook
-share/doc/HTML/it/kphotoalbum/introduction.docbook
-share/doc/HTML/it/kphotoalbum/options.docbook
-share/doc/HTML/it/kphotoalbum/plugins.docbook
-share/doc/HTML/it/kphotoalbum/setting-properties.docbook
-share/doc/HTML/it/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/it/kphotoalbum/viewer.docbook
-share/doc/HTML/pt_BR/kphotoalbum/browsing.docbook
-share/doc/HTML/pt_BR/kphotoalbum/common
-share/doc/HTML/pt_BR/kphotoalbum/datebar.docbook
-share/doc/HTML/pt_BR/kphotoalbum/generating-html.docbook
-share/doc/HTML/pt_BR/kphotoalbum/importexport.docbook
-share/doc/HTML/pt_BR/kphotoalbum/index.cache.bz2
-share/doc/HTML/pt_BR/kphotoalbum/index.docbook
-share/doc/HTML/pt_BR/kphotoalbum/introduction.docbook
-share/doc/HTML/pt_BR/kphotoalbum/options.docbook
-share/doc/HTML/pt_BR/kphotoalbum/plugins.docbook
-share/doc/HTML/pt_BR/kphotoalbum/setting-properties.docbook
-share/doc/HTML/pt_BR/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/pt_BR/kphotoalbum/viewer.docbook
-share/doc/HTML/sv/kphotoalbum/browsing.docbook
-share/doc/HTML/sv/kphotoalbum/common
-share/doc/HTML/sv/kphotoalbum/datebar.docbook
-share/doc/HTML/sv/kphotoalbum/generating-html.docbook
-share/doc/HTML/sv/kphotoalbum/importexport.docbook
-share/doc/HTML/sv/kphotoalbum/index.cache.bz2
-share/doc/HTML/sv/kphotoalbum/index.docbook
-share/doc/HTML/sv/kphotoalbum/introduction.docbook
-share/doc/HTML/sv/kphotoalbum/options.docbook
-share/doc/HTML/sv/kphotoalbum/plugins.docbook
-share/doc/HTML/sv/kphotoalbum/setting-properties.docbook
-share/doc/HTML/sv/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/sv/kphotoalbum/viewer.docbook
-share/doc/HTML/uk/kphotoalbum/browsing.docbook
-share/doc/HTML/uk/kphotoalbum/common
-share/doc/HTML/uk/kphotoalbum/datebar.docbook
-share/doc/HTML/uk/kphotoalbum/generating-html.docbook
-share/doc/HTML/uk/kphotoalbum/importexport.docbook
-share/doc/HTML/uk/kphotoalbum/index.cache.bz2
-share/doc/HTML/uk/kphotoalbum/index.docbook
-share/doc/HTML/uk/kphotoalbum/introduction.docbook
-share/doc/HTML/uk/kphotoalbum/options.docbook
-share/doc/HTML/uk/kphotoalbum/plugins.docbook
-share/doc/HTML/uk/kphotoalbum/setting-properties.docbook
-share/doc/HTML/uk/kphotoalbum/thumbnail-view.docbook
-share/doc/HTML/uk/kphotoalbum/viewer.docbook
 share/icons/hicolor/128x128/apps/kphotoalbum.png
 share/icons/hicolor/16x16/actions/ellipsetool.png
 share/icons/hicolor/16x16/actions/linetool.png
@@ -263,13 +142,6 @@ share/locale/uk/LC_MESSAGES/kphotoalbum.mo
 share/locale/vi/LC_MESSAGES/kphotoalbum.mo
 share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
 share/locale/zh_TW/LC_MESSAGES/kphotoalbum.mo
-@dirrm share/doc/HTML/uk/kphotoalbum
-@dirrm share/doc/HTML/sv/kphotoalbum
-@dirrm share/doc/HTML/pt_BR/kphotoalbum
-@dirrm share/doc/HTML/it/kphotoalbum
-@dirrm share/doc/HTML/et/kphotoalbum
-@dirrm share/doc/HTML/en/kphotoalbum
-@dirrm share/doc/HTML/de/kphotoalbum
 @dirrm share/apps/kphotoalbum/themes/rounded
 @dirrm share/apps/kphotoalbum/themes/grey
 @dirrm share/apps/kphotoalbum/themes/darkJS
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 39f42d35f439..4761dc9d1f0e 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	kaffeine/kaffeine/${DISTNAME}
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index b9ca14e7bf11..597e090886f6 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -70,7 +70,3 @@ share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
 @dirrmtry share/icons/oxygen/22x22
 @dirrmtry share/icons/oxygen/16x16/actions
 @dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
-@dirrmtry share/locale/sr@ijekavianlatin
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index def0b159a32b..542f7583cb8d 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
 
diff --git a/multimedia/subtitlecomposer-kde4/pkg-plist b/multimedia/subtitlecomposer-kde4/pkg-plist
index 4737da12e689..2335aaf11d71 100644
--- a/multimedia/subtitlecomposer-kde4/pkg-plist
+++ b/multimedia/subtitlecomposer-kde4/pkg-plist
@@ -64,8 +64,6 @@ share/locale/pt_BR/LC_MESSAGES/subtitlecomposer.mo
 share/locale/sr/LC_MESSAGES/subtitlecomposer.mo
 share/locale/sr@latin/LC_MESSAGES/subtitlecomposer.mo
 share/mime/packages/subtitlecomposer.xml
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
 @dirrm share/apps/subtitlecomposer/scripts/api
 @dirrm share/apps/subtitlecomposer/scripts
 @dirrm share/apps/subtitlecomposer/pics
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 97445106cb2c..45864e727fb7 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -15,7 +15,8 @@ COMMENT=	MSN Messenger client for KDE
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		qca.2:${PORTSDIR}/devel/qca
-BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
+BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
+		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
 LATEST_LINK=	${PORTNAME}-kde4
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index eb9a606dc1f5..03dbc646c1fb 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index fc6afcb979ad..5d985cd1b49b 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -555,10 +555,6 @@ share/mime/packages/x-k3b.xml
 share/sounds/k3b_error1.wav
 share/sounds/k3b_success1.wav
 share/sounds/k3b_wait_media1.wav
-@dirrm share/locale/sr@latin/LC_MESSAGES
-@dirrm share/locale/sr@latin
-@dirrm share/locale/sr@ijekavianlatin/LC_MESSAGES
-@dirrm share/locale/sr@ijekavianlatin
 @dirrm share/apps/k3b/pics/quant
 @dirrm share/apps/k3b/pics/crystal
 @dirrm share/apps/k3b/pics/RobsTheme