diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 61ce29d5589..6f649b5aad9 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2006/01/13 23:40:24 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2006/06/12 15:45:51 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"XML editor for KDE"
 
 DISTNAME=	kxmleditor-1.1.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	editors x11 x11/kde
 
 SHARED_LIBS=	kxmleditorpart	2.0
@@ -20,7 +20,7 @@ PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2.0.0 c jpeg m png \
-		pthread stdc++ util z
+		pthread stdc++ util z iconv idn
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kxmleditor/}
 
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index dc86ed08a0f..330be98c7fc 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2006/01/23 09:21:54 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2006/06/12 15:45:51 espie Exp $
 
 COMMENT=	"silly little game based on Spacetaxi for the C64"
 
 DISTNAME=	taxipilot-0.7.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	games
 
 HOMEPAGE=	http://taxipilot.sourceforge.net/
@@ -15,7 +16,7 @@ PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=		art_lgpl_2.0.0 jpeg ICE SM X11 Xext Xrender c m \
-			png pthread stdc++ util z
+			png pthread stdc++ util z iconv idn
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=taxipilot/}
 
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 1ca1b629806..f5be6544fca 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2006/03/14 21:36:18 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2006/06/12 15:45:51 espie Exp $
 
 COMMENT=		"kde interface to exif"
 CATEGORIES=		graphics devel x11 x11/kde
 DISTNAME=		libkexif-0.2.2
-PKGNAME=		${DISTNAME}
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS=		kexif	2.1
 EXTRACT_SUFX=		.tar.bz2
 HOMEPAGE=		http://extragear.kde.org/apps/kipi/
@@ -17,7 +17,7 @@ LIB_DEPENDS+=lib/qt3/qt-mt.3.33::x11/qt3,mt \
 BUILD_DEPENDS=	::devel/pkgconfig
 
 WANTLIB=	ICE Xrender SM Xext pthread X11 util m z \
-		jpeg png art_lgpl_2
+		jpeg png art_lgpl_2 iconv idn
 MODULES=	x11/kde
 
 MODKDE_VERSION=		3.5
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 975f47fc7cd..c2976bd21b1 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2006/03/14 21:49:38 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2006/06/12 15:45:51 espie Exp $
 
 COMMENT=		"kde image plugins api"
 CATEGORIES=		graphics devel x11 x11/kde
 V=			0.1.2
 DISTNAME=		libkipi-$V
-PKGNAME=		${DISTNAME}
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS=		kipi	1.1
 EXTRACT_SUFX=		.tar.bz2
 HOMEPAGE=		http://extragear.kde.org/apps/kipi/
@@ -15,7 +15,7 @@ LIB_DEPENDS+=		lib/qt3/qt-mt.3.33::x11/qt3,mt \
 			kdecore.6,kwalletclient,DCOP,kio,kdeui,kdefx,kdesu::x11/kde/libs3
 
 WANTLIB=		ICE Xrender SM Xext pthread X11 util m z \
-			jpeg png art_lgpl_2
+			jpeg png art_lgpl_2 iconv idn
 
 FLAVORS=	debug
 MODULES=	x11/kde
diff --git a/productivity/taskjuggler/Makefile b/productivity/taskjuggler/Makefile
index 22d278ed450..9c56570a949 100644
--- a/productivity/taskjuggler/Makefile
+++ b/productivity/taskjuggler/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2006/04/29 17:12:04 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2006/06/12 15:45:51 espie Exp $
 
 COMMENT=	"project management tool"
 
 DISTNAME=	taskjuggler-2.2.0
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	productivity
 SHARED_LIBS=	taskjuggler	3.3
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	DCOP ICE SM X11 Xext Xrender art_lgpl_2 c jpeg kabc kcal \
 		kdecore kdefx kdeprint kdesu kdeui khtml kio kresources \
 		ktexteditor ktnef kwalletclient m png pthread stdc++ util \
-		vcard z
+		vcard z iconv idn
 
 MASTER_SITES=	${HOMEPAGE}/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/kde/okle/Makefile b/x11/kde/okle/Makefile
index d2dcdfba9c8..98542641dad 100644
--- a/x11/kde/okle/Makefile
+++ b/x11/kde/okle/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/16 07:25:25 alek Exp $
+# $OpenBSD: Makefile,v 1.6 2006/06/12 15:45:51 espie Exp $
 
 COMMENT= 		"kde front end for ogle"
 CATEGORIES=		x11 x11/kde 
 VERSION=		3.0
 DISTNAME=		okle-0.3
