Update KDE Software Compilation ports to 4.6.3

Special thanks to Raphael Kubo da Costa for his work on this update.

16 files changed, 195 insertions, 33 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 7c5e9e59055f..6163efdf9e74 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -26,8 +26,8 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		uic_build uic3_build
 MAKE_JOBS_SAFE=	yes
 
-CMAKE_ARGS+=	-DBUILD_kpackage:BOOL=Off \
-		-DBUILD_lilo-config:BOOL=Off
+#disable system-config-printer-kde, it comes with print/kdeadmin4-system-config-printer-kde
+CMAKE_ARGS+=	-DBUILD_system-config-printer-kde:BOOL=Off
 
 OPTIONS=	PRINTER_CONFIG "Install printer configuration utility" off
 
@@ -37,9 +37,4 @@ OPTIONS=	PRINTER_CONFIG "Install printer configuration utility" off
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/system-config-printer-kde/system-config-printer-kde.py:${PORTSDIR}/print/system-config-printer-kde
 .endif
 
-post-patch:
-#disable system-config-printer-kde, it comes with print/kdeadmin4-system-config-printer-kde
-	${REINPLACE_CMD} -e '/add_subdirectory.*system-config-printer-kde/d' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 4562fa09f1a1..90648365905e 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeadmin-4.6.2.tar.bz2) = c6ffe809eb344f9d51b9a5a63a580f105c8e4c5cc4d4ce64b10f39d604c2199a
-SIZE (KDE/kdeadmin-4.6.2.tar.bz2) = 792429
+SHA256 (KDE/kdeadmin-4.6.3.tar.bz2) = 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
+SIZE (KDE/kdeadmin-4.6.3.tar.bz2) = 792325
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 0a7c286315db..9a66faa99cad 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -33,6 +33,9 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
+# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
+CMAKE_ARGS+=	-DBUILD_printer-applet=OFF
+
 OPTIONS=	7ZIP "Support for 7-Zip archives in Ark" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
 		RAR "Support for RAR archives in Ark" off \
@@ -76,9 +79,4 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 .endif
 .endif
 
-post-patch:
-# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
-	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 67cad0f38a7b..824077cfc83b 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.2.tar.bz2) = d1a2d77fe51fe6fb3c9eb79408b7d617927e0e12a0e6d34d2b21cd087d9afbeb
-SIZE (KDE/kdeutils-4.6.2.tar.bz2) = 3703067
+SHA256 (KDE/kdeutils-4.6.3.tar.bz2) = d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
+SIZE (KDE/kdeutils-4.6.3.tar.bz2) = 3703326
diff --git a/sysutils/kdf/files/patch-ark-CMakeLists.txt b/sysutils/kdf/files/patch-ark-CMakeLists.txt
new file mode 100644
index 000000000000..fae223ae2a40
--- /dev/null
+++ b/sysutils/kdf/files/patch-ark-CMakeLists.txt
@@ -0,0 +1,26 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/CMakeLists.txt
++++ ark/CMakeLists.txt
+@@ -1,5 +1,8 @@
+ project(ark)
+ 
++macro_optional_find_package(LibArchive)
++macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
++
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ add_subdirectory(part)
diff --git a/sysutils/kdf/files/patch-ark-plugins-CMakeLists.txt b/sysutils/kdf/files/patch-ark-plugins-CMakeLists.txt
new file mode 100644
index 000000000000..f157bf403124
--- /dev/null
+++ b/sysutils/kdf/files/patch-ark-plugins-CMakeLists.txt
@@ -0,0 +1,32 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/plugins/CMakeLists.txt
++++ ark/plugins/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-macro_optional_find_package(LibArchive)
+-
+ if (LIBARCHIVE_FOUND)
+     if( HAVE_LIBARCHIVE_READ_DISK_API )
+         if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
+@@ -15,8 +13,6 @@ if (LIBARCHIVE_FOUND)
+     endif( HAVE_LIBARCHIVE_READ_DISK_API )
+ endif (LIBARCHIVE_FOUND)
+ 
+-macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
+-
+ add_subdirectory( clirarplugin )
+ add_subdirectory( cli7zplugin )
+ add_subdirectory( clizipplugin )
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 0a7c286315db..9a66faa99cad 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -33,6 +33,9 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
+# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
+CMAKE_ARGS+=	-DBUILD_printer-applet=OFF
+
 OPTIONS=	7ZIP "Support for 7-Zip archives in Ark" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
 		RAR "Support for RAR archives in Ark" off \
@@ -76,9 +79,4 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 .endif
 .endif
 
