Mk/bsd.kde4.mk:

- rework KDE4_BUILDENV

All ports:
- remove needless post-extract target
- make patches relative to ${PATCH_WRKSRC}
- clean up
- bump PORTREVISION when required

databases/akonadi:
- replace dependency on boost-python-libs with boost-libs
  (finally, boost-pyhton does not conflict with boost \o/)

deskutils/kdepim*:
- replace boost-python-libs with boost-libs
- reduce dependencies
- respect PREFIX
- fix build with qt3 installed

misc/kdeedu4:
- add dependency on astro/xplanet (for KStars)

misc/kdeutils4:
- add dependency on devel/qca (for okteta)
- make dependency on kdebase non-optional

multimedia/kdemultimedia4:
- add optional support for PulseAudio

x11/kdebase4:
- remove needless dependency on kdebase4-runtime

x11/kdebase4-runtime, x11/kdebase4-workspace
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users

x11/kdelibs4
- remove needless dependencies
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users

2 files changed, 8 insertions, 18 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 4f3ef3b2ecf0..f0b770f809a2 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +18,8 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -26,36 +28,24 @@ USE_BZIP2=	yes
 USE_QT_VER=	4
 USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
-OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off \
-		KONQUI		"Konqueror UI integration" off
+OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KONQUI)
-USE_KDE4+=	kdebase
-PLIST_SUB+=	KONQUI=""
-.else
-PLIST_SUB+=	KONQUI="@comment "
-
-.endif
-
 .if defined(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 #disable printer-applet, it comes with print/kdeutils4-printer-applet
 	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
-		${WRKSRC}/../CMakeLists.txt
+		${PATCH_WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 7bf4309ec709..c364e5629318 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
 lib/kde4/libarkpart.so
-%%KONQUI%%lib/kde4/libextracthere.so
+lib/kde4/libextracthere.so
 lib/kde4/libkbytearrayedit.so
 lib/kde4/liboktetapart.so
 lib/kde4/plasma_package_superkaramba.so
@@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
-%%KONQUI%%share/kde4/services/ark_dndextract.desktop
+share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcm_lirc.desktop