Massive cleanup for KDE3. Main point is in changing WANTLIB from "foo" to

"lib/kde3/foo" where appropirate, but also many missing desktop goo items added, some PFRAG.shared removed and so on. input and okay landry@ and ajacoutot@, also okay espie@
2013-06-24 15:53:38 +00:00 · 2013-06-24 15:53:38 +00:00 · cc129972c6
commit cc129972c6
parent 502a106663
62 changed files with 476 additions and 493 deletions
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2013/04/29 06:51:24 brad Exp $
+# $OpenBSD: Makefile,v 1.58 2013/06/24 15:53:38 zhuk Exp $

 CATEGORIES =	audio x11 x11/kde
 COMMENT =	music player for KDE
@ -7,25 +7,30 @@ HOMEPAGE =	http://amarok.kde.org/
 V =		1.4.10
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/amarok/$V/src/}
 DISTNAME =	amarok-$V
-REVISION =	18
+REVISION =	19
 EXTRACT_SUFX =	.tar.bz2

 # GPLv2/LGPLv2/GFDL
 PERMIT_PACKAGE_CDROM =		Yes

-WANTLIB += DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2
 WANTLIB += avahi-client avahi-common avutil c dbus-1 dns_sd drm
 WANTLIB += expat fam ffi fontconfig freetype gcrypt gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
-WANTLIB += gpod idn kdecore kdefx kdeprint kdesu kdeui kdnssd
-WANTLIB += khtml kio kjs knewstuff konqsidebarplugin kparts kutils
-WANTLIB += kwalletclient lcms m mng mtp njb pcre pcreposix plist
+WANTLIB += gpod idn lcms m mng mtp njb pcre pcreposix plist
 WANTLIB += png pthread pthread-stubs sqlite3 stdc++ tag usb
 WANTLIB += usb-1.0 util xcb xine xml2 z ${MODRUBY_WANTLIB}
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kdnssd
+WANTLIB += ${KDE}/khtml ${KDE}/kio ${KDE}/kjs ${KDE}/knewstuff
+WANTLIB += ${KDE}/konqsidebarplugin ${KDE}/kparts ${KDE}/kutils
+WANTLIB += ${KDE}/kwalletclient

-RUN_DEPENDS =	devel/desktop-file-utils
-LIB_DEPENDS +=	x11/kde/libs3 \
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
+LIB_DEPENDS =	x11/kde/libs3 \
 		x11/kde/base3 \
 		x11/gtk+2 \
 		audio/taglib>=1.4 \
--- a/audio/amarok/pkg/PLIST
+++ b/audio/amarok/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2009/12/22 15:43:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2013/06/24 15:53:38 zhuk Exp $
@bin bin/amarok
 bin/amarok_daapserver.rb
 bin/amarok_proxy.rb
@ -1035,8 +1035,6 @@ share/locale/is/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
 share/locale/ka/LC_MESSAGES/amarok.mo
-share/locale/km/
-share/locale/km/LC_MESSAGES/
 share/locale/km/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
 share/locale/ku/LC_MESSAGES/amarok.mo
@ -1047,8 +1045,6 @@ share/locale/lt/LC_MESSAGES/amarok.mo
 share/locale/mk/LC_MESSAGES/amarok.mo
 share/locale/ms/LC_MESSAGES/amarok.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
-share/locale/nds/
-share/locale/nds/LC_MESSAGES/
 share/locale/nds/LC_MESSAGES/amarok.mo
 share/locale/ne/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
@ -1067,14 +1063,14 @@ share/locale/sk/LC_MESSAGES/amarok.mo
 share/locale/sl/LC_MESSAGES/amarok.mo
 share/locale/sq/LC_MESSAGES/amarok.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
+share/locale/sr@Latn/
+share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/amarok.mo
 share/locale/ss/
 share/locale/ss/LC_MESSAGES/
 share/locale/ss/LC_MESSAGES/amarok.mo
 share/locale/sv/LC_MESSAGES/amarok.mo
 share/locale/ta/LC_MESSAGES/amarok.mo
-share/locale/tg/
-share/locale/tg/LC_MESSAGES/
 share/locale/tg/LC_MESSAGES/amarok.mo
 share/locale/th/LC_MESSAGES/amarok.mo
 share/locale/tr/LC_MESSAGES/amarok.mo
@ -1100,3 +1096,5 @@ share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/cad/klogic/Makefile
+++ b/cad/klogic/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/21 08:45:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2013/06/24 15:53:38 zhuk Exp $

 SHARED_ONLY=	Yes
 COMMENT= 	logic circuit simulator for KDE

 DISTNAME=	klogic-1.6
-REVISION=	6
+REVISION=	7
 CATEGORIES=	cad education x11 x11/kde

 MASTER_SITES=	http://distfiles.nl/
@ -12,11 +12,12 @@ MASTER_SITES=	http://distfiles.nl/
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB += DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2
-WANTLIB += c drm expat fontconfig freetype idn jpeg kdecore kdefx
-WANTLIB += kdesu kdeui kio kwalletclient lcms m mng png pthread
-WANTLIB += stdc++ util xcb z
+WANTLIB += c drm expat fontconfig freetype idn jpeg
+WANTLIB += lcms m mng png pthread stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 LIB_DEPENDS=	x11/kde/libs3

--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/06/02 19:41:57 zhuk Exp $
+# $OpenBSD: Makefile,v 1.13 2013/06/24 15:53:38 zhuk Exp $

 CATEGORIES=	databases x11 x11/kde
 COMMENT=	MDB (access) file migration driver for kexi
@ -7,7 +7,7 @@ VERSION=	1.6.1
 MASTER_SITES=	${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@}
 DISTNAME=	keximdb-1.1.0
 DIST_SUBDIR=	kde
-REVISION=	6
+REVISION=	7
 HOMEPAGE=	http://www.kexi-project.org/wiki/wikiview/index.php?MDBDriver

 SHARED_ONLY=	Yes
@ -33,13 +33,17 @@ LIB_DEPENDS +=	x11/kde/libs3 \

 WANTLIB += ICE SM X11 Xext Xrender jpeg m png
 WANTLIB += stdc++ util z art_lgpl_2 glib-2.0 idn
-WANTLIB += pcre xcb kdecore>=7 DCOP kabc kdefx
-WANTLIB += kdeprint kdesu kdeui kparts kutils kwalletclient kio
-WANTLIB += kmdi knewstuff kresources ktexteditor vcard kofficecore>=3
-WANTLIB += kexicore kexidatatable kexidb kexidbparser kexiextendedwidgets
-WANTLIB += kexiguiutils keximain keximigrate kexiutils kofficeui
-WANTLIB += koproperty kowmf kstore kwmf mdb
+WANTLIB += pcre xcb
 WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mng
+WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mdb mng
+WANTLIB += ${KDE}/kdecore>=7 ${KDE}/DCOP ${KDE}/kabc ${KDE}/kdefx
+WANTLIB += ${KDE}/kdeprint ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kparts
+WANTLIB += ${KDE}/kutils ${KDE}/kwalletclient ${KDE}/kio ${KDE}/kmdi
+WANTLIB += ${KDE}/knewstuff ${KDE}/kresources ${KDE}/ktexteditor
+WANTLIB += ${KDE}/vcard ${KDE}/kofficecore>=3 ${KDE}/kexicore
+WANTLIB += ${KDE}/kexidatatable ${KDE}/kexidb ${KDE}/kexidbparser
+WANTLIB += ${KDE}/kexiextendedwidgets ${KDE}/kexiguiutils ${KDE}/keximain
+WANTLIB += ${KDE}/keximigrate ${KDE}/kexiutils ${KDE}/kofficeui
+WANTLIB += ${KDE}/koproperty ${KDE}/kowmf ${KDE}/kstore ${KDE}/kwmf

 .include <bsd.port.mk>
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@ -1,25 +1,27 @@
-# $OpenBSD: Makefile,v 1.34 2013/05/18 16:11:39 kirby Exp $
+# $OpenBSD: Makefile,v 1.35 2013/06/24 15:53:38 zhuk Exp $

 SHARED_ONLY=	Yes
 COMMENT=	graphical debugger for KDE

 DISTNAME=	kdbg-1.2.5
