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
author: Max Brazhnikov <makc@FreeBSD.org> 2009-08-10 11:47:36 +0000
committer: Max Brazhnikov <makc@FreeBSD.org> 2009-08-10 11:47:36 +0000
commit: 1f8475f22f8d8bb9c6054ead276e33153e3b573a (patch)
tree: 1e7b22352a31c0762d4f7d0726861139ea86a514 /x11
parent: 9a6142d406ab92ebb826f5a0db82728b0a705d6b (diff)
50 files changed, 177 insertions, 210 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index b33378a5a141..99dd3ec510bf 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -30,7 +31,7 @@ QT_COMPONENTS=	corelib opengl dbus qt3support \
 		qmake_build moc_build rcc_build uic_build
 
 USE_GETTEXT=	yes
-USE_KDE4=	kdelibs runtime workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 MAKE_JOBS_SAFE=	yes
 
@@ -47,16 +48,13 @@ MAN1=		kappfinder.1 \
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 .if ${OSVERSION} > 800090
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20
 .endif
 .if ${OSVERSION} >= 800100
 	@${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \
-		${WRKSRC}/../apps/kinfocenter/usbview/usbdevices.h
+		${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/kde4-baseapps/files/extra-patch-libusb20 b/x11/kde4-baseapps/files/extra-patch-libusb20
index 9557a6588933..18f4782c4506 100644
--- a/x11/kde4-baseapps/files/extra-patch-libusb20
+++ b/x11/kde4-baseapps/files/extra-patch-libusb20
@@ -1,6 +1,6 @@
-diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbview/CMakeLists.txt
---- ../apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:55:58.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt
+--- ./apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:55:58.000000000 +0200
 @@ -9,7 +9,7 @@
  kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS})
  