-post-patch:
-# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
-	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 67cad0f38a7b..824077cfc83b 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.2.tar.bz2) = d1a2d77fe51fe6fb3c9eb79408b7d617927e0e12a0e6d34d2b21cd087d9afbeb
-SIZE (KDE/kdeutils-4.6.2.tar.bz2) = 3703067
+SHA256 (KDE/kdeutils-4.6.3.tar.bz2) = d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
+SIZE (KDE/kdeutils-4.6.3.tar.bz2) = 3703326
diff --git a/sysutils/kfloppy/files/patch-ark-CMakeLists.txt b/sysutils/kfloppy/files/patch-ark-CMakeLists.txt
new file mode 100644
index 000000000000..fae223ae2a40
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ark-CMakeLists.txt
@@ -0,0 +1,26 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/CMakeLists.txt
++++ ark/CMakeLists.txt
+@@ -1,5 +1,8 @@
+ project(ark)
+ 
++macro_optional_find_package(LibArchive)
++macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
++
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ add_subdirectory(part)
diff --git a/sysutils/kfloppy/files/patch-ark-plugins-CMakeLists.txt b/sysutils/kfloppy/files/patch-ark-plugins-CMakeLists.txt
new file mode 100644
index 000000000000..f157bf403124
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ark-plugins-CMakeLists.txt
@@ -0,0 +1,32 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/plugins/CMakeLists.txt
++++ ark/plugins/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-macro_optional_find_package(LibArchive)
+-
+ if (LIBARCHIVE_FOUND)
+     if( HAVE_LIBARCHIVE_READ_DISK_API )
+         if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
+@@ -15,8 +13,6 @@ if (LIBARCHIVE_FOUND)
+     endif( HAVE_LIBARCHIVE_READ_DISK_API )
+ endif (LIBARCHIVE_FOUND)
+ 
+-macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
+-
+ add_subdirectory( clirarplugin )
+ add_subdirectory( cli7zplugin )
+ add_subdirectory( clizipplugin )
diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile
index 4d50e1bb263f..8669e35adac3 100644
--- a/sysutils/ksysguardd/Makefile
+++ b/sysutils/ksysguardd/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	ksysguardd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src/
diff --git a/sysutils/ksysguardd/distinfo b/sysutils/ksysguardd/distinfo
index 48c697a2cc77..aa5b8003f05c 100644
--- a/sysutils/ksysguardd/distinfo
+++ b/sysutils/ksysguardd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-workspace-4.6.2.tar.bz2) = 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
-SIZE (KDE/kdebase-workspace-4.6.2.tar.bz2) = 69356153
+SHA256 (KDE/kdebase-workspace-4.6.3.tar.bz2) = ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
+SIZE (KDE/kdebase-workspace-4.6.3.tar.bz2) = 69349331
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 0a7c286315db..9a66faa99cad 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -33,6 +33,9 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
+# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
+CMAKE_ARGS+=	-DBUILD_printer-applet=OFF
+
 OPTIONS=	7ZIP "Support for 7-Zip archives in Ark" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
 		RAR "Support for RAR archives in Ark" off \
@@ -76,9 +79,4 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 .endif
 .endif
 
-post-patch:
-# Disable printer-applet, it comes with print/kdeutils4-printer-applet.
-	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 67cad0f38a7b..824077cfc83b 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.2.tar.bz2) = d1a2d77fe51fe6fb3c9eb79408b7d617927e0e12a0e6d34d2b21cd087d9afbeb
-SIZE (KDE/kdeutils-4.6.2.tar.bz2) = 3703067
+SHA256 (KDE/kdeutils-4.6.3.tar.bz2) = d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
+SIZE (KDE/kdeutils-4.6.3.tar.bz2) = 3703326
diff --git a/sysutils/sweeper/files/patch-ark-CMakeLists.txt b/sysutils/sweeper/files/patch-ark-CMakeLists.txt
new file mode 100644
index 000000000000..fae223ae2a40
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ark-CMakeLists.txt
@@ -0,0 +1,26 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/CMakeLists.txt
++++ ark/CMakeLists.txt
+@@ -1,5 +1,8 @@
+ project(ark)
+ 
++macro_optional_find_package(LibArchive)
++macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
++
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ add_subdirectory(part)
diff --git a/sysutils/sweeper/files/patch-ark-plugins-CMakeLists.txt b/sysutils/sweeper/files/patch-ark-plugins-CMakeLists.txt
new file mode 100644
index 000000000000..f157bf403124
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ark-plugins-CMakeLists.txt
@@ -0,0 +1,32 @@
+KDE SVN revision r1230915.
+
+Author: rkcosta (Raphael Kubo da Costa)
+Date:   Sun May 8 17:30:06 2011 +0000
+
+    Put the libarchive detection calls before configure_file().
+
+    The generated config.h was using some variables defined only after
+    plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
+    however the top-level CMakeLists.txt relied on these variables already
+    being set, which was never the case.
+
+    BUG: 271553
+    FIXED-IN: 4.6.4
+
+--- ark/plugins/CMakeLists.txt
++++ ark/plugins/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-macro_optional_find_package(LibArchive)
+-
+ if (LIBARCHIVE_FOUND)
+     if( HAVE_LIBARCHIVE_READ_DISK_API )
+         if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
+@@ -15,8 +13,6 @@ if (LIBARCHIVE_FOUND)
+     endif( HAVE_LIBARCHIVE_READ_DISK_API )
+ endif (LIBARCHIVE_FOUND)
+ 
+-macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
+-
+ add_subdirectory( clirarplugin )
+ add_subdirectory( cli7zplugin )
+ add_subdirectory( clizipplugin )