-REVISION =	6
+REVISION =	7
 CATEGORIES=	devel
 HOMEPAGE=	http://www.kdbg.org/

 # GPL
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB =	DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
-WANTLIB +=	fam fontconfig freetype idn kdecore>=4 kdefx kdesu kdeui
-WANTLIB +=	kio kwalletclient m png pthread pthread-stubs stdc++ util
-WANTLIB +=	xcb z
+WANTLIB =	ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
+WANTLIB +=	fam fontconfig freetype idn
+WANTLIB +=	m png pthread pthread-stubs stdc++ util xcb z
+WANTLIB +=	${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB +=	${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/}

 MODULES=	x11/kde devel/gettext

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

 CONFIGURE_STYLE= autoconf autoheader
--- a/devel/kdbg/pkg/PLIST
+++ b/devel/kdbg/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/09/14 23:43:56 espie Exp $
+@comment $OpenBSD: PLIST,v 1.9 2013/06/24 15:53:38 zhuk Exp $
 bin/kdbg
 share/applnk/
 share/applnk/Development/
@ -168,3 +168,7 @@ share/locale/tr/LC_MESSAGES/kdbg.mo
 share/locale/zh_CN.GB2312/
 share/locale/zh_CN.GB2312/LC_MESSAGES/
 share/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	integrated LaTeX environment for KDE
 DISTNAME=	kile-2.0
-REVISION=	3
+REVISION=	4
 CATEGORIES=	editors x11/kde

 HOMEPAGE=	http://kile.sourceforge.net/
@ -15,18 +15,21 @@ EXTRACT_SUFX=	.tar.bz2
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB +=	DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
-WANTLIB +=	fam fontconfig freetype idn jpeg kabc katepartinterfaces
-WANTLIB +=	kdecore kdefx kdeprint kdesu kdeui khtml kio kjs kparts
-WANTLIB +=	kresources kspell ktexteditor kutils kwalletclient m pcre
-WANTLIB +=	pcreposix png pthread pthread-stubs stdc++ util vcard xcb
-WANTLIB +=	z
+WANTLIB =	ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
+WANTLIB +=	fam fontconfig freetype idn jpeg m pcre pcreposix png
+WANTLIB +=	pthread pthread-stubs stdc++ util xcb z
+WANTLIB +=	${KDE}/DCOP ${KDE}/kabc ${KDE}/katepartinterfaces
+WANTLIB +=	${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint ${KDE}/kdesu
+WANTLIB +=	${KDE}/kdeui ${KDE}/khtml ${KDE}/kio ${KDE}/kjs
+WANTLIB +=	${KDE}/kparts ${KDE}/kresources${KDE}/kspell ${KDE}/ktexteditor
+WANTLIB +=	${KDE}/kutils ${KDE}/kwalletclient ${KDE}/vcard

-LIB_DEPENDS=	x11/kde/libs3
-	
 RUN_DEPENDS=	x11/kde/graphics3 \
 		print/texlive/base \
-		devel/desktop-file-utils
+		devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
+LIB_DEPENDS=	x11/kde/libs3

 MODULES=	x11/kde devel/gettext

--- a/editors/kile/pkg/PLIST
+++ b/editors/kile/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/12/22 15:08:35 ajacoutot Exp $
-bin/kile
+@comment $OpenBSD: PLIST,v 1.7 2013/06/24 15:53:38 zhuk Exp $
+@bin bin/kile
 share/applications/kde/kile.desktop
 share/apps/katepart/syntax/bibtex-kile.xml
 share/apps/katepart/syntax/latex-kile.xml
@ -1562,8 +1562,6 @@ share/locale/mt/
 share/locale/mt/LC_MESSAGES/
 share/locale/mt/LC_MESSAGES/kile.mo
 share/locale/nb/LC_MESSAGES/kile.mo
-share/locale/nds/
-share/locale/nds/LC_MESSAGES/
 share/locale/nds/LC_MESSAGES/kile.mo
 share/locale/nl/LC_MESSAGES/kile.mo
 share/locale/nn/LC_MESSAGES/kile.mo
@ -1576,6 +1574,8 @@ share/locale/ru/LC_MESSAGES/kile.mo
 share/locale/rw/LC_MESSAGES/kile.mo
 share/locale/sk/LC_MESSAGES/kile.mo
 share/locale/sr/LC_MESSAGES/kile.mo
+share/locale/sr@Latn/
+share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/kile.mo
 share/locale/sv/LC_MESSAGES/kile.mo
 share/locale/ta/LC_MESSAGES/kile.mo
@ -1586,3 +1586,5 @@ share/locale/zh_CN/LC_MESSAGES/kile.mo
 share/mimelnk/text/x-kilepr.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.39 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2013/06/24 15:53:38 zhuk Exp $

 SHARED_ONLY=	Yes

 COMMENT=	XML editor for KDE

 DISTNAME=	kxmleditor-1.1.3
-REVISION=	8
+REVISION=	9
 CATEGORIES=	editors x11 x11/kde

 SHARED_LIBS=	kxmleditorpart	2.0
@ -17,14 +17,17 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB +=	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi
+WANTLIB =	GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi
 WANTLIB +=	Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore kdefx
-WANTLIB +=	kdeprint kdesu kdeui kio kparts kwalletclient lcms m mng
-WANTLIB +=	png pthread pthread-stubs stdc++ util xcb z
+WANTLIB +=	expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB +=	pthread pthread-stubs stdc++ util xcb z
+WANTLIB +=	${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB +=	${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts
+WANTLIB +=	${KDE}/kwalletclient

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kxmleditor/}

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

 MODULES=	x11/kde devel/gettext
--- a/editors/kxmleditor/pkg/PFRAG.shared
+++ b/editors/kxmleditor/pkg/PFRAG.shared
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/27 12:35:16 aanriot Exp $
-@lib lib/libkxmleditorpart.so.${LIBkxmleditorpart_VERSION}
--- a/editors/kxmleditor/pkg/PLIST
+++ b/editors/kxmleditor/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2004/10/06 15:17:39 naddy Exp $
-bin/kxmleditor
+@comment $OpenBSD: PLIST,v 1.10 2013/06/24 15:53:38 zhuk Exp $
+@bin bin/kxmleditor
 lib/libkxmleditorpart.la
+@lib lib/libkxmleditorpart.so.${LIBkxmleditorpart_VERSION}
 share/applnk/
 share/applnk/Applications/
 share/applnk/Applications/kxmleditor.desktop
@ -109,11 +110,7 @@ share/doc/HTML/en/kxmleditor/setuptreeview.png
 share/doc/HTML/en/kxmleditor/specprocinstrdlg.png
 share/doc/HTML/en/kxmleditor/texteditor.png
 share/doc/HTML/en/kxmleditor/xml.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/kxmleditor.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/kxmleditor.png
 share/icons/locolor/
 share/icons/locolor/16x16/
@ -126,4 +123,7 @@ share/locale/de/LC_MESSAGES/kxmleditor.mo
 share/locale/fr/LC_MESSAGES/kxmleditor.mo
 share/locale/pl/LC_MESSAGES/kxmleditor.mo
 share/services/kxmleditorpart.desktop
-%%SHARED%%
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2013/06/24 15:53:38 zhuk Exp $

 COMMENT= 		billiard game
 CATEGORIES=		x11 x11/kde games
 DISTNAME=		kbilliards-0.8.7b
-REVISION =		8
+REVISION =		9

 HOMEPAGE=		http://www.hostnotfound.it/kbilliards.php
 MASTER_SITES=		http://www.hostnotfound.it/kbilliards/
@ -12,13 +12,16 @@ EXTRACT_SUFX=		.tar.bz2
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB =	DCOP FLAC ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2
-WANTLIB +=	artsflow artsflow_idl artskde audiofile bz2 c expat fam 
-WANTLIB +=	fontconfig freetype glib-2.0 gmodule-2.0 gthread-2.0 idn 
-WANTLIB +=	kdecore>=6 kdefx kdeprint kdesu kdeui kio kmedia2_idl kparts
-WANTLIB +=	kwalletclient m mad mcop ogg pcre png pthread pthread-stubs
-WANTLIB +=	qt-mt qtmcop sndio soundserver_idl stdc++ util vorbis
+WANTLIB =	FLAC ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2
+WANTLIB +=	audiofile bz2 c expat fam fontconfig freetype glib-2.0
+WANTLIB +=	gmodule-2.0 gthread-2.0 idn m mad ogg pcre png 
+WANTLIB +=	pthread pthread-stubs sndio stdc++ util vorbis
 WANTLIB +=	vorbisenc vorbisfile xcb z
+WANTLIB +=	${KDE}/DCOP ${KDE}/artsflow ${KDE}/artsflow_idl
+WANTLIB +=	${KDE}/artskde ${KDE}/kdecore>=6 ${KDE}/kdefx
+WANTLIB +=	${KDE}/kdeprint ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio
+WANTLIB +=	${KDE}/kmedia2_idl ${KDE}/kparts ${KDE}/kwalletclient
+WANTLIB +=	${KDE}/mcop ${KDE}/qtmcop ${KDE}/soundserver_idl 

 MODULES=		x11/kde	devel/gettext

--- a/games/kslide/Makefile
+++ b/games/kslide/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2013/06/04 18:41:43 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	puzzle game for KDE

 DISTNAME=	kslide-0.90
-REVISION =	4
+REVISION =	5
 CATEGORIES=	games

 HOMEPAGE=	http://perso.wanadoo.fr/coquelle/taquin/
@ -12,32 +12,26 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>

 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB =	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
-WANTLIB +=	Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore>=4 kdefx
-WANTLIB +=	kdesu kdeui kio kwalletclient lcms m mng png pthread
-WANTLIB +=	pthread-stubs stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += pthread pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MASTER_SITES=	http://david.bieder.free.fr/eric/taquin/ \
 		http://perso.wanadoo.fr/coquelle/taquin/
 EXTRACT_SUFX=	.tar.bz2

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

-MODULES=	x11/qt3 devel/gettext
+MODULES=	x11/kde devel/gettext

 MAKE_ENV=	${CONFIGURE_ENV}
-# Ensure qt2 will always be at the front
-MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'

 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
-CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 
-
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin

 WRKDIST=	${WRKDIR}/kslide

--- a/games/kslide/pkg/PLIST
+++ b/games/kslide/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:46:09 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2013/06/24 15:53:38 zhuk Exp $
 bin/kslide
 share/applnk/
 share/applnk/Games/
@ -52,3 +52,7 @@ share/icons/locolor/16x16/apps/kslide.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/kslide.png
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	silly little game based on Spacetaxi for the C64

 DISTNAME=	taxipilot-0.7.2
-REVISION =	4
+REVISION =	5
 CATEGORIES=	games

 HOMEPAGE=	http://taxipilot.sourceforge.net/
@ -13,31 +13,26 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB =	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
-WANTLIB +=	Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore>=4 kdefx
-WANTLIB +=	kdesu kdeui kio kwalletclient lcms m mng png pthread
-WANTLIB +=	pthread-stubs stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += pthread pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=taxipilot/}

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

-MODULES=	x11/qt3 devel/gettext
+MODULES=	x11/kde devel/gettext

 PORTHOME=	${WRKDIR}

 MAKE_ENV=	${CONFIGURE_ENV}
-# Ensure Qt3 will always be at the front
-MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'

 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
-CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin

 NO_TEST=	Yes

--- a/games/taxipilot/pkg/PLIST
+++ b/games/taxipilot/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:11 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2013/06/24 15:53:38 zhuk Exp $
 bin/taxipilot
 share/applnk/
 share/applnk/Games/
@ -290,3 +290,7 @@ share/icons/locolor/16x16/apps/taxipilot.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/taxipilot.png
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2013/03/11 11:10:52 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =		digital image kde application
 CATEGORIES =		graphics x11 x11/kde
 V =			0.9.6
 DISTNAME =		digikam-$V
-REVISION =		7
+REVISION =		8
 SHARED_LIBS +=		digikam              3.0      # .0.0
 HOMEPAGE =		http://www.digikam.org/
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=digikam/}
@ -12,8 +12,10 @@ DISTFILES =		${DISTNAME}.tar.bz2

 SHARED_ONLY =		Yes

-RUN_DEPENDS =	devel/desktop-file-utils
-LIB_DEPENDS +=	x11/kde/libs3 \
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
+LIB_DEPENDS =	x11/kde/libs3 \
 		graphics/libgphoto2>=2.5 \
 		graphics/libkipi \
 		graphics/tiff \
@ -21,16 +23,17 @@ LIB_DEPENDS +=	x11/kde/libs3 \
 		graphics/libkdcraw \
 		graphics/lcms

-WANTLIB =	util m c ICE Xrender SM pthread z stdc++ expat \
-		Xext X11 jpeg png art_lgpl_2 exif idn \
-		exiv2 jasper pcre pcreposix ltdl \
-		xcb lib/qt3/qt-mt>=3.33 kdecore>=6 \
-		kwalletclient DCOP kparts kdeui kdesu kio kdefx \
-		kdeprint kutils kabc vcard kresources khtml kjs \
-		gphoto2 gphoto2_port kipi tiff kexiv2>=1 kdcraw \
-		lcms
-WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm fontconfig freetype mng fam
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xt Xxf86vm Xrender art_lgpl_2 c drm fam
+WANTLIB += fontconfig freetype exif expat exiv2 gphoto2 gphoto2_port
+WANTLIB += idn jasper jpeg lcms ltdl m mng pcre pcreposix png pthread
+WANTLIB += stdc++ tiff util xcb z
+WANTLIB += lib/qt3/qt-mt>=3.33
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kparts ${KDE}/kdeui
+WANTLIB += ${KDE}/kdesu ${KDE}/kio ${KDE}/kdefx ${KDE}/kdcraw
+WANTLIB += ${KDE}/kdeprint ${KDE}/kexiv2>=1 ${KDE}/kipi ${KDE}/kutils
+WANTLIB += ${KDE}/kabc ${KDE}/kresources ${KDE}/khtml ${KDE}/kjs
+WANTLIB += ${KDE}/kwalletclient ${KDE}/vcard

 MODULES =	devel/gettext \
 		x11/kde
--- a/graphics/digikam/pkg/PLIST
+++ b/graphics/digikam/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2013/01/23 21:28:21 zhuk Exp $
+@comment $OpenBSD: PLIST,v 1.15 2013/06/24 15:53:38 zhuk Exp $
@conflict digikamimageplugins-*
@bin bin/digikam
@bin bin/digikamthemedesigner
@ -855,3 +855,5 @@ share/services/digikamthumbnail.protocol
 share/servicetypes/digikamimageplugin.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/graphics/gwenview-i18n/Makefile
+++ b/graphics/gwenview-i18n/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2013/03/11 11:10:53 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	image viewer for KDE, translations

 DISTNAME=	gwenview-i18n-1.4.2
-REVISION=		0
+REVISION=		1
 CATEGORIES=	graphics x11 x11/kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
 EXTRACT_SUFX=	.tar.bz2
--- a/graphics/gwenview-i18n/pkg/PLIST
+++ b/graphics/gwenview-i18n/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/05/27 09:11:59 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2013/06/24 15:53:38 zhuk Exp $
@conflict gwenview-<1.4.0
 share/doc/HTML/da/
 share/doc/HTML/da/gwenview/
@ -133,8 +133,6 @@ share/doc/HTML/sv/gwenview/view_mode.png
 share/locale/ar/LC_MESSAGES/gwenview.mo
 share/locale/az/LC_MESSAGES/gwenview.mo
 share/locale/bg/LC_MESSAGES/gwenview.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
 share/locale/br/LC_MESSAGES/gwenview.mo
 share/locale/ca/LC_MESSAGES/gwenview.mo
 share/locale/cs/LC_MESSAGES/gwenview.mo
@ -147,8 +145,6 @@ share/locale/es/LC_MESSAGES/gwenview.mo
 share/locale/et/LC_MESSAGES/gwenview.mo
 share/locale/fa/LC_MESSAGES/gwenview.mo
 share/locale/fi/LC_MESSAGES/gwenview.mo
-share/locale/fo/
-share/locale/fo/LC_MESSAGES/
 share/locale/fo/LC_MESSAGES/gwenview.mo
 share/locale/fr/LC_MESSAGES/gwenview.mo
 share/locale/gl/LC_MESSAGES/gwenview.mo
@ -163,12 +159,8 @@ share/locale/ko/LC_MESSAGES/gwenview.mo
 share/locale/lt/LC_MESSAGES/gwenview.mo
 share/locale/ms/LC_MESSAGES/gwenview.mo
 share/locale/nb/LC_MESSAGES/gwenview.mo
-share/locale/nds/
-share/locale/nds/LC_MESSAGES/
 share/locale/nds/LC_MESSAGES/gwenview.mo
 share/locale/nl/LC_MESSAGES/gwenview.mo
-share/locale/nso/
-share/locale/nso/LC_MESSAGES/
 share/locale/nso/LC_MESSAGES/gwenview.mo
 share/locale/pa/LC_MESSAGES/gwenview.mo
 share/locale/pl/LC_MESSAGES/gwenview.mo
@ -179,6 +171,8 @@ share/locale/ru/LC_MESSAGES/gwenview.mo
 share/locale/rw/LC_MESSAGES/gwenview.mo
 share/locale/sk/LC_MESSAGES/gwenview.mo
 share/locale/sr/LC_MESSAGES/gwenview.mo
+share/locale/sr@Latn/
+share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/gwenview.mo
 share/locale/sv/LC_MESSAGES/gwenview.mo
 share/locale/ta/LC_MESSAGES/gwenview.mo
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.53 2013/03/11 11:10:53 espie Exp $
+# $OpenBSD: Makefile,v 1.54 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	image viewer for KDE

 DISTNAME=	gwenview-1.4.2
-REVISION =	10
+REVISION =	11
 SHARED_LIBS +=	gwenviewcore         5.0      # .1.0
 CATEGORIES=	graphics x11 x11/kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
@ -14,14 +14,18 @@ HOMEPAGE=	http://gwenview.sourceforge.net/
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB=	ICE SM X11 Xcursor Xext Xfixes Xrender \
-		art_lgpl_2 c expat idn jpeg m mng png pthread \
-		stdc++ util xcb z kdecore>=6 DCOP kdefx \
-		kdeprint kdesu kparts kdeui kio kmediaplayer kutils \
-		kwalletclient kipi exiv2
-WANTLIB += GL Xdamage Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm drm
-WANTLIB += fontconfig freetype lcms
-RUN_DEPENDS=	devel/desktop-file-utils
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm expat exiv2
+WANTLIB += fam fontconfig freetype idn jpeg lcms m mng png pthread
+WANTLIB += stdc++ util xcb z
+WANTLIB += ${KDE}/kdecore>=6 ${KDE}/DCOP ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kparts ${KDE}/kdeui ${KDE}/kio
+WANTLIB += ${KDE}/kmediaplayer ${KDE}/kutils ${KDE}/kwalletclient
+WANTLIB += ${KDE}/kipi
+
+RUN_DEPENDS=	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
 LIB_DEPENDS=	x11/kde/libs3 \
 		graphics/libkipi \
 		graphics/exiv2
--- a/graphics/gwenview/pkg/PLIST
+++ b/graphics/gwenview/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.21 2009/12/22 16:06:41 ajacoutot Exp $
-bin/gwenview
+@comment $OpenBSD: PLIST,v 1.22 2013/06/24 15:53:38 zhuk Exp $
+@bin bin/gwenview
 ${KDE}/gwenview.la
 ${KDE}/gwenview.so
 ${KDE}/libgvdirpart.la
@ -123,3 +123,7 @@ share/services/gvdirpart.desktop
 share/services/gvimagepart.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/crystalsvg
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/crystalsvg
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/graphics/kimdaba/Makefile
+++ b/graphics/kimdaba/Makefile
@ -1,24 +1,27 @@
-# $OpenBSD: Makefile,v 1.25 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=		kde image database
 CATEGORIES=		graphics x11 x11/kde
 DISTNAME=		kphotoalbum-3.0
-REVISION =		8
+REVISION =		9
 EXTRACT_SUFX=		.tar.bz2
 HOMEPAGE=		http://www.kphotoalbum.org/
 MASTER_SITES=		${HOMEPAGE}data/download/

-WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2 c expat idn \
-		jpeg m png pthread stdc++ util xcb z \
-		kdecore>=6 DCOP kdefx kdesu kdeui kio kmediaplayer kparts \
-		kwalletclient kipi exiv2 Xfixes Xt fontconfig freetype
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c exiv2 expat
+WANTLIB += fam fontconfig freetype idn jpeg m png pthread stdc++ util
+WANTLIB += xcb z 
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kipi ${KDE}/kmediaplayer
+WANTLIB += ${KDE}/kparts ${KDE}/kwalletclient

 LIB_DEPENDS=	x11/kde/libs3 \
 		graphics/libkipi \
 		graphics/exiv2

 RUN_DEPENDS=	databases/qt3-sqlite3-plugin \
-		devel/desktop-file-utils
+		devel/desktop-file-utils \
+		x11/gtk+2,-guic

 SHARED_ONLY=Yes
 MODKDE_VERSION=	3.5.3
--- a/graphics/kimdaba/pkg/PLIST
+++ b/graphics/kimdaba/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/12/22 16:06:41 ajacoutot Exp $
-bin/kphotoalbum
+@comment $OpenBSD: PLIST,v 1.7 2013/06/24 15:53:38 zhuk Exp $
+@bin bin/kphotoalbum
 share/applications/kde/kphotoalbum-import.desktop
 share/applications/kde/kphotoalbum.desktop
 share/apps/kphotoalbum/
@ -378,3 +378,5 @@ share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
 share/mimelnk/application/x-vnd.kde.kphotoalbum-import.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2013/06/24 15:53:38 zhuk Exp $

 COMMENT-main =		kde image plugins
 COMMENT-cal =		kde image calendar plugin
@ -6,8 +6,8 @@ CATEGORIES =		graphics x11 x11/kde
 DISTNAME =		kipi-plugins-0.1.6
 PKGNAME-main =		${DISTNAME}
 PKGNAME-cal =		kipi-kcal-plugin-0.1.6
-REVISION-main =		3
-REVISION-cal =		2
+REVISION-main =		4
+REVISION-cal =		3
 HOMEPAGE =		http://extragear.kde.org/apps/kipi/
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX =		.tar.bz2
@ -36,20 +36,22 @@ RUN_DEPENDS =	graphics/ImageMagick
 MODULES =	devel/gettext \
 		x11/kde

-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 \
-		idn jpeg m png stdc++ \
-		util xcb z kdecore>=6 DCOP kdefx kdeprint kdesu kdeui kio \
-		kparts kwalletclient kipi lib/qt3/qt-mt>=3.33 \
-		Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu GL \
-		mng freetype fontconfig drm Xt Xxf86vm \
-		Xrandr expat lcms
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm expat
+WANTLIB += fontconfig freetype idn jpeg lcms m mng png stdc++ util xcb
+WANTLIB += z 
+WANTLIB += lib/qt3/qt-mt>=3.33
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio ${KDE}/kipi ${KDE}/kparts
+WANTLIB += ${KDE}/kwalletclient

-WANTLIB-main =	${WANTLIB} ltdl \
-		pcre pcreposix tiff exif \
-		exslt xslt xml2 gpg-error gcrypt exiv2 \
-		khtml kjs kutils gphoto2 gphoto2_port kexiv2 kdcraw
+WANTLIB-main =  ${WANTLIB} exif exiv2 exslt gcrypt gpg-error gphoto2
+WANTLIB-main += gphoto2_port ltdl pcre pcreposix tiff xml2 xslt 
+WANTLIB-main += ${KDE}/kdcraw ${KDE}/kexiv2 ${KDE}/khtml ${KDE}/kjs
+WANTLIB-main += ${KDE}/kutils

-WANTLIB-cal =	${WANTLIB} kabc kresources vcard kcal kmime ktnef kipiplugins
+WANTLIB-cal =  ${WANTLIB} ${KDE}/kabc ${KDE}/kcal ${KDE}/kipiplugins
+WANTLIB-cal += ${KDE}/kmime ${KDE}/kresources ${KDE}/ktnef ${KDE}/vcard

 USE_GROFF =		Yes
 LIBTOOL_FLAGS =		--tag=disable-static
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2013/03/11 11:10:53 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =	grab raw data from digital cameras

 DISTNAME =	libkdcraw-0.1.9
-REVISION =	3
+REVISION =	4
 CATEGORIES =	graphics devel

 HOMEPAGE =	http://www.kipi-plugins.org/drupal/
@ -28,14 +28,15 @@ USE_GMAKE =		Yes

 LIB_DEPENDS +=		graphics/lcms \
 			x11/kde/libs3
-RUN_DEPENDS =		graphics/dcraw
+RUN_DEPENDS =		graphics/dcraw \
+			x11/gtk+2,-guic

-WANTLIB += ICE SM X11 Xext Xrender jpeg m png
-WANTLIB += util z art_lgpl_2 idn
-WANTLIB += stdc++ xcb lcms
-WANTLIB += DCOP kdecore kdefx kdesu kdeui kio kwalletclient
-WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm expat fontconfig freetype mng
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm expat
+WANTLIB += fontconfig freetype idn jpeg lcms m mng png stdc++ util xcb
+WANTLIB += z 
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 # GPL
 PERMIT_PACKAGE_CDROM = Yes
--- a/graphics/libkdcraw/pkg/PLIST
+++ b/graphics/libkdcraw/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2013/01/23 21:28:55 zhuk Exp $
+@comment $OpenBSD: PLIST,v 1.6 2013/06/24 15:53:38 zhuk Exp $
 include/kde/libkdcraw/
 include/kde/libkdcraw/dcrawinfocontainer.h
 include/kde/libkdcraw/dcrawsettingswidget.h
@ -41,3 +41,5 @@ share/locale/sr@Latn/LC_MESSAGES/libkdcraw.mo
 share/locale/sv/LC_MESSAGES/libkdcraw.mo
 share/locale/th/LC_MESSAGES/libkdcraw.mo
 share/locale/uk/LC_MESSAGES/libkdcraw.mo
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =		kde interface to exif
 CATEGORIES =		graphics devel x11 x11/kde
 DISTNAME =		libkexif-0.2.5
-REVISION =		4
+REVISION =		5
 SHARED_LIBS =		kexif	2.2
 EXTRACT_SUFX =		.tar.bz2
 HOMEPAGE =		http://extragear.kde.org/apps/kipi/
@ -11,15 +11,15 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=kipi/}

 SHARED_ONLY =	Yes

-LIB_DEPENDS +=	x11/kde/libs3 \
+LIB_DEPENDS =	x11/kde/libs3 \
 		graphics/libexif

-WANTLIB =	ICE Xrender SM Xext X11 util m z \
-		jpeg png art_lgpl_2 idn \
-		xcb lib/qt3/qt-mt>=3.33 \
-		kdecore>=6 DCOP kdeui kdefx exif
-WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mng stdc++
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm exif expat
+WANTLIB += fontconfig freetype idn jpeg lcms m mng png stdc++ util
+WANTLIB += xcb z 
+WANTLIB += lib/qt3/qt-mt>=3.33
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdeui ${KDE}/kdefx

 MODULES =	devel/gettext \
 		x11/kde
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2013/03/11 11:10:53 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =	kde wrapper around exiv2
 CATEGORIES =	graphics
 DISTNAME =	libkexiv2-0.1.9
-REVISION =	3
+REVISION =	4
 HOMEPAGE =	http://www.kipi-plugins.org/
 EXTRACT_SUFX =	.tar.bz2

@ -25,10 +25,11 @@ MODULES =		devel/gettext \
 # GPL
 PERMIT_PACKAGE_CDROM =	Yes

-WANTLIB += DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2
-WANTLIB += drm exiv2 expat fontconfig freetype idn jpeg kdecore
-WANTLIB += kdefx lcms m mng png stdc++ util xcb z
+WANTLIB += drm exiv2 expat fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx

 LIB_DEPENDS =	graphics/exiv2>=0.22 \
 		x11/kde/libs3
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@ -1,24 +1,26 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =		kde image plugins api
 CATEGORIES =		graphics devel x11 x11/kde
 V =			0.1.6
 DISTNAME =		libkipi-$V