@@ -10,9 +10,9 @@ diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbvie
  
  install(TARGETS kcm_usb  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
-diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbview/usbdevices.cpp
---- ../apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:55:58.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp
+--- ./apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:55:58.000000000 +0200
 @@ -294,17 +294,25 @@
  
  /*
@@ -154,9 +154,9 @@ diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbvie
  	return true;
  }
  #endif
-diff -u -r ../apps/kinfocenter/usbview/usbdevices.h ../apps/kinfocenter/usbview/usbdevices.h
---- ../apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:59:11.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h
+--- ./apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:59:11.000000000 +0200
 @@ -14,18 +14,11 @@
  #include <QList>
  #include <QString>
diff --git a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
index 37de8dc3f358..1cd6d43a3e33 100644
--- a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
+++ b/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
@@ -1,5 +1,5 @@
---- ../apps/cmake/modules/FindPCIUTILS.cmake.orig	2008-08-07 15:20:57.000000000 +0000
-+++ ../apps/cmake/modules/FindPCIUTILS.cmake	2008-12-27 11:49:04.000000000 +0000
+--- ./apps/cmake/modules/FindPCIUTILS.cmake.orig	2008-08-07 15:20:57.000000000 +0000
++++ ./apps/cmake/modules/FindPCIUTILS.cmake	2008-12-27 11:49:04.000000000 +0000
 @@ -14,7 +14,11 @@
  FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
  if(PCIUTILS_LIBRARY)
diff --git a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h
index 05f6d8d89819..57c5437c6ff9 100644
--- a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h
+++ b/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h
@@ -1,5 +1,5 @@
---- ../apps/kinfocenter/usbview/usbdevices.h.orig	2008-10-17 03:00:14.000000000 -0800
-+++ ../apps/kinfocenter/usbview/usbdevices.h	2009-03-01 21:01:18.000000000 -0900
+--- ./apps/kinfocenter/usbview/usbdevices.h.orig	2008-10-17 03:00:14.000000000 -0800
++++ ./apps/kinfocenter/usbview/usbdevices.h	2009-03-01 21:01:18.000000000 -0900
 @@ -18,7 +18,12 @@
  #include <bus/usb/usb.h>
  #include <QStringList>
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 9706e61b9eb7..4f60533ca2ba 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp
 
@@ -32,7 +32,7 @@ MAKE_JOBS_SAFE=	yes
 MAN1=	kdesu.1
 MAN8=	nepomukserver.8 nepomukservicestub.8
 
-OPTIONS=	PULSEAUDIO	"Enable playback via PulseAudio soundserver" off
+OPTIONS=	PULSEAUDIO "Enable playback via PulseAudio soundserver" off
 
 .include <bsd.port.pre.mk>
 
@@ -43,18 +43,11 @@ LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
 .endif
 
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
-CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
-CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/../khelpcenter/infotree.cpp \
-		${WRKSRC}/../kioslave/info/kde-info2html.conf \
-		${WRKSRC}/../kioslave/man/kio_man.cpp \
-		${WRKSRC}/../kioslave/man/man2html.cpp
+		${PATCH_WRKSRC}/khelpcenter/infotree.cpp \
+		${PATCH_WRKSRC}/kioslave/info/kde-info2html.conf \
+		${PATCH_WRKSRC}/kioslave/man/kio_man.cpp \
+		${PATCH_WRKSRC}/kioslave/man/man2html.cpp
 
 .include <bsd.port.post.mk>
diff --git a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
index 34c61416467e..c52c60e287b1 100644
--- a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
+++ b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
@@ -1,5 +1,5 @@
---- ../khelpcenter/searchhandlers/khc_mansearch.pl.orig	2008-08-02 17:06:48.000000000 +0200
-+++ ../khelpcenter/searchhandlers/khc_mansearch.pl	2008-08-02 17:07:03.000000000 +0200
+--- ./khelpcenter/searchhandlers/khc_mansearch.pl.orig	2008-08-02 17:06:48.000000000 +0200
++++ ./khelpcenter/searchhandlers/khc_mansearch.pl	2008-08-02 17:07:03.000000000 +0200
 @@ -55,7 +55,7 @@
  while( <MAN> ) {
  #  print "RAW:$_";
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 0f2e48931d26..337edf9ce630 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -46,12 +46,10 @@ QT_COMPONENTS=	assistant corelib dbus designer gui network opengl  \
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
-MAN1=	plasmaengineexplorer.1
+
+MAN1=		plasmaengineexplorer.1
 
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-		-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
-		-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DWITH_BlueZ:BOOL=OFF \
 		-DWITH_Sensors:BOOL=OFF \
 		-DWITH_NetworkManager:BOOL=OFF \
@@ -68,28 +66,25 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/../startkde.cmake \
-		${WRKSRC}/../kcontrol/kfontinst/lib/KfiConstants.h \
-		${WRKSRC}/../kcontrol/kfontinst/kio/KioFonts.cpp \
-		${WRKSRC}/../kcontrol/kxkb/x11helper.cpp \
-		${WRKSRC}/../kdm/kfrontend/genkdmconf.c
+		${PATCH_WRKSRC}/startkde.cmake \
+		${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
+		${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \
+		${PATCH_WRKSRC}/kcontrol/kxkb/x11helper.cpp \
+		${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
-		${WRKSRC}/../kwin/effects/thumbnailaside/thumbnailaside.h
+		${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h
 .for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\
 		laptop/laptopclient.cpp modernsystem/modernsys.cpp\
 		redmond/redmond.cpp
 	${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
-		${WRKSRC}/../kwin/clients/${item}
+		${PATCH_WRKSRC}/kwin/clients/${item}
 	${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
 		-e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
-	${WRKSRC}/../kwrited/CMakeLists.txt
+	${PATCH_WRKSRC}/kwrited/CMakeLists.txt
 .endfor
 
 post-install:
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
index 25851f037692..b0a9a4744f7e 100644
--- a/x11/kde4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../CMakeLists.txt.orig	2009-01-01 19:26:09.000000000 +0300
-+++ ../CMakeLists.txt	2009-03-07 10:02:36.000000000 +0300
+--- ./CMakeLists.txt.orig	2009-01-01 19:26:09.000000000 +0300
++++ ./CMakeLists.txt	2009-03-07 10:02:36.000000000 +0300
 @@ -220,7 +220,7 @@
  macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake 
                                       ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
diff --git a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
index 78ebf36725c6..15eec2aa583d 100644
--- a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
+++ b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
@@ -1,5 +1,5 @@
---- ../kcontrol/keyboard/kcmmisc.cpp.orig	2008-04-02 08:18:22.000000000 -0400
-+++ ../kcontrol/keyboard/kcmmisc.cpp	2008-07-07 14:02:16.000000000 -0400
+--- ./kcontrol/keyboard/kcmmisc.cpp.orig	2008-04-02 08:18:22.000000000 -0400
++++ ./kcontrol/keyboard/kcmmisc.cpp	2008-07-07 14:02:16.000000000 -0400
 @@ -505,8 +505,10 @@
  
  
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
index d7654a8cbd5c..45f403dd292c 100644
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../kdm/kfrontend/CMakeLists.txt.orig	2008-07-30 17:02:54.000000000 +0300
-+++ ../kdm/kfrontend/CMakeLists.txt	2008-07-30 17:03:26.000000000 +0300
+--- ./kdm/kfrontend/CMakeLists.txt.orig	2008-07-30 17:02:54.000000000 +0300
++++ ./kdm/kfrontend/CMakeLists.txt	2008-07-30 17:03:26.000000000 +0300
 @@ -108,6 +108,6 @@
  build_confci()
  
diff --git a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp
index a6bdc04d66b8..b08046ff9014 100644
--- a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp
+++ b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp
@@ -1,5 +1,5 @@
---- ../ksmserver/fadeeffect.cpp.ori	2008-07-22 00:15:47.000000000 +0200
-+++ ../ksmserver/fadeeffect.cpp	2008-07-22 00:16:13.000000000 +0200
+--- ./ksmserver/fadeeffect.cpp.ori	2008-07-22 00:15:47.000000000 +0200
++++ ./ksmserver/fadeeffect.cpp	2008-07-22 00:16:13.000000000 +0200
 @@ -58,7 +58,7 @@
  #include "fadeeffect.moc"
  
diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd b/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
index efe4fd885e93..1b7b451570db 100644
--- a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
+++ b/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
@@ -1,5 +1,5 @@
---- ../ksysguard/gui/SystemLoad2.sgrd.orig	2009-06-09 18:07:55.000000000 +0200
-+++ ../ksysguard/gui/SystemLoad2.sgrd	2009-07-03 09:35:29.000000000 +0200
+--- ./ksysguard/gui/SystemLoad2.sgrd.orig	2009-06-09 18:07:55.000000000 +0200
++++ ./ksysguard/gui/SystemLoad2.sgrd	2009-07-03 09:35:29.000000000 +0200
 @@ -3,7 +3,7 @@
  <WorkSheet title="System Load" interval="0.5" locked="1" rows="3" columns="1" >
   <host port="-1" command="ksysguardd" shell="" name="localhost" />
diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc b/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
index a112710f60ff..951988f978b5 100644
--- a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
+++ b/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
@@ -1,5 +1,5 @@
---- ../ksysguard/gui/ksgrd/SensorManager.cc.orgi	2009-01-22 23:54:35.000000000 +0100
-+++ ../ksysguard/gui/ksgrd/SensorManager.cc	2009-01-22 23:54:52.000000000 +0100
+--- ./ksysguard/gui/ksgrd/SensorManager.cc.orgi	2009-01-22 23:54:35.000000000 +0100
++++ ./ksysguard/gui/ksgrd/SensorManager.cc	2009-01-22 23:54:52.000000000 +0100
 @@ -61,6 +61,7 @@
    mDict.insert( QLatin1String( "nice" ), i18n( "Nice Load" ) );
    mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) );
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
index 978857c88f17..e2aa9fc7591d 100644
--- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
+++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
@@ -1,5 +1,5 @@
---- ../ksysguard/ksysguardd/FreeBSD/CPU.c.orig	2008-01-05 00:55:46.000000000 +0100
-+++ ../ksysguard/ksysguardd/FreeBSD/CPU.c	2009-02-03 20:54:08.000000000 +0100
+--- ./ksysguard/ksysguardd/FreeBSD/CPU.c.orig	2008-01-05 00:55:46.000000000 +0100
++++ ./ksysguard/ksysguardd/FreeBSD/CPU.c	2009-02-03 20:54:08.000000000 +0100
 @@ -49,11 +49,12 @@
  				   struct kinfo_cputime *);
  static struct kinfo_cputime cp_time, cp_old;
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
index df52f95fab38..87896f1d25eb 100644
--- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
+++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
@@ -1,5 +1,5 @@
---- ../ksysguard/ksysguardd/FreeBSD/CPU.h.orig	2008-01-05 00:55:46.000000000 +0100
-+++ ../ksysguard/ksysguardd/FreeBSD/CPU.h	2009-02-03 16:26:12.000000000 +0100
+--- ./ksysguard/ksysguardd/FreeBSD/CPU.h.orig	2008-01-05 00:55:46.000000000 +0100
++++ ./ksysguard/ksysguardd/FreeBSD/CPU.h	2009-02-03 16:26:12.000000000 +0100
 @@ -35,6 +35,10 @@
  void printCPUNiceInfo(const char* cmd);
  void printCPUSys(const char* cmd);
diff --git a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
index cbcfad414d0e..946eb9395aae 100644
--- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
+++ b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
@@ -1,5 +1,5 @@
---- ../kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi	2008-01-30 00:38:06.000000000 +0100
-+++ ../kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
+--- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi	2008-01-30 00:38:06.000000000 +0100
++++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
 @@ -30,6 +30,7 @@
  
  #include <assert.h>
diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
index 1de4d0ae85d0..d9b0efedd656 100644
--- a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../libs/ksysguard/processui/CMakeLists.txt.orig	2008-06-18 16:41:37.000000000 +0400
-+++ ../libs/ksysguard/processui/CMakeLists.txt	2008-06-28 13:56:54.000000000 +0400
+--- ./libs/ksysguard/processui/CMakeLists.txt.orig	2008-06-18 16:41:37.000000000 +0400
++++ ./libs/ksysguard/processui/CMakeLists.txt	2008-06-28 13:56:54.000000000 +0400
 @@ -1,7 +1,7 @@
  
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../  ../processcore/)
diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
index 770d2cf432ce..de32b4591cdf 100644
--- a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../libs/ksysguard/CMakeLists.txt.orig	2008-04-10 13:30:14.000000000 +0400
-+++ ../libs/ksysguard/CMakeLists.txt	2008-06-28 14:04:29.000000000 +0400
+--- ./libs/ksysguard/CMakeLists.txt.orig	2008-04-10 13:30:14.000000000 +0400
++++ ./libs/ksysguard/CMakeLists.txt	2008-06-28 14:04:29.000000000 +0400
 @@ -5,7 +5,7 @@
  add_subdirectory( processui )
  add_subdirectory( tests )
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 9706e61b9eb7..4f60533ca2ba 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp
 
@@ -32,7 +32,7 @@ MAKE_JOBS_SAFE=	yes
 MAN1=	kdesu.1
 MAN8=	nepomukserver.8 nepomukservicestub.8
 
-OPTIONS=	PULSEAUDIO	"Enable playback via PulseAudio soundserver" off
+OPTIONS=	PULSEAUDIO "Enable playback via PulseAudio soundserver" off
 
 .include <bsd.port.pre.mk>
 
@@ -43,18 +43,11 @@ LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
 .endif
 
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
-CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
-CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/../khelpcenter/infotree.cpp \
-		${WRKSRC}/../kioslave/info/kde-info2html.conf \
-		${WRKSRC}/../kioslave/man/kio_man.cpp \
-		${WRKSRC}/../kioslave/man/man2html.cpp
+		${PATCH_WRKSRC}/khelpcenter/infotree.cpp \
+		${PATCH_WRKSRC}/kioslave/info/kde-info2html.conf \
+		${PATCH_WRKSRC}/kioslave/man/kio_man.cpp \
+		${PATCH_WRKSRC}/kioslave/man/man2html.cpp
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
index 34c61416467e..c52c60e287b1 100644
--- a/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
+++ b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
@@ -1,5 +1,5 @@
---- ../khelpcenter/searchhandlers/khc_mansearch.pl.orig	2008-08-02 17:06:48.000000000 +0200
-+++ ../khelpcenter/searchhandlers/khc_mansearch.pl	2008-08-02 17:07:03.000000000 +0200
+--- ./khelpcenter/searchhandlers/khc_mansearch.pl.orig	2008-08-02 17:06:48.000000000 +0200
++++ ./khelpcenter/searchhandlers/khc_mansearch.pl	2008-08-02 17:07:03.000000000 +0200
 @@ -55,7 +55,7 @@
  while( <MAN> ) {
  #  print "RAW:$_";
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 0f2e48931d26..337edf9ce630 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -46,12 +46,10 @@ QT_COMPONENTS=	assistant corelib dbus designer gui network opengl  \
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
-MAN1=	plasmaengineexplorer.1
+
+MAN1=		plasmaengineexplorer.1
 
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-		-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
-		-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DWITH_BlueZ:BOOL=OFF \
 		-DWITH_Sensors:BOOL=OFF \
 		-DWITH_NetworkManager:BOOL=OFF \
@@ -68,28 +66,25 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/../startkde.cmake \
-		${WRKSRC}/../kcontrol/kfontinst/lib/KfiConstants.h \
-		${WRKSRC}/../kcontrol/kfontinst/kio/KioFonts.cpp \
-		${WRKSRC}/../kcontrol/kxkb/x11helper.cpp \
-		${WRKSRC}/../kdm/kfrontend/genkdmconf.c
+		${PATCH_WRKSRC}/startkde.cmake \
+		${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
+		${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \
+		${PATCH_WRKSRC}/kcontrol/kxkb/x11helper.cpp \
+		${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
-		${WRKSRC}/../kwin/effects/thumbnailaside/thumbnailaside.h
+		${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h
 .for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\
 		laptop/laptopclient.cpp modernsystem/modernsys.cpp\
 		redmond/redmond.cpp
 	${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
-		${WRKSRC}/../kwin/clients/${item}
+		${PATCH_WRKSRC}/kwin/clients/${item}
 	${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
 		-e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
-	${WRKSRC}/../kwrited/CMakeLists.txt
+	${PATCH_WRKSRC}/kwrited/CMakeLists.txt
 .endfor
 
 post-install:
diff --git a/x11/kdebase4-workspace/files/patch-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
index 25851f037692..b0a9a4744f7e 100644
--- a/x11/kdebase4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../CMakeLists.txt.orig	2009-01-01 19:26:09.000000000 +0300
-+++ ../CMakeLists.txt	2009-03-07 10:02:36.000000000 +0300
+--- ./CMakeLists.txt.orig	2009-01-01 19:26:09.000000000 +0300
++++ ./CMakeLists.txt	2009-03-07 10:02:36.000000000 +0300
 @@ -220,7 +220,7 @@
  macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake 
                                       ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
index 78ebf36725c6..15eec2aa583d 100644
--- a/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
+++ b/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
@@ -1,5 +1,5 @@
---- ../kcontrol/keyboard/kcmmisc.cpp.orig	2008-04-02 08:18:22.000000000 -0400
-+++ ../kcontrol/keyboard/kcmmisc.cpp	2008-07-07 14:02:16.000000000 -0400
+--- ./kcontrol/keyboard/kcmmisc.cpp.orig	2008-04-02 08:18:22.000000000 -0400
++++ ./kcontrol/keyboard/kcmmisc.cpp	2008-07-07 14:02:16.000000000 -0400
 @@ -505,8 +505,10 @@
  
  
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
index d7654a8cbd5c..45f403dd292c 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../kdm/kfrontend/CMakeLists.txt.orig	2008-07-30 17:02:54.000000000 +0300
-+++ ../kdm/kfrontend/CMakeLists.txt	2008-07-30 17:03:26.000000000 +0300
+--- ./kdm/kfrontend/CMakeLists.txt.orig	2008-07-30 17:02:54.000000000 +0300
++++ ./kdm/kfrontend/CMakeLists.txt	2008-07-30 17:03:26.000000000 +0300
 @@ -108,6 +108,6 @@
  build_confci()
  
diff --git a/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp
index a6bdc04d66b8..b08046ff9014 100644
--- a/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp
+++ b/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp
@@ -1,5 +1,5 @@
---- ../ksmserver/fadeeffect.cpp.ori	2008-07-22 00:15:47.000000000 +0200
-+++ ../ksmserver/fadeeffect.cpp	2008-07-22 00:16:13.000000000 +0200
+--- ./ksmserver/fadeeffect.cpp.ori	2008-07-22 00:15:47.000000000 +0200
++++ ./ksmserver/fadeeffect.cpp	2008-07-22 00:16:13.000000000 +0200
 @@ -58,7 +58,7 @@
  #include "fadeeffect.moc"
  
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd b/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
index efe4fd885e93..1b7b451570db 100644
--- a/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
@@ -1,5 +1,5 @@
---- ../ksysguard/gui/SystemLoad2.sgrd.orig	2009-06-09 18:07:55.000000000 +0200
-+++ ../ksysguard/gui/SystemLoad2.sgrd	2009-07-03 09:35:29.000000000 +0200
+--- ./ksysguard/gui/SystemLoad2.sgrd.orig	2009-06-09 18:07:55.000000000 +0200
++++ ./ksysguard/gui/SystemLoad2.sgrd	2009-07-03 09:35:29.000000000 +0200
 @@ -3,7 +3,7 @@
  <WorkSheet title="System Load" interval="0.5" locked="1" rows="3" columns="1" >
   <host port="-1" command="ksysguardd" shell="" name="localhost" />
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc b/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
index a112710f60ff..951988f978b5 100644
--- a/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc
@@ -1,5 +1,5 @@
---- ../ksysguard/gui/ksgrd/SensorManager.cc.orgi	2009-01-22 23:54:35.000000000 +0100
-+++ ../ksysguard/gui/ksgrd/SensorManager.cc	2009-01-22 23:54:52.000000000 +0100
+--- ./ksysguard/gui/ksgrd/SensorManager.cc.orgi	2009-01-22 23:54:35.000000000 +0100
++++ ./ksysguard/gui/ksgrd/SensorManager.cc	2009-01-22 23:54:52.000000000 +0100
 @@ -61,6 +61,7 @@
    mDict.insert( QLatin1String( "nice" ), i18n( "Nice Load" ) );
    mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) );
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
index 978857c88f17..e2aa9fc7591d 100644
--- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
@@ -1,5 +1,5 @@
---- ../ksysguard/ksysguardd/FreeBSD/CPU.c.orig	2008-01-05 00:55:46.000000000 +0100
-+++ ../ksysguard/ksysguardd/FreeBSD/CPU.c	2009-02-03 20:54:08.000000000 +0100
+--- ./ksysguard/ksysguardd/FreeBSD/CPU.c.orig	2008-01-05 00:55:46.000000000 +0100
++++ ./ksysguard/ksysguardd/FreeBSD/CPU.c	2009-02-03 20:54:08.000000000 +0100
 @@ -49,11 +49,12 @@
  				   struct kinfo_cputime *);
  static struct kinfo_cputime cp_time, cp_old;
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
index df52f95fab38..87896f1d25eb 100644
--- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h
@@ -1,5 +1,5 @@
---- ../ksysguard/ksysguardd/FreeBSD/CPU.h.orig	2008-01-05 00:55:46.000000000 +0100
-+++ ../ksysguard/ksysguardd/FreeBSD/CPU.h	2009-02-03 16:26:12.000000000 +0100
+--- ./ksysguard/ksysguardd/FreeBSD/CPU.h.orig	2008-01-05 00:55:46.000000000 +0100
++++ ./ksysguard/ksysguardd/FreeBSD/CPU.h	2009-02-03 16:26:12.000000000 +0100
 @@ -35,6 +35,10 @@
  void printCPUNiceInfo(const char* cmd);
  void printCPUSys(const char* cmd);
diff --git a/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
index cbcfad414d0e..946eb9395aae 100644
--- a/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
+++ b/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
@@ -1,5 +1,5 @@
---- ../kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi	2008-01-30 00:38:06.000000000 +0100
-+++ ../kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
+--- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi	2008-01-30 00:38:06.000000000 +0100
++++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
 @@ -30,6 +30,7 @@
  
  #include <assert.h>
diff --git a/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
index 1de4d0ae85d0..d9b0efedd656 100644
--- a/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../libs/ksysguard/processui/CMakeLists.txt.orig	2008-06-18 16:41:37.000000000 +0400
-+++ ../libs/ksysguard/processui/CMakeLists.txt	2008-06-28 13:56:54.000000000 +0400
+--- ./libs/ksysguard/processui/CMakeLists.txt.orig	2008-06-18 16:41:37.000000000 +0400
++++ ./libs/ksysguard/processui/CMakeLists.txt	2008-06-28 13:56:54.000000000 +0400
 @@ -1,7 +1,7 @@
  
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../  ../processcore/)
diff --git a/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
index 770d2cf432ce..de32b4591cdf 100644
--- a/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../libs/ksysguard/CMakeLists.txt.orig	2008-04-10 13:30:14.000000000 +0400
-+++ ../libs/ksysguard/CMakeLists.txt	2008-06-28 14:04:29.000000000 +0400
+--- ./libs/ksysguard/CMakeLists.txt.orig	2008-04-10 13:30:14.000000000 +0400
++++ ./libs/ksysguard/CMakeLists.txt	2008-06-28 14:04:29.000000000 +0400
 @@ -5,7 +5,7 @@
  add_subdirectory( processui )
  add_subdirectory( tests )
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index b33378a5a141..99dd3ec510bf 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -30,7 +31,7 @@ QT_COMPONENTS=	corelib opengl dbus qt3support \
 		qmake_build moc_build rcc_build uic_build
 
 USE_GETTEXT=	yes
-USE_KDE4=	kdelibs runtime workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 MAKE_JOBS_SAFE=	yes
 
@@ -47,16 +48,13 @@ MAN1=		kappfinder.1 \
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 .if ${OSVERSION} > 800090
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20
 .endif
 .if ${OSVERSION} >= 800100
 	@${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \
-		${WRKSRC}/../apps/kinfocenter/usbview/usbdevices.h
+		${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdebase4/files/extra-patch-libusb20 b/x11/kdebase4/files/extra-patch-libusb20
index 9557a6588933..18f4782c4506 100644
--- a/x11/kdebase4/files/extra-patch-libusb20
+++ b/x11/kdebase4/files/extra-patch-libusb20
@@ -1,6 +1,6 @@
-diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbview/CMakeLists.txt
---- ../apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:55:58.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt
+--- ./apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/CMakeLists.txt	2009-06-07 10:55:58.000000000 +0200
 @@ -9,7 +9,7 @@
  kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS})
  
@@ -10,9 +10,9 @@ diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbvie
  
  install(TARGETS kcm_usb  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
-diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbview/usbdevices.cpp
---- ../apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:55:58.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp
+--- ./apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/usbdevices.cpp	2009-06-07 10:55:58.000000000 +0200
 @@ -294,17 +294,25 @@
  
  /*
@@ -154,9 +154,9 @@ diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbvie
  	return true;
  }
  #endif
-diff -u -r ../apps/kinfocenter/usbview/usbdevices.h ../apps/kinfocenter/usbview/usbdevices.h
---- ../apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:54:55.000000000 +0200
-+++ ../apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:59:11.000000000 +0200
+diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h
+--- ./apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:54:55.000000000 +0200
++++ ./apps/kinfocenter/usbview/usbdevices.h	2009-06-07 10:59:11.000000000 +0200
 @@ -14,18 +14,11 @@
  #include <QList>
  #include <QString>
diff --git a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
index 37de8dc3f358..1cd6d43a3e33 100644
--- a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
+++ b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
@@ -1,5 +1,5 @@
---- ../apps/cmake/modules/FindPCIUTILS.cmake.orig	2008-08-07 15:20:57.000000000 +0000
-+++ ../apps/cmake/modules/FindPCIUTILS.cmake	2008-12-27 11:49:04.000000000 +0000
+--- ./apps/cmake/modules/FindPCIUTILS.cmake.orig	2008-08-07 15:20:57.000000000 +0000
++++ ./apps/cmake/modules/FindPCIUTILS.cmake	2008-12-27 11:49:04.000000000 +0000
 @@ -14,7 +14,11 @@
  FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
  if(PCIUTILS_LIBRARY)
diff --git a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h
index 05f6d8d89819..57c5437c6ff9 100644
--- a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h
+++ b/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h
@@ -1,5 +1,5 @@
---- ../apps/kinfocenter/usbview/usbdevices.h.orig	2008-10-17 03:00:14.000000000 -0800
-+++ ../apps/kinfocenter/usbview/usbdevices.h	2009-03-01 21:01:18.000000000 -0900
+--- ./apps/kinfocenter/usbview/usbdevices.h.orig	2008-10-17 03:00:14.000000000 -0800
++++ ./apps/kinfocenter/usbview/usbdevices.h	2009-03-01 21:01:18.000000000 -0900
 @@ -18,7 +18,12 @@
  #include <bus/usb/usb.h>
  #include <QStringList>
diff --git a/x11/kdelibs4-experimental/Makefile b/x11/kdelibs4-experimental/Makefile
index cacc344b34c6..ee2d9c416348 100644
--- a/x11/kdelibs4-experimental/Makefile
+++ b/x11/kdelibs4-experimental/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	kdelibs-experimental
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMESUFFIX?=	# empty
 DIST_SUBDIR=	KDE
 
-MAINTAINER=	kde at FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Experimantal set of libraries needed by KDE programs
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4 sharedmime
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -28,13 +29,4 @@ QT_COMPONENTS=	corelib opengl dbus phonon \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-
-pre-configure:
-
-post-install:
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 1b9429a0d434..ee85a29b0a12 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,8 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info
+BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
 LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		soprano.4:${PORTSDIR}/textproc/soprano \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
@@ -36,7 +36,6 @@ LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info \
 		iceauth:${PORTSDIR}/x11/iceauth \
 		xauth:${PORTSDIR}/x11/xauth
 
@@ -50,7 +49,6 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_BISON=	build
 USE_OPENSSL=	yes
-USE_BDB=	40+
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus gui network opengl qt3support \
 		qtestlib script sql svg xml designer phonon \
@@ -61,13 +59,7 @@ MAKE_JOBS_SAFE=	yes
 
 CMAKE_ARGS+=	-DWITH_FAM:BOOL=Off \
 		-DWITH_ACL:BOOL=Off \
-		-DKDE4_PREFIX:String=${KDE4_PREFIX} \
-		-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
-		-DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
-CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
-CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
-CMAKE_ARGS+=	-DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
+		-DKDE4_PREFIX:String=${KDE4_PREFIX}
 
 MAN1=	checkXML.1 \
 	kde4-config.1 \
@@ -93,35 +85,32 @@ LIB_DEPENDS+=	avahi-qt4:${PORTSDIR}/net/avahi-qt4 \
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/../kde3support/kdeui/k3sconfig.cpp \
-		${WRKSRC}/../kdecore/network/k3socks.cpp \
-		${WRKSRC}/../kdecore/kernel/kstandarddirs.cpp \
-		${WRKSRC}/../kdeui/dialogs/kcupsoptionswidget_p.cpp \
-		${WRKSRC}/../kdeui/kernel/start-session-bus.sh \
-		${WRKSRC}/../kio/kssl/kopenssl.cpp \
-		${WRKSRC}/../kio/kio/ksambashare.cpp \
-		${WRKSRC}/../kjsembed/qtonly/FindQJSInternal.cmake
+		${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \
+		${PATCH_WRKSRC}/kdecore/network/k3socks.cpp \
+		${PATCH_WRKSRC}/kdecore/kernel/kstandarddirs.cpp \
+		${PATCH_WRKSRC}/kdeui/dialogs/kcupsoptionswidget_p.cpp \
+		${PATCH_WRKSRC}/kdeui/kernel/start-session-bus.sh \
+		${PATCH_WRKSRC}/kio/kssl/kopenssl.cpp \
+		${PATCH_WRKSRC}/kio/kio/ksambashare.cpp \
+		${PATCH_WRKSRC}/kjsembed/qtonly/FindQJSInternal.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/../cmake/modules/*.cmake
-	${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
-		-e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
-		${WRKSRC}/../cmake/modules/FindBerkeleyDB.cmake
-	${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
-		-e 's|utempter.h|${LOCALBASE}/include/utempter.h|' \
-		${WRKSRC}/../ConfigureChecks.cmake
-	#prevent updating mime during build
+		${PATCH_WRKSRC}/cmake/modules/*.cmake \
+		${PATCH_WRKSRC}/ConfigureChecks.cmake
+#	FindBerkeleyDB.cmake should be rewritten to support multiple version
+#	provided by ports, instead of hardcoding one of them
+# 	${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
+# 		-e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
+# 		${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake
+#	prevent updating mime during build
 #	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
-#		${WRKSRC}/../mimetypes/CMakeLists.txt
-	#default KDEHOME dir
+#		${PATCH_WRKSRC}/mimetypes/CMakeLists.txt
+#	default KDEHOME dir
 	${REINPLACE_CMD} -e '/KDE_DEFAULT_HOME/s|.kde|.kde4|' \
-		${WRKSRC}/../CMakeLists.txt
+		${PATCH_WRKSRC}/CMakeLists.txt
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
diff --git a/x11/kdelibs4/files/patch-ConfigureChecks.cmake b/x11/kdelibs4/files/patch-ConfigureChecks.cmake
new file mode 100644
index 000000000000..a4eb95820986
--- /dev/null
+++ b/x11/kdelibs4/files/patch-ConfigureChecks.cmake
@@ -0,0 +1,17 @@
+--- ./ConfigureChecks.cmake.orig	2009-06-09 20:09:30.000000000 +0400
++++ ./ConfigureChecks.cmake	2009-08-06 13:42:18.000000000 +0400
+@@ -144,11 +144,11 @@
+ 
+   set(UTIL_LIBRARY)
+ 
+-  check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP)
+-  check_include_files(utempter.h HAVE_UTEMPTER_H)
++  check_library_exists(utempter addToUtmp "/usr/local/lib" HAVE_ADDTOUTEMP)
++  check_include_files(/usr/local/include/utempter.h HAVE_UTEMPTER_H)
+   if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H)
+     set(HAVE_UTEMPTER 1)
+-    set(UTEMPTER_LIBRARY utempter)
++    set(UTEMPTER_LIBRARY /usr/local/lib/libutempter.so)
+   else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H)
+     check_function_exists(login login_in_libc)
+     if (NOT login_in_libc)
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index 1a407b728bc9..060db0ae57ba 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/KDE4Defaults.cmake.orgi	2009-05-10 10:28:06.000000000 +0200
-+++ ../cmake/modules/KDE4Defaults.cmake	2009-05-10 10:29:00.000000000 +0200
+--- ./cmake/modules/KDE4Defaults.cmake.orgi	2009-05-10 10:28:06.000000000 +0200
++++ ./cmake/modules/KDE4Defaults.cmake	2009-05-10 10:29:00.000000000 +0200
 @@ -24,12 +24,12 @@
  # define the generic version of the libraries here
  # this makes it easy to advance it when the next KDE release comes
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
index 5a4f9757769c..176b4f1bc9c8 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindKDE4Internal.cmake.orig	2009-02-26 17:18:26.000000000 +0300
-+++ ../cmake/modules/FindKDE4Internal.cmake	2009-03-22 14:42:53.000000000 +0300
+--- ./cmake/modules/FindKDE4Internal.cmake.orig	2009-02-26 17:18:26.000000000 +0300
++++ ./cmake/modules/FindKDE4Internal.cmake	2009-03-22 14:42:53.000000000 +0300
 @@ -550,7 +550,7 @@
  # whether to install a CMake FooConfig.cmake into lib/foo/cmake/ or /lib/cmake/foo/
  # (with 2.6.3 and above also lib/cmake/foo/ is supported):
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
index 2e5639bbadce..9e9c2e2e5ed0 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindKdcraw.cmake.orig	2009-01-06 17:27:37.000000000 +0000
-+++ ../cmake/modules/FindKdcraw.cmake	2009-01-25 08:34:44.000000000 +0000
+--- ./cmake/modules/FindKdcraw.cmake.orig	2009-01-06 17:27:37.000000000 +0000
++++ ./cmake/modules/FindKdcraw.cmake	2009-01-25 08:34:44.000000000 +0000
 @@ -51,7 +51,7 @@
        # in the FIND_PATH() and FIND_LIBRARY() calls
        INCLUDE(UsePkgConfig)
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
index 8844a6ab8e28..5b977de2d138 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindKexiv2.cmake.orig	2009-01-06 17:27:37.000000000 +0000
-+++ ../cmake/modules/FindKexiv2.cmake	2009-01-25 08:34:53.000000000 +0000
+--- ./cmake/modules/FindKexiv2.cmake.orig	2009-01-06 17:27:37.000000000 +0000
++++ ./cmake/modules/FindKexiv2.cmake	2009-01-25 08:34:53.000000000 +0000
 @@ -49,7 +49,7 @@
        # in the FIND_PATH() and FIND_LIBRARY() calls
        INCLUDE(UsePkgConfig)
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
index 18a427d0d0d0..9ba135be8252 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindKipi.cmake.orig	2009-01-06 17:27:37.000000000 +0000
-+++ ../cmake/modules/FindKipi.cmake	2009-01-25 08:35:05.000000000 +0000
+--- ./cmake/modules/FindKipi.cmake.orig	2009-01-06 17:27:37.000000000 +0000
++++ ./cmake/modules/FindKipi.cmake	2009-01-25 08:35:05.000000000 +0000
 @@ -50,7 +50,7 @@
        # in the FIND_PATH() and FIND_LIBRARY() calls
        INCLUDE(UsePkgConfig)
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake
index fc29aa49695c..7356bd884fa8 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindLibKonq.cmake.orig	2009-05-27 21:54:40.000000000 +0200
-+++ ../cmake/modules/FindLibKonq.cmake	2009-06-06 01:53:49.000000000 +0200
+--- ./cmake/modules/FindLibKonq.cmake.orig	2009-05-27 21:54:40.000000000 +0200
++++ ./cmake/modules/FindLibKonq.cmake	2009-06-06 01:53:49.000000000 +0200
 @@ -14,7 +14,7 @@
  
  find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h )
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake
index 2ba8f352bf4a..59618579d543 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindPhonon.cmake.orig	2008-12-04 11:35:54.000000000 +0300
-+++ ../cmake/modules/FindPhonon.cmake	2008-12-15 23:16:39.000000000 +0300
+--- ./cmake/modules/FindPhonon.cmake.orig	2008-12-04 11:35:54.000000000 +0300
++++ ./cmake/modules/FindPhonon.cmake	2008-12-15 23:16:39.000000000 +0300
 @@ -27,11 +27,11 @@
     endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
  
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
index cfdac69ba1f2..94c8f88c9efc 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindQt4.cmake.orig	2008-10-17 15:01:33.000000000 +0400
-+++ ../cmake/modules/FindQt4.cmake	2008-12-16 00:40:06.000000000 +0300
+--- ./cmake/modules/FindQt4.cmake.orig	2008-10-17 15:01:33.000000000 +0400
++++ ./cmake/modules/FindQt4.cmake	2008-12-16 00:40:06.000000000 +0300
 @@ -1096,13 +1096,13 @@
      )
  
diff --git a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
index 964be83b064b..964c065c99af 100644
--- a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
+++ b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
@@ -1,5 +1,5 @@
---- ../kio/kio/kdirwatch.cpp.orgi	2009-01-27 18:07:49.000000000 +0100
-+++ ../kio/kio/kdirwatch.cpp	2009-01-27 18:15:04.000000000 +0100
+--- ./kio/kio/kdirwatch.cpp.orgi	2009-01-27 18:07:49.000000000 +0100
++++ ./kio/kio/kdirwatch.cpp	2009-01-27 18:15:04.000000000 +0100
 @@ -89,6 +89,9 @@
    } else if (method == "QFSWatch") {
      return KDirWatchPrivate::QFSWatch;
diff --git a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp
index a09820ab85d0..004f25901f97 100644
--- a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp
+++ b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp
@@ -1,5 +1,5 @@
---- ../kio/kfile/kpropertiesdialog.cpp.orig	2009-05-06 14:14:38.000000000 +0400
-+++ ../kio/kfile/kpropertiesdialog.cpp	2009-05-30 00:46:08.000000000 +0400
+--- ./kio/kfile/kpropertiesdialog.cpp.orig	2009-05-06 14:14:38.000000000 +0400
++++ ./kio/kfile/kpropertiesdialog.cpp	2009-05-30 00:46:08.000000000 +0400
 @@ -1804,7 +1804,15 @@
  #else
      QVarLengthArray<gid_t> groups;
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index f0e39a186de8..8644a9e4621f 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -7,23 +7,20 @@
 
 PORTNAME=	qimageblitz
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE 4 integrated X11 desktop
+COMMENT=	Graphical effects and filters library for KDE4
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
 USE_CMAKE=	yes
-CMAKE_VERBOSE=	yes
 
 post-patch:
-	${MKDIR} ${WRKSRC}
 	${REINPLACE_CMD} -e \
 	    's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \
 	    ${WRKSRC}/blitz/CMakeLists.txt
author	Max Brazhnikov <makc@FreeBSD.org>	2009-08-10 11:47:36 +0000
committer	Max Brazhnikov <makc@FreeBSD.org>	2009-08-10 11:47:36 +0000
commit	1f8475f22f8d8bb9c6054ead276e33153e3b573a (patch)
tree	1e7b22352a31c0762d4f7d0726861139ea86a514 /x11
parent	9a6142d406ab92ebb826f5a0db82728b0a705d6b (diff)