+PKGNAME=		${DISTNAME}p0
 HOMEPAGE=		http://okle.sourceforge.net/
 MASTER_SITES=		http://okle.sourceforge.net/src/
 EXTRACT_SUFX=		.tar.gz
@@ -14,6 +15,6 @@ CONFIGURE_ARGS+=--with-ogle-libs='${LOCALBASE}/lib/ogle -L${LOCALBASE}/lib'
 CONFIGURE_ARGS+=--with-ogle-includes=${LOCALBASE}/include
 
 WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2 c iconv jpeg kwalletclient \
-		m png pthread stdc++ util xml2 z
+		m png pthread stdc++ util xml2 z idn
 
 .include <bsd.port.mk>
diff --git a/x11/qinx/Makefile b/x11/qinx/Makefile
index b5c2ee42de2..fbaea4762bf 100644
--- a/x11/qinx/Makefile
+++ b/x11/qinx/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2005/10/30 00:10:42 fgsch Exp $
+# $OpenBSD: Makefile,v 1.7 2006/06/12 15:45:51 espie Exp $
 
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
+SHARED_ONLY=	Yes
 
 COMMENT=	"QNX Photon inspired theme for KDE"
 
 DISTNAME=	qinx-1.0
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 x11/kde
 MASTER_SITES=	http://www.usermode.org/code/
 
@@ -15,7 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	No
-WANTLIB=		ICE SM X11 Xext Xrender jpeg m png pthread util z
+WANTLIB=		ICE SM X11 Xext Xrender jpeg m png pthread util z \
+			iconv idn
 
 LIB_DEPENDS=	art_lgpl_2::graphics/libart \
 		kdecore.6,DCOP,kdefx,kdeui::x11/kde/libs3 \
@@ -32,6 +34,7 @@ MAKE_FLAGS=	${MODKDE_MAKE_FLAGS}
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf
 MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS}
 CONFIGURE_ARGS=	${MODKDE_CONFIGURE_ARGS}
diff --git a/x11/qinx/pkg/PFRAG.shared b/x11/qinx/pkg/PFRAG.shared
deleted file mode 100644
index ff6875a6e03..00000000000
--- a/x11/qinx/pkg/PFRAG.shared
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2004/02/10 22:54:59 espie Exp $
-${KDE}/kstyle_qinx_config.so
-${KDE}/kwin3_qinx.so
-${KDE}/kwin_qinx_config.so
-${KDE}/plugins/styles/qinx.so
diff --git a/x11/qinx/pkg/PLIST b/x11/qinx/pkg/PLIST
index 60385317c3c..ff9accbb99a 100644
--- a/x11/qinx/pkg/PLIST
+++ b/x11/qinx/pkg/PLIST
@@ -1,11 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2006/06/12 15:45:51 espie Exp $
 ${KDE}/
 ${KDE}/kstyle_qinx_config.la
+${KDE}/kstyle_qinx_config.so
 ${KDE}/kwin3_qinx.la
+${KDE}/kwin3_qinx.so
 ${KDE}/kwin_qinx_config.la
+${KDE}/kwin_qinx_config.so
 ${KDE}/plugins/
 ${KDE}/plugins/styles/
 ${KDE}/plugins/styles/qinx.la
+${KDE}/plugins/styles/qinx.so
 share/apps/
 share/apps/kdisplay/
 share/apps/kdisplay/color-schemes/
@@ -16,4 +20,3 @@ share/apps/kstyle/themes/
 share/apps/kstyle/themes/qinx.themerc
 share/apps/kwin/
 share/apps/kwin/qinx.desktop
-%%SHARED%%
diff --git a/x11/quadkonsole/Makefile b/x11/quadkonsole/Makefile
index 5fa203b63b0..0f86dc59a11 100644
--- a/x11/quadkonsole/Makefile
+++ b/x11/quadkonsole/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2005/08/11 11:28:20 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2006/06/12 15:45:51 espie Exp $
 
 COMMENT=	"terminal application that embeds Konsole for KDE"
 
 DISTNAME=	quadkonsole-2.0
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	x11 x11/kde
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=	ICE c Xrender stdc++ SM Xext pthread art_lgpl_2.5 util \
-		jpeg m X11 z png
+		jpeg m X11 z png iconv idn
 
 MASTER_SITES=	http://nomis80.org/quadkonsole/
 
@@ -27,6 +27,7 @@ MAKE_FLAGS+=	${MODKDE_MAKE_FLAGS}
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.59
 CONFIGURE_ARGS+=${MODKDE_CONFIGURE_ARGS}