-REVISION =		4
+REVISION =		5
 SHARED_LIBS +=	kipi                 1.4      # .2.0
 EXTRACT_SUFX =		.tar.bz2
 HOMEPAGE =		http://extragear.kde.org/apps/kipi/
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=kipi/}

 SHARED_ONLY =		Yes
-LIB_DEPENDS +=		x11/kde/libs3

-WANTLIB =		ICE Xrender SM Xext X11 util m z \
-			jpeg png art_lgpl_2 idn \
-			stdc++ xcb lib/qt3/qt-mt>=3.33 \
-			kdecore>=6 kwalletclient DCOP kio kdeui kdefx kdesu
-WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mng
+RUN_DEPENDS =		x11/gtk+2,-guic
+LIB_DEPENDS =		x11/kde/libs3
+
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm expat
+WANTLIB += fontconfig freetype idn jpeg lcms lib/qt3/qt-mt>=3.33 m mng
+WANTLIB += png stdc++ util xcb z 
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MODULES =	x11/kde devel/gettext

--- a/graphics/libkipi/pkg/PLIST
+++ b/graphics/libkipi/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2013/01/23 21:30:18 zhuk Exp $
+@comment $OpenBSD: PLIST,v 1.8 2013/06/24 15:53:38 zhuk Exp $
 include/kde/libkipi/
 include/kde/libkipi/batchprogressdialog.h
 include/kde/libkipi/imagecollection.h
@ -75,3 +75,5 @@ share/locale/tr/LC_MESSAGES/libkipi.mo
 share/locale/uk/LC_MESSAGES/libkipi.mo
 share/locale/zh_CN/LC_MESSAGES/libkipi.mo
 share/servicetypes/kipiplugin.desktop
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/inputmethods/uim/Makefile
+++ b/inputmethods/uim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2013/03/21 08:46:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2013/06/24 15:53:38 zhuk Exp $

 COMMENT-main=	multilingual input method library
 COMMENT-gtk=	uim for GTK
@ -20,7 +20,7 @@ PKGNAME-kde=	uim-kde-$V
 REVISION-main=	8
 REVISION-gtk=	10
 REVISION-qt=	5
-REVISION-kde=	5
+REVISION-kde=	6

 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@ -78,7 +78,8 @@ LIB_DEPENDS-kde	=	inputmethods/uim \
 			${MODLIBICONV_LIB_DEPENDS} \
 			${MODGETTEXT_LIB_DEPENDS} \
 			x11/kde/libs3
-WANTLIB-kde =	${Wqt} idn util art_lgpl_2 kdecore>=7 DCOP kdefx kdeui \
+WANTLIB-kde =	${Wqt} idn util art_lgpl_2 lib/kde3/DCOP \
+		lib/kde3/kdecore>=7 lib/kde3/kdefx lib/kde3/kdeui


 LIB_DEPENDS-gtk =	${LIB_DEPENDS-main} ${uim_LIB_DEPENDS} \
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2013/03/21 08:46:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=		new mail notification utility for KDE

 DISTNAME=		kbiff-3.8
-REVISION =		5
+REVISION =		6
 SHARED_LIBS=		kbiff 2.0
 CATEGORIES=		mail
 EXTRACT_SUFX=		.tar.bz2
@ -15,13 +15,15 @@ MAINTAINER=		Stephan Tesch <stephan@tesch.cx>
 # GPL
 PERMIT_PACKAGE_CDROM=  	Yes

-WANTLIB =		DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2
-WANTLIB +=		c expat fam fontconfig freetype idn kdecore>=4 kdefx kdesu
-WANTLIB +=		kdeui kio kwalletclient>=1 m png pthread pthread-stubs
-WANTLIB +=		stdc++ util xcb z
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2
+WANTLIB += c expat fam fontconfig freetype idn m png pthread
+WANTLIB += pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient>=1

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kbiff/}

+RUN_DEPENDS=		x11/gtk+2,-guic
 LIB_DEPENDS=		x11/kde/libs3

 MODULES=        	x11/kde devel/gettext
--- a/mail/kbiff/pkg/PFRAG.shared
+++ b/mail/kbiff/pkg/PFRAG.shared
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/09 22:40:03 alek Exp $
-@lib lib/libkbiff.so.${LIBkbiff_VERSION}
--- a/mail/kbiff/pkg/PLIST
+++ b/mail/kbiff/pkg/PLIST
@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.9 2006/01/09 22:40:03 alek Exp $
-bin/kbiff
+@comment $OpenBSD: PLIST,v 1.10 2013/06/24 15:53:38 zhuk Exp $
+@bin bin/kbiff
 lib/libkbiff.la
+@lib lib/libkbiff.so.${LIBkbiff_VERSION}
@man man/man1/kbiff.1
 share/applnk/
 share/applnk/Internet/
 share/applnk/Internet/kbiff.desktop
-share/apps/
 share/apps/kbiff/
 share/apps/kbiff/pics/
 share/apps/kbiff/pics/delete.png
@ -19,13 +19,11 @@ share/apps/kbiff/pics/noconn.png
 share/apps/kbiff/pics/nomail.png
 share/apps/kbiff/pics/oldmail.png
 share/apps/kbiff/pics/playsound.png
-share/doc/HTML/
 share/doc/HTML/de/
 share/doc/HTML/de/kbiff/
 share/doc/HTML/de/kbiff/common
 share/doc/HTML/de/kbiff/index.cache.bz2
 share/doc/HTML/de/kbiff/index.docbook
-share/doc/HTML/en/
 share/doc/HTML/en/kbiff/
 share/doc/HTML/en/kbiff/common
 share/doc/HTML/en/kbiff/index.cache.bz2
@ -41,16 +39,8 @@ share/doc/HTML/fr/kbiff/
 share/doc/HTML/fr/kbiff/common
 share/doc/HTML/fr/kbiff/index.cache.bz2
 share/doc/HTML/fr/kbiff/index.docbook
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/kbiff.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/kbiff.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/kbiff.png
 share/icons/locolor/
 share/icons/locolor/16x16/
@ -59,92 +49,40 @@ share/icons/locolor/16x16/apps/kbiff.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/kbiff.png
-share/locale/
-share/locale/br/
-share/locale/br/LC_MESSAGES/
 share/locale/br/LC_MESSAGES/kbiff.mo
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/kbiff.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/kbiff.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/kbiff.mo
-share/locale/el/
-share/locale/el/LC_MESSAGES/
 share/locale/el/LC_MESSAGES/kbiff.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/kbiff.mo
-share/locale/et/
-share/locale/et/LC_MESSAGES/
 share/locale/et/LC_MESSAGES/kbiff.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/kbiff.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/kbiff.mo
-share/locale/he/
-share/locale/he/LC_MESSAGES/
 share/locale/he/LC_MESSAGES/kbiff.mo
-share/locale/hr/
-share/locale/hr/LC_MESSAGES/
 share/locale/hr/LC_MESSAGES/kbiff.mo
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
 share/locale/hu/LC_MESSAGES/kbiff.mo
-share/locale/is/
-share/locale/is/LC_MESSAGES/
 share/locale/is/LC_MESSAGES/kbiff.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/kbiff.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/kbiff.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
 share/locale/nl/LC_MESSAGES/kbiff.mo
-share/locale/no/
-share/locale/no/LC_MESSAGES/
 share/locale/no/LC_MESSAGES/kbiff.mo
 share/locale/no_NY/
 share/locale/no_NY/LC_MESSAGES/
 share/locale/no_NY/LC_MESSAGES/kbiff.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/kbiff.mo
-share/locale/pt/
-share/locale/pt/LC_MESSAGES/
 share/locale/pt/LC_MESSAGES/kbiff.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/kbiff.mo
-share/locale/ro/
-share/locale/ro/LC_MESSAGES/
 share/locale/ro/LC_MESSAGES/kbiff.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/kbiff.mo
-share/locale/sk/
-share/locale/sk/LC_MESSAGES/
 share/locale/sk/LC_MESSAGES/kbiff.mo
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
 share/locale/sl/LC_MESSAGES/kbiff.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/kbiff.mo
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
 share/locale/tr/LC_MESSAGES/kbiff.mo
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/kbiff.mo
 share/locale/zh_TW.Big5/
 share/locale/zh_TW.Big5/LC_MESSAGES/
 share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
-%%SHARED%%
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/math/kst/Makefile
+++ b/math/kst/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/24 15:53:38 zhuk Exp $

 CATEGORIES=	math x11/kde
 COMMENT=	data viewing/plotting tool

 DISTNAME=	kst-1.2.1
-REVISION=	6
+REVISION=	7
 SHARED_ONLY=	Yes
 SHARED_LIBS=	kst		4.0 \
 		kstapp		4.0 \
@ -39,13 +39,14 @@ LIB_DEPENDS =	x11/kde/libs3 \
 		math/netcdf \
 		math/cfitsio

-WANTLIB =	c m util stdc++ pthread z X11 ICE Xrender SM Xext \
-		png jpeg art_lgpl_2 idn pcre pcreposix \
-		ncurses readline qui \
-		xcb kdecore>=6 kwalletclient DCOP \
-		kutils kparts kdeui kdesu kmdi kio kdefx kdeprint khtml kjs \
-		gsl>=7 gslcblas netcdf netcdf_c++ cfitsio \
-		GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr \
-		Xt Xxf86vm drm expat fontconfig freetype lcms mng
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c cfitsio drm
+WANTLIB += expat fontconfig freetype gsl>=7 gslcblas idn jpeg lcms m
+WANTLIB += mng ncurses netcdf netcdf_c++ pcre pcreposix png pthread
+WANTLIB += readline stdc++ util xcb z
+WANTLIB += lib/qt3/qui
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/khtml ${KDE}/kio ${KDE}/kjs
+WANTLIB += ${KDE}/kmdi ${KDE}/kparts ${KDE}/kutils ${KDE}/kwalletclient

 .include <bsd.port.mk>
--- a/misc/ktimeclock/Makefile
+++ b/misc/ktimeclock/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2013/06/04 18:41:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	task-based timeclock for KDE

 VERSION=	2.0.2
 DISTNAME=	ktimeclock-${VERSION}
-REVISION=	4
+REVISION=	5
 CATEGORIES=	misc x11

 HOMEPAGE=	http://www.howlingfrog.com/opensource/ktimeclock/
@ -14,31 +14,24 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB=	art_lgpl_2 kwalletclient ICE SM X11 Xext \
-		Xrender c m png pthread stdc++ util z idn fam \
-		xcb kdecore DCOP kdefx kdesu kdeui kio \
-		Xfixes Xt expat fontconfig freetype
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat fam
+WANTLIB += fontconfig freetype idn m png pthread stdc++ util xcb z 
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MASTER_SITES=	${HOMEPAGE}/downloads/v${VERSION}/tarball/

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

-MODULES=	x11/qt3 devel/gettext
+MODULES=	x11/kde devel/gettext

 PORTHOME=	${WRKDIR}

-MAKE_ENV=	KDEDIR="${LOCALBASE}"
-# Ensure qt3 will always be at the front
-MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
-
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
-CONFIGURE_ARGS+= --disable-debug --enable-final
-CONFIGURE_ARGS+= --with-extra-libs="${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ARGS+= --with-xinerama
-CONFIGURE_ENV=	KDEDIR="${LOCALBASE}"
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin
+CONFIGURE_ARGS=	${MODKDE_CONFIGURE_ARGS} --with-xinerama
+CONFIGURE_ENV=	${MODKDE_CONFIGURE_ENV}
+MAKE_ENV=	${CONFIGURE_ENV}

 .include <bsd.port.mk>
--- a/misc/ktimeclock/pkg/PLIST
+++ b/misc/ktimeclock/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:16 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2013/06/24 15:53:38 zhuk Exp $
 bin/ktimeclock
 share/applnk/
 share/applnk/Utilities/
@ -26,16 +26,8 @@ share/doc/HTML/en/ktimeclock/configure-reports.png
 share/doc/HTML/en/ktimeclock/index.cache.bz2
 share/doc/HTML/en/ktimeclock/index.docbook
 share/doc/HTML/en/ktimeclock/window.png
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
 share/icons/hicolor/22x22/apps/ktimeclock.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/ktimeclock.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/ktimeclock.png
 share/icons/locolor/
 share/icons/locolor/16x16/
@ -44,3 +36,7 @@ share/icons/locolor/16x16/apps/ktimeclock.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/ktimeclock.png
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/multimedia/k3b/Makefile
+++ b/multimedia/k3b/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2013/06/14 08:15:28 jca Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/24 15:53:38 zhuk Exp $

 SHARED_ONLY =		Yes

 COMMENT =		CD/DVD creator

 DISTNAME =		k3b-1.0.4
-REVISION=		17
+REVISION=		18
 CATEGORIES =		multimedia

 SHARED_LIBS =		k3b	0.0	# 3.0
@ -16,13 +16,16 @@ HOMEPAGE =		http://k3b.plainblack.com/
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes

-WANTLIB += DCOP FLAC FLAC++ ICE SM X11 Xext Xfixes Xrender Xt
-WANTLIB += art_lgpl_2 artsc avcodec avformat avutil bz2 c crypto
-WANTLIB += dvdread expat fam fontconfig freetype gsm idn jpeg kdecore
-WANTLIB += kdefx kdesu kdeui kio kparts kwalletclient m mad mp3lame
+WANTLIB =  FLAC FLAC++ ICE SM X11 Xext Xfixes Xrender Xt
+WANTLIB += art_lgpl_2 avcodec avformat avutil bz2 c crypto
+WANTLIB += dvdread expat fam fontconfig freetype gsm idn jpeg
+WANTLIB += m mad mp3lame
 WANTLIB += mpcdec ogg orc-0.4 png pthread samplerate schroedinger-1.0
 WANTLIB += sndfile speex ssl stdc++ tag theoradec theoraenc util vorbis
 WANTLIB += vorbisenc vorbisfile vpx x264 xcb xvidcore z
+WANTLIB += ${KDE}/DCOP ${KDE}/artsc ${KDE}/kdecore ${KDE}/kdefx
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts
+WANTLIB += ${KDE}/kwalletclient

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX =		.tar.bz2
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2013/04/29 06:51:59 brad Exp $
+# $OpenBSD: Makefile,v 1.33 2013/06/24 15:53:38 zhuk Exp $

 COMMENT=	video player for KDE

 VERSION=	0.8.8
 DISTNAME=	kaffeine-${VERSION}
-REVISION=	10
+REVISION=	11
 CATEGORIES=	multimedia x11 x11/kde
 MASTER_SITES=	http://hftom.free.fr/ \
 		${MASTER_SITE_SOURCEFORGE:=kaffeine/}
@ -17,12 +17,14 @@ HOMEPAGE=	http://kaffeine.sourceforge.net/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB += DCOP ICE SM X11 Xau Xdmcp Xext Xfixes Xi Xinerama Xrender
+WANTLIB =  ICE SM X11 Xau Xdmcp Xext Xfixes Xi Xinerama Xrender
 WANTLIB += Xt Xtst art_lgpl_2 avutil c cdio cdio_cdda cdio_paranoia
-WANTLIB += expat fam fontconfig freetype idn kdecore kdefx kdeprint
-WANTLIB += kdesu kdeui khtml kio kjs kparts kutils kwalletclient
+WANTLIB += expat fam fontconfig freetype idn
 WANTLIB += m ogg pcre pcreposix pthread pthread-stubs stdc++ util
 WANTLIB += vorbis vorbisenc xcb xine z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/khtml ${KDE}/kio ${KDE}/kjs
+WANTLIB += ${KDE}/kparts ${KDE}/kutils ${KDE}/kwalletclient

 RUN_DEPENDS=	devel/desktop-file-utils \
 		x11/gtk+2,-guic
--- a/multimedia/kguitar/Makefile
+++ b/multimedia/kguitar/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2013/06/04 18:41:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2013/06/24 15:53:38 zhuk Exp $

 COMMENT =		guitar tab editor

 DISTNAME =		kguitar-0.5.1
-REVISION=		3
+REVISION=		4

 CATEGORIES =		multimedia kde

@ -14,10 +14,12 @@ MAINTAINER =		Pascal Stumpf <Pascal.Stumpf@cubes.de>
 # GPLv2+; for MusicXML copyright see licenseMusicXML.html
 PERMIT_PACKAGE_CDROM =	Yes

-WANTLIB += DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c
-WANTLIB += expat fontconfig freetype idn jpeg kdecore kdefx kdeprint
-WANTLIB += kdesu kdeui kio kparts kwalletclient m png pthread
-WANTLIB += stdc++ util xcb z
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
+WANTLIB += fontconfig freetype idn jpeg m png pthread stdc++ util
+WANTLIB += xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts
+WANTLIB += ${KDE}/kwalletclient

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=kguitar/}
 EXTRACT_SUFX =		.tar.bz2
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/03/21 08:46:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2013/06/24 15:53:39 zhuk Exp $

 SHARED_ONLY=	Yes

@ -6,7 +6,7 @@ COMMENT=	BitTorrent client for KDE

 VERSION=	2.2.8
 DISTNAME=	ktorrent-${VERSION}
-REVISION=	7
+REVISION=	8
 CATEGORIES=	net x11 x11/kde
 EXTRACT_SUFX=	.tar.bz2

@ -18,14 +18,19 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>

 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=	art_lgpl_2 jpeg GL ICE SM X11 Xau Xcursor Xdmcp Xext \
-		Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt c dbus-1 \
-		expat fontconfig freetype lcms m mng pcre pcreposix \
-		png pthread pthread-stubs stdc++ util xcb z idn fam rpcsvc \
-		kdecore>=6 DCOP kdefx kdeprint kdesu kparts kdeui khtml \
-		kio kjs kutils kwalletclient gmp>=4 avahi-client \
-		avahi-common avahi-qt3
-RUN_DEPENDS=	devel/desktop-file-utils
+
+WANTLIB =  GL ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt art_lgpl_2 avahi-client avahi-common
+WANTLIB += avahi-qt3 c dbus-1 expat fam fontconfig freetype gmp>=4 idn
+WANTLIB += jpeg lcms m mng pcre pcreposix png pthread pthread-stubs
+WANTLIB += rpcsvc stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/khtml ${KDE}/kio
+WANTLIB += ${KDE}/kjs ${KDE}/kparts ${KDE}/kutils ${KDE}/kwalletclient
+
+RUN_DEPENDS=	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
 LIB_DEPENDS=	x11/kde/libs3 \
 		devel/gmp \
 		net/avahi,-qt3,no_gui,no_mono,no_qt4
--- a/net/ktorrent/pkg/PLIST
+++ b/net/ktorrent/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/12/22 00:31:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.9 2013/06/24 15:53:39 zhuk Exp $
@bin bin/ktcachecheck
@bin bin/ktorrent
 bin/ktshell
@ -466,3 +466,5 @@ share/services/ktzeroconfplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/productivity/taskjuggler/Makefile
+++ b/productivity/taskjuggler/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/21 08:48:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	project management tool

 DISTNAME=	taskjuggler-2.4.1
-REVISION=	6
+REVISION=	7

 CATEGORIES=	productivity

@ -14,13 +14,13 @@ HOMEPAGE=	http://www.taskjuggler.org/
 # GPLv2 only
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB += DCOP ICE SM X11 Xext Xrender art_lgpl_2 c
-WANTLIB += idn jpeg kabc kdecore kdefx kdeprint
-WANTLIB += kdesu kdeui khtml kio kjs kparts kresources ktexteditor
-WANTLIB += kutils kwalletclient m pcre pcreposix png pthread
-WANTLIB += stdc++ util vcard xcb z kcal kmime ktnef
-WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr
-WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mng
+WANTLIB =  ICE SM X11 Xext Xrender Xfixes Xt art_lgpl_2 c expat fam
+WANTLIB += fontconfig freetype idn m png pthread stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kabc ${KDE}/kcal ${KDE}/kdecore
+WANTLIB += ${KDE}/kdefx ${KDE}/kdeprint ${KDE}/kdesu ${KDE}/kdeui
+WANTLIB += ${KDE}/khtml ${KDE}/kio ${KDE}/kmime ${KDE}/ktnef
+WANTLIB += ${KDE}/kresources ${KDE}/ktexteditor ${KDE}/kwalletclient
+WANTLIB += ${KDE}/vcard

 MASTER_SITES=	${HOMEPAGE}/download/
 EXTRACT_SUFX=	.tar.bz2
@ -38,8 +38,10 @@ CONFIGURE_ARGS+=${MODKDE_CONFIGURE_ARGS} \
 CONFIGURE_ENV=	${MODKDE_CONFIGURE_ENV} \
 		ac_cv_prog_DOCBOOK_TO_MAN=no

+RUN_DEPENDS=	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
 LIB_DEPENDS=	x11/kde/pim3
-RUN_DEPENDS=	devel/desktop-file-utils

 # XXX tries building the documentation from XML, which fails
 NO_TEST=	Yes
--- a/productivity/taskjuggler/pkg/PLIST
+++ b/productivity/taskjuggler/pkg/PLIST
@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.5 2012/09/02 13:49:51 ajacoutot Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.6 2013/06/24 15:53:39 zhuk Exp $
@bin bin/TaskJugglerUI
@bin bin/taskjuggler
 lib/libtaskjuggler.a
 lib/libtaskjuggler.la
+@lib lib/libtaskjuggler.so.${LIBtaskjuggler_VERSION}
 share/applications/kde/taskjuggler.desktop
 share/apps/katepart/syntax/taskjuggler.xml
 share/apps/taskjuggler/
@ -112,3 +112,7 @@ share/mimelnk/application/x-tjp.desktop
 share/mimelnk/application/x-tjx.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/crystalsvg
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/crystalsvg
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2013/03/21 08:48:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2013/06/24 15:53:39 zhuk Exp $

 SHARED_ONLY=	Yes

 COMMENT=	concentric segmented-rings disk usage visualisation

 DISTNAME=	filelight-1.0
-REVISION =	7
+REVISION =	8
 CATEGORIES=	sysutils x11/kde

 EXTRACT_SUFX=	.tar.bz2
@ -17,16 +17,19 @@ PERMIT_PACKAGE_CDROM=	Yes

 MASTER_SITES=	http://www.methylblue.com/filelight/packages/

-WANTLIB +=	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi
-WANTLIB +=	Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore>=7 kdefx
-WANTLIB +=	kdesu kdeui kio kparts kwalletclient lcms m mng png
-WANTLIB +=	pthread pthread-stubs stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi
+WANTLIB += Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += pthread pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=7 ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts ${KDE}/kwalletclient

 MODULES=	x11/kde \
 		devel/gettext

-RUN_DEPENDS=	devel/desktop-file-utils
+RUN_DEPENDS=	devel/desktop-file-utils \
+		x11/gtk+2,-guic
+
 LIB_DEPENDS=	x11/kde/libs3

 PORTHOME=	${WRKDIR}
--- a/sysutils/filelight/pkg/PLIST
+++ b/sysutils/filelight/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/12/22 12:51:52 sthen Exp $
-bin/filelight
+@comment $OpenBSD: PLIST,v 1.4 2013/06/24 15:53:39 zhuk Exp $
+@bin bin/filelight
 ${KDE}/libfilelight.la
 ${KDE}/libfilelight.so
 share/applications/kde/filelight.desktop
@ -16,3 +16,5 @@ share/icons/hicolor/64x64/apps/filelight.png
 share/services/filelight_part.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/21 08:48:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=		KDE UPS monitoring tool

 RELEASE=		0.6.0
 DISTNAME=		knutclient-${RELEASE}
-REVISION =		5
+REVISION =		6
 CATEGORIES=		sysutils x11 x11/kde

 HOMEPAGE=		http://www.alo.cz/knutclient-pop-en.html
@ -14,11 +14,11 @@ MAINTAINER=		Craig Barraclough <craigba@creative.com.au>
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB =		DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes
-WANTLIB +=		Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2
-WANTLIB +=		c drm expat fontconfig freetype idn jpeg kdecore kdefx
-WANTLIB +=		kdeui lcms m mng png pthread pthread-stubs stdc++ util
-WANTLIB +=		xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm expat
+WANTLIB += fontconfig freetype idn jpeg lcms m mng png pthread
+WANTLIB += pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeui

 MASTER_SITES=		ftp://ftp.buzuluk.cz/pub/alo/knutclient/

@ -26,6 +26,7 @@ MASTER_SITES=		ftp://ftp.buzuluk.cz/pub/alo/knutclient/
 MODULES=		x11/kde \
 			devel/gettext

+RUN_DEPENDS=		x11/gtk+2,-guic
 LIB_DEPENDS=		x11/kde/libs3 \
 			graphics/libart

--- a/sysutils/knutclient/pkg/PLIST
+++ b/sysutils/knutclient/pkg/PLIST
@ -1,12 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:39:32 espie Exp $
-bin/knutclient
+@comment $OpenBSD: PLIST,v 1.4 2013/06/24 15:53:39 zhuk Exp $
+@bin bin/knutclient
 share/applnk/
 share/applnk/Applications/
 share/applnk/Applications/knutclient.desktop
-share/apps/
 share/apps/knutclient/
 share/apps/knutclient/knutclientui.rc
-share/doc/HTML/
 share/doc/HTML/cs/
 share/doc/HTML/cs/knutclient/
 share/doc/HTML/cs/knutclient/asetting-cs.png
@ -19,7 +17,6 @@ share/doc/HTML/cs/knutclient/msetting-cs.png
 share/doc/HTML/cs/knutclient/new-cs.png
 share/doc/HTML/cs/knutclient/psetting-cs.png
 share/doc/HTML/cs/knutclient/usetting-cs.png
-share/doc/HTML/en/
 share/doc/HTML/en/knutclient/
 share/doc/HTML/en/knutclient/asetting-en.png
 share/doc/HTML/en/knutclient/common
@ -31,16 +28,8 @@ share/doc/HTML/en/knutclient/msetting-en.png
 share/doc/HTML/en/knutclient/new-en.png
 share/doc/HTML/en/knutclient/psetting-en.png
 share/doc/HTML/en/knutclient/usetting-en.png
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/knutclient.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/knutclient.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/knutclient.png
 share/icons/locolor/
 share/icons/locolor/16x16/
@ -49,16 +38,11 @@ share/icons/locolor/16x16/apps/knutclient.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/knutclient.png
-share/locale/
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/knutclient.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/knutclient.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/knutclient.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/knutclient.mo
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2013/03/21 08:48:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/06/24 15:53:39 zhuk Exp $

 SHARED_ONLY =	Yes

 COMMENT =	powerful KDE batch file renamer

 DISTNAME =	krename-3.0.14
-REVISION =	8
+REVISION =	9

 SRCFILES =	${DISTNAME}.tar.bz2
 DOCFILES =	krename-3.0.12.pdf \
@ -24,12 +24,12 @@ MAINTAINER =	Vadim Zhukov <persgray@gmail.com>
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes

-WANTLIB +=	GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm
-WANTLIB +=	drm expat fontconfig freetype lcms mng ICE SM X11 Xau Xdmcp Xext
-WANTLIB +=	Xrender c jpeg m png pthread pthread-stubs stdc++ util xcb z
-WANTLIB +=	art_lgpl_2>=5 idn>=16.30 DCOP>=7 kdecore kdefx kdesu kdeui kio
-WANTLIB +=	kparts kwalletclient
-
+WANTLIB =  GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm
+WANTLIB += drm expat fam fontconfig freetype lcms mng ICE SM X11 Xext
+WANTLIB += Xrender c jpeg m png pthread stdc++ util xcb z
+WANTLIB += art_lgpl_2>=5 idn>=16.30
+WANTLIB += ${KDE}/DCOP>=7 ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts ${KDE}/kwalletclient

 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=krename/}

--- a/sysutils/krename/pkg/PLIST
+++ b/sysutils/krename/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2012/06/15 08:32:17 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2013/06/24 15:53:39 zhuk Exp $
@bin bin/krename
 share/applications/kde/krename.desktop
 share/apps/konqueror/servicemenus/krename_dir.desktop
@ -45,5 +45,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/
 share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
--- a/x11/kdirstat/Makefile
+++ b/x11/kdirstat/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	graphical disk usage utility for KDE

 DISTNAME=	kdirstat-2.4.0
-REVISION=	6
+REVISION=	7

 CATEGORIES=	x11

@ -14,15 +14,17 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB +=	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
-WANTLIB +=	Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore kdefx kdesu
-WANTLIB +=	kdeui kio kwalletclient lcms m mng png pthread pthread-stubs
-WANTLIB +=	stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += pthread pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MASTER_SITES=	${HOMEPAGE}/download/
 EXTRACT_SUFX=	.tar.bz2

+RUN_DEPENDS=	x11/gtk+2,-guic
 LIB_DEPENDS=	x11/kde/libs3

 MODULES=	devel/gettext \
--- a/x11/kdirstat/pkg/PLIST
+++ b/x11/kdirstat/pkg/PLIST
@ -1,9 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:26:29 espie Exp $
-bin/kdirstat
+@comment $OpenBSD: PLIST,v 1.7 2013/06/24 15:53:39 zhuk Exp $
+@bin bin/kdirstat
 share/applnk/
 share/applnk/Utilities/
 share/applnk/Utilities/kdirstat.desktop
-share/apps/
 share/apps/kdirstat/
 share/apps/kdirstat/icons/
 share/apps/kdirstat/icons/hicolor/
@ -21,8 +20,6 @@ share/apps/kdirstat/icons/locolor/16x16/
 share/apps/kdirstat/icons/locolor/16x16/actions/
 share/apps/kdirstat/icons/locolor/16x16/actions/symlink.png
 share/apps/kdirstat/kdirstatui.rc
-share/doc/HTML/
-share/doc/HTML/en/
 share/doc/HTML/en/kdirstat/
 share/doc/HTML/en/kdirstat/common
 share/doc/HTML/en/kdirstat/feedback-mail.png
@ -31,13 +28,7 @@ share/doc/HTML/en/kdirstat/index.docbook
 share/doc/HTML/en/kdirstat/kdirstat-config-cleanups.png
 share/doc/HTML/en/kdirstat/kdirstat-config-tree-colors.png
 share/doc/HTML/en/kdirstat/kdirstat-main.png
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/kdirstat.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/kdirstat.png
 share/icons/locolor/
 share/icons/locolor/16x16/
@ -46,13 +37,10 @@ share/icons/locolor/16x16/apps/kdirstat.png
 share/icons/locolor/32x32/
 share/icons/locolor/32x32/apps/
 share/icons/locolor/32x32/apps/kdirstat.png
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/kdirstat.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/kdirstat.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/kdirstat.mo
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
--- a/x11/kmplayer/Makefile
+++ b/x11/kmplayer/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2013/03/21 08:33:52 landry Exp $
+# $OpenBSD: Makefile,v 1.16 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	front-end/embeddable KPart for MPlayer
 CATEGORIES=	x11 x11/kde
 DISTNAME=	kmplayer-0.6.4
 EXTRACT_SUFX=	.tar.bz2

-REVISION=	3
+REVISION=	4

 SHARED_LIBS=	kparts_kmplayer  0.0 \
 		kdeinit_kmplayer 0.0
@ -32,14 +32,16 @@ MAKE_FLAGS+=		${MODKDE_MAKE_FLAGS}

 # GPLv2+
 PERMIT_PACKAGE_CDROM=Yes
-WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2 artsflow artsflow_idl \
-		audiofile c \
-		kmedia2_idl kwalletclient m mad mcop ogg \
-		png pthread qtmcop soundserver_idl stdc++ util vorbis \
-		vorbisenc vorbisfile z kdecore DCOP kdefx kdesu kdeui kio \
-		kmediaplayer kparts artskde
-WANTLIB += Xfixes Xt expat fam fontconfig freetype glib-2.0 gmodule-2.0
-WANTLIB += gthread-2.0 idn pcre sndio xcb
+
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 audiofile c
+WANTLIB += expat fam fontconfig freetype glib-2.0 gmodule-2.0
+WANTLIB += gthread-2.0 idn m mad mcop ogg pcre png pthread sndio
+WANTLIB += stdc++ util vorbis vorbisenc vorbisfile xcb z 
+WANTLIB += ${KDE}/DCOP ${KDE}/artsflow ${KDE}/artsflow_idl
+WANTLIB += ${KDE}/artskde ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kmedia2_idl
+WANTLIB += ${KDE}/kmediaplayer ${KDE}/kparts ${KDE}/kwalletclient
+WANTLIB += ${KDE}/qtmcop ${KDE}/soundserver_idl

 LIB_DEPENDS=x11/kde/libs3

--- a/x11/kountdown/Makefile
+++ b/x11/kountdown/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	screen saver that displays a countdown to a selected date

 DISTNAME=	kountdown-0.4.1
-REVISION=	6
+REVISION=	7

 CATEGORIES=	x11

@ -14,11 +14,13 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB +=	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
-WANTLIB +=	Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore kdefx kdesu
-WANTLIB +=	kdeui kio kscreensaver kwalletclient lcms m mng png pthread
-WANTLIB +=	pthread-stubs stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png
+WANTLIB += pthread pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kscreensaver
+WANTLIB += ${KDE}/kwalletclient

 MASTER_SITES=	http://www.lysator.liu.se/~erre/download/kountdown/

--- a/x11/kountdown/pkg/PLIST
+++ b/x11/kountdown/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:30 espie Exp $
-bin/kountdown
+@comment $OpenBSD: PLIST,v 1.3 2013/06/24 15:53:39 zhuk Exp $
+@bin bin/kountdown
 share/applnk/
 share/applnk/System/
 share/applnk/System/ScreenSavers/
--- a/x11/krusader/Makefile
+++ b/x11/krusader/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2013/06/04 18:41:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/24 15:53:39 zhuk Exp $

 SHARED_ONLY=	Yes

 COMMENT=	twin panel file manager for KDE

 DISTNAME=	krusader-1.80.0
-REVISION=	8
+REVISION=	9

 CATEGORIES=	x11 x11/kde

@ -16,12 +16,14 @@ PERMIT_PACKAGE_CDROM=	Yes

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=krusader/}

-WANTLIB =	DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
-WANTLIB +=	Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
-WANTLIB +=	expat fam fontconfig freetype idn jpeg kdecore kdefx
-WANTLIB +=	kdeprint kdesu kdeui khtml kio kjs kjsembed konq kparts
-WANTLIB +=	kutils kwalletclient lcms m mng pcre pcreposix png pthread
-WANTLIB +=	pthread-stubs qui-mt stdc++ util xcb z
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
+WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
+WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng pcre
+WANTLIB += pcreposix png pthread pthread-stubs qui-mt stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
+WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/khtml ${KDE}/kio
+WANTLIB += ${KDE}/kjs ${KDE}/kjsembed ${KDE}/konq ${KDE}/kparts
+WANTLIB += ${KDE}/kutils ${KDE}/kwalletclient

 PORTHOME=	${WRKDIR}

--- a/x11/qinx/Makefile
+++ b/x11/qinx/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/21 08:48:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2013/06/24 15:53:39 zhuk Exp $

 SHARED_ONLY=	Yes

 COMMENT=	QNX Photon inspired theme for KDE

 DISTNAME=	qinx-1.4
-REVISION=	3
+REVISION=	4

 CATEGORIES=	x11 x11/kde
 MASTER_SITES=	http://www.usermode.org/code/
@ -16,9 +16,11 @@ HOMEPAGE=	http://www.usermode.org/code.html
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB =	DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 expat
-WANTLIB +=	fontconfig freetype idn kdecorations kdecore kdefx
-WANTLIB +=	kdeui m png pthread pthread-stubs stdc++ util xcb z
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 expat
+WANTLIB += fontconfig freetype idn m png pthread pthread-stubs stdc++
+WANTLIB += util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecorations ${KDE}/kdecore ${KDE}/kdefx
+WANTLIB += ${KDE}/kdeui

 LIB_DEPENDS=	graphics/libart \
 		x11/kde/libs3 \
--- a/x11/quadkonsole/Makefile
+++ b/x11/quadkonsole/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/21 08:48:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	terminal application that embeds Konsole for KDE

 DISTNAME=	quadkonsole-2.0
-REVISION=	8
+REVISION=	9
 CATEGORIES=	x11 x11/kde

 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
@ -11,10 +11,11 @@ MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB +=	DCOP ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c
-WANTLIB +=	expat fam fontconfig freetype idn kdecore kdefx kdesu kdeui
-WANTLIB +=	kio kparts kwalletclient m png pthread pthread-stubs
-WANTLIB +=	stdc++ util xcb z
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c
+WANTLIB += expat fam fontconfig freetype idn m png pthread
+WANTLIB += pthread-stubs stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts ${KDE}/kwalletclient

 MASTER_SITES=	http://nomis80.org/quadkonsole/

--- a/x11/quadkonsole/pkg/PLIST
+++ b/x11/quadkonsole/pkg/PLIST
@ -1,10 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/16 04:39:47 kevlo Exp $
-bin/quadkonsole
+@comment $OpenBSD: PLIST,v 1.2 2013/06/24 15:53:39 zhuk Exp $
+@bin bin/quadkonsole
 share/applnk/
 share/applnk/Utilities/
 share/applnk/Utilities/quadkonsole.desktop
-share/doc/HTML/
-share/doc/HTML/en/
 share/doc/HTML/en/quadkonsole/
 share/doc/HTML/en/quadkonsole/common
 share/doc/HTML/en/quadkonsole/index.cache.bz2
--- a/x11/tellico/Makefile
+++ b/x11/tellico/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/21 08:48:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	organizer for book/dvd/music collections

 DISTNAME=	tellico-1.3.6
-REVISION=	6
+REVISION=	7

 CATEGORIES=	x11 databases

@ -15,11 +15,18 @@ MAINTAINER=	Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB+=	ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c
-WANTLIB+=	exslt gcrypt gpg-error idn jpeg m pcre pcreposix
-WANTLIB+=	png pthread stdc++ util xml2 xslt z fam
-WANTLIB+=	expat fontconfig freetype pthread-stubs xcb
-WANTLIB+=	poppler
+WANTLIB =  GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm exempi expat
+WANTLIB += exslt fam fontconfig freetype gcrypt gpg-error idn jpeg
+WANTLIB += lcms lcms2 m mng openjpeg pcre pcreposix png poppler
+WANTLIB += poppler-qt>=3 pthread stdc++ tag tiff util xcb xml2 xslt
+WANTLIB += yaz z 
+WANTLIB += ${KDE}/DCOP ${KDE}/kabc ${KDE}/kcal ${KDE}/kcddb
+WANTLIB += ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdeprint ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/khtml ${KDE}/kio ${KDE}/kjs
+WANTLIB += ${KDE}/kmime ${KDE}/knewstuff ${KDE}/kparts
+WANTLIB += ${KDE}/kresources ${KDE}/ktnef ${KDE}/kutils
+WANTLIB += ${KDE}/kwalletclient ${KDE}/vcard

 MODULES=	x11/kde \
 		lang/python \
@ -50,11 +57,6 @@ LIB_DEPENDS=	${MODQT_LIB_DEPENDS} \
 		audio/taglib \
 		net/yaz

-WANTLIB +=	exempi kcal ktnef kmime kcddb \
-		kdecore>=6 DCOP kabc kdefx kdeprint kdesu kdeui khtml \
-		kio kjs knewstuff kparts kresources kutils kwalletclient \
-		vcard lcms poppler-qt>=3 tag yaz
-
 NO_TEST=	Yes

 .include <bsd.port.mk>
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2013/03/11 11:46:19 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2013/06/24 15:53:39 zhuk Exp $

 COMMENT=	yet another kuake KDE terminal emulator

 DISTNAME=	yakuake-2.8.1
-REVISION=	7
+REVISION=	8
 CATEGORIES=	x11 x11/kde

 EXTRACT_SUFX=	.tar.bz2
@ -15,9 +15,10 @@ PERMIT_PACKAGE_CDROM=	Yes

 MASTER_SITES=	${MASTER_SITE_BERLIOS:=yakuake/}

-WANTLIB=	ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat fam \
-		fontconfig freetype idn m png pthread stdc++ util z xcb \
-		kdecore kdefx kdesu kdeui kio kwalletclient DCOP
+WANTLIB =  ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat fam
+WANTLIB += fontconfig freetype idn m png pthread stdc++ util xcb z
+WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
+WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient

 MODULES=	devel/gettext \
 		x11/kde