The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at: http://kde.org/announcements/announce-4.7.2.php This release ships with many improvements. Read more about them here: http://FreeBSD.kde.org/news.php#itemKDESC472availableinports We'd like to say thanks to all testers and contributors, especially to lwhsu@ for his effort on hosting our test packages. PR: 156293 [1] 159219 [2] 160164 [3] Submitted by: Oleg Sidorkin <osidorkin@gmail.com> [1] Alvaro Castillo <gobledb@gmail.com> [2] dkeav04@gmail.com [3] Tested by: exp-run via pav
svn path=/head/; revision=283641
2025-07-18 17:59:20 -04:00 · 2011-10-17 00:03:42 +00:00 · 2011-10-17 00:03:42 +00:00 · a2d3b5a4bc · 2021-03-31 03:12:20 +00:00
commit a2d3b5a4bc
parent da6ade2349
592 changed files with 16369 additions and 25354 deletions
--- a/1
+++ b/1
@ -80,6 +80,7 @@ dovecot:*:143:
 dovenull:*:144:
 webcamd:*:145:
 ventrilo:*:146:
+kdm:*:147:
 rbldns:*:153:
 trircd:*:154:
 sfs:*:171:
--- a/6
+++ b/6
@ -2814,3 +2814,9 @@ www/asterisk-gui||2011-10-14|Depends on net/asterisk14, which is FORBIDDEN
 databases/dbmetrix||2011-10-14|Depends on databases/mysql323-client, which is FORBIDDEN
 databases/xmysqladmin||2011-10-14|Depends on databases/mysql323-client, which is FORBIDDEN
 devel/subversion-freebsd||2011-10-16|Merged with devel/subversion
+accessibility/ktts|accessibility/jovie|2011-10-16|Renamed upstream
+misc/konq-plugins-kde4||2011-10-16|Merged with x11/kde4-baseapps
+misc/nepomukcontroller||2011-10-16|Merged with x11/kde4-runtime
+x11/kdebase4|x11/kde4-baseapps|2011-10-16|Renamed upstream
+x11/kdebase4-runtime|x11/kde4-runtime|2011-10-16|Renamed upstream
+x11/kdebase4-workspace|x11/kde4-workspace|2011-10-16|Renamed upstream
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@ -29,7 +29,7 @@ Kde_Include_MAINTAINER=	kde@FreeBSD.org
 #
 # akonadi	- Akonadi PIM storage service
 # automoc4	- automoc4 tool
-# kdebase	- Basic KDE applications (Konqueror, Dolphin)
+# baseapps	- Basic KDE applications (Konqueror, Dolphin)
 # kdeexp	- experimental libraries (with non-stable ABI/API)
 # kdehier	- Provides common KDE directories
 # kdelibs	- The base set of KDE libraries
@ -54,7 +54,7 @@ Kde_Include_MAINTAINER=	kde@FreeBSD.org
 #		but this could be changed in a future.
 #

-KDE4_VERSION=		4.6.5
+KDE4_VERSION=		4.7.2
 KDE4_BRANCH?=		stable
 KDEPIM4_VERSION=	4.4.11.1
 KDEPIM4_BRANCH?=	stable
@ -82,7 +82,7 @@ MASTER_SITE_KDE_kde=	${kmaster:S@%SUBDIR%/@${ksub}/@g}
 #
 # KDE4 modules
 #
-_USE_KDE4_ALL=	akonadi automoc4 kdebase kdehier kdelibs kdeprefix \
+_USE_KDE4_ALL=	akonadi automoc4 baseapps kdebase kdehier kdelibs kdeprefix \
 		oxygen pimlibs pimruntime pykde4 pykdeuic4 runtime \
 		sharedmime workspace

@ -90,7 +90,8 @@ akonadi_LIB_DEPENDS=		akonadiprotocolinternals.1:${PORTSDIR}/databases/akonadi

 automoc4_BUILD_DEPENDS=		${LOCALBASE}/bin/automoc4:${PORTSDIR}/devel/automoc4

-kdebase_LIB_DEPENDS=		konq.7:${PORTSDIR}/x11/kdebase4
+baseapps_LIB_DEPENDS=		konq.7:${PORTSDIR}/x11/kde4-baseapps
+kdebase_LIB_DEPENDS=		${baseapps_LIB_DEPENDS}

 kdehier_RUN_DEPENDS=		kdehier4>=1:${PORTSDIR}/misc/kdehier4

@ -106,15 +107,15 @@ pimruntime_LIB_DEPENDS=		kdepim-copy.5:${PORTSDIR}/deskutils/kdepim4-runtime

 pykde4_RUN_DEPENDS=		${KDE4_PYTHON_SITELIBDIR}/PyKDE4/kdeui.so:${PORTSDIR}/devel/kdebindings4-python-pykde4

-pykdeuic4_RUN_DEPENDS=		${LOCALBASE}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
+pykdeuic4_RUN_DEPENDS=		${KDE4_PREFIX}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4

-runtime_BUILD_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kdebase4-runtime
-runtime_RUN_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kdebase4-runtime
+runtime_BUILD_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kde4-runtime
+runtime_RUN_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kde4-runtime

 sharedmime_BUILD_DEPENDS=	kde4-shared-mime-info>=1:${PORTSDIR}/misc/kde4-shared-mime-info
 sharedmime_RUN_DEPENDS=		kde4-shared-mime-info>=1:${PORTSDIR}/misc/kde4-shared-mime-info

-workspace_LIB_DEPENDS=		kscreensaver.5:${PORTSDIR}/x11/kdebase4-workspace
+workspace_LIB_DEPENDS=		kscreensaver.5:${PORTSDIR}/x11/kde4-workspace


 PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}"
--- a/1
+++ b/1
@ -87,6 +87,7 @@ dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
 dovenull:*:144:144::0:0:Dovecot login User:/var/empty:/usr/sbin/nologin
 webcamd:*:145:145::0:0:Webcamd user:/var/empty:/usr/sbin/nologin
 ventrilo:*:146:146::0:0:& server:/usr/local/ventrilo-server:/usr/sbin/nologin
+kdm:*:147:147::0:0:KDE Display Manager:/nonexistent:/usr/sbin/nologin
 rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
 trircd:*:154:154::0:0:& user:/usr/local/etc/tr-ircd:/usr/sbin/nologin
 sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin
--- a/42
+++ b/42
@ -5,6 +5,48 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20111016
+  AFFECTS: users of KDE SC 4
+  AUTHOR: kde@FreeBSD.org
+
+  KDE SC has been updated to 4.7.2. A number of files were moved between
+  packages and several ports were split, thus manual intervention into
+  update procedure is required:
+
+  # pkg_delete -f raptor-1\* kdelibs-4\* kdebase-\*4\* \
+    kdeaccessibility-4\* kdeedu-4\* kdegames-4\* kdegraphics-4\* \
+    kdesdk-4\* kdeutils-4\* konq-plugins-4\* ktts\* nepomukcontroller\* \
+    ruby\*-kdebindings\* kdebindings-smoke\*
+  # pkg_delete -f kdehier4\*
+  # mv /usr/local/kde4/etc/pam.d/* \
+    /usr/local/etc/pam.d/
+  # mv /usr/local/kde4/etc/rc.d/* \
+    /usr/local/etc/rc.d/
+  # mv /usr/local/kde4/share/dbus-1/services/* \
+    /usr/local/share/dbus-1/services/
+  # mv /usr/local/kde4/share/dbus-1/system-services/* \
+    /usr/local/share/dbus-1/system-services/
+  # rmdir /usr/local/kde4/etc/pam.d /usr/local/kde4/etc/rc.d \
+    /usr/local/kde4/share/dbus-1/*services
+  # rm -r /var/tmp/kdecache-*
+  # portmaster misc/kdehier4
+  # portmaster -o net/linphone-base ortp
+  # portmaster -a
+
+  Remember to check for missing ports, bearing in mind that x11/kdebase4*
+  ports were replaced by x11/kde4-* ones, ktts was replaced by jovie, while
+  konq-plugins-kde4 and nepomukcontroller were removed. Then:
+
+  # portmaster --check-depends
+
+  You're also encouraged to run `pkg_cutleaves` or similar to check for
+  orphaned ports.
+
+  Please, note that `pkg_add -r kde4` will not install Plasma scriptengines
+  and printer utilities by default anymore, and `pkg_add -r kdegames4` will
+  not install Kajongg. This was made to avoid depending by default on
+  kdebindings.
+
 20111016:
  AFFECTS: users of devel/subversion, devel/subversion-freebsd,
           devel/p5-subversion, devel/py-subversion,
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@ -19,9 +19,9 @@
    SUBDIR += gnopernicus
    SUBDIR += gok
    SUBDIR += java-access-bridge
+    SUBDIR += jovie
    SUBDIR += kdeaccessibility
    SUBDIR += kdeaccessibility4
-    SUBDIR += ktts
    SUBDIR += linux-atk
    SUBDIR += linux-f10-atk
    SUBDIR += mousetweaks
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$
 #

-PORTNAME=	ktts
+PORTNAME=	jovie
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@ -14,31 +14,26 @@ DISTNAME=	kdeaccessibility-${PORTVERSION}
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE text-to-speech subsystem
+COMMENT=	KDE text-to-speech system

 LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher

+CONFLICTS=	ktts-4.[4-6].*
+
+DISTINFO_FILE=	${PORTSDIR}/accessibility/kdeaccessibility4/distinfo
 USE_BZIP2=	yes
 USE_CMAKE=	yes
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
-USE_LDCONFIG=	yes
-DISTINFO_FILE=	${PORTSDIR}/accessibility/kdeaccessibility4/distinfo
-MAKE_JOBS_SAFE=	yes
-
+QT_COMPONENTS=	xml qmake_build moc_build uic_build rcc_build
 CMAKE_ARGS+=	-DBUILD_kmousetool:BOOL=OFF
+MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	yes

-BUILD_WRKSRC=	${WRKSRC}/jovie
+BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-post-patch:
-	${REINPLACE_CMD} -e 's|speechd|$$$\{SPEECHD_LIBRARY}|g' \
-		${PATCH_WRKSRC}/jovie/kcmkttsmgr/CMakeLists.txt \
-		${PATCH_WRKSRC}/jovie/jovie/CMakeLists.txt
-
 post-install:
-	cd ${WRKSRC}/doc/jovie && ${MAKE} install
 	${CAT} ${PKGMESSAGE}

 .include <bsd.port.mk>
--- a/accessibility/jovie/pkg-message
+++ b/accessibility/jovie/pkg-message
@ -1,11 +1,11 @@
 ======================================================================

-To enable Text-to-Speech System (KTTSD), you first need to start
+To enable text-to-speech system, you first need to start
 speech-dispatcher and Jovie (locally):

 $ speech-dispatcher
 $ jovie

-You may want to launch them via the KDE Autostart module.
+You may want to launch them via the KDE autostart module.

 ======================================================================
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@ -22,26 +22,21 @@ USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	xtst
+QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xext xtst
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DBUILD_jovie=OFF

 MAN1=	kmag.1 \
 	kmousetool.1 \
 	kmouth.1

-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-OPTIONS=	KTTS "Enable KTTS speech service" off
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on

 .include <bsd.port.options.mk>

-.if defined(WITH_KTTS)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
+.ifndef(WITHOUT_JOVIE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's/speechd/$$$\{SPEECHD_LIBRARY}/g' \
-		${PATCH_WRKSRC}/kaccessible/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.6.5.tar.bz2) = 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-SIZE (KDE/kdeaccessibility-4.6.5.tar.bz2) = 5223262
+SHA256 (KDE/kdeaccessibility-4.7.2.tar.bz2) = 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
+SIZE (KDE/kdeaccessibility-4.7.2.tar.bz2) = 876861
--- a/accessibility/kaccessible/pkg-plist
+++ b/accessibility/kaccessible/pkg-plist
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@ -22,26 +22,21 @@ USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	xtst
+QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xext xtst
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DBUILD_jovie=OFF

 MAN1=	kmag.1 \
 	kmousetool.1 \
 	kmouth.1

-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-OPTIONS=	KTTS "Enable KTTS speech service" off
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on

 .include <bsd.port.options.mk>

-.if defined(WITH_KTTS)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
+.ifndef(WITHOUT_JOVIE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's/speechd/$$$\{SPEECHD_LIBRARY}/g' \
-		${PATCH_WRKSRC}/kaccessible/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/accessibility/kdeaccessibility4/distinfo
+++ b/accessibility/kdeaccessibility4/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.6.5.tar.bz2) = 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-SIZE (KDE/kdeaccessibility-4.6.5.tar.bz2) = 5223262
+SHA256 (KDE/kdeaccessibility-4.7.2.tar.bz2) = 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
+SIZE (KDE/kdeaccessibility-4.7.2.tar.bz2) = 876861
--- a/accessibility/kdeaccessibility4/pkg-plist
+++ b/accessibility/kdeaccessibility4/pkg-plist
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@ -22,26 +22,21 @@ USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	xtst
+QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xext xtst
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DBUILD_jovie=OFF

 MAN1=	kmag.1 \
 	kmousetool.1 \
 	kmouth.1

-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-OPTIONS=	KTTS "Enable KTTS speech service" off
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on

 .include <bsd.port.options.mk>

-.if defined(WITH_KTTS)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
+.ifndef(WITHOUT_JOVIE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's/speechd/$$$\{SPEECHD_LIBRARY}/g' \
-		${PATCH_WRKSRC}/kaccessible/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.6.5.tar.bz2) = 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-SIZE (KDE/kdeaccessibility-4.6.5.tar.bz2) = 5223262
+SHA256 (KDE/kdeaccessibility-4.7.2.tar.bz2) = 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
+SIZE (KDE/kdeaccessibility-4.7.2.tar.bz2) = 876861
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag/pkg-plist
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@ -22,26 +22,21 @@ USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	xtst
+QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xext xtst
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DBUILD_jovie=OFF

 MAN1=	kmag.1 \
 	kmousetool.1 \
 	kmouth.1

-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-OPTIONS=	KTTS "Enable KTTS speech service" off
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on

 .include <bsd.port.options.mk>

-.if defined(WITH_KTTS)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
+.ifndef(WITHOUT_JOVIE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's/speechd/$$$\{SPEECHD_LIBRARY}/g' \
-		${PATCH_WRKSRC}/kaccessible/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.6.5.tar.bz2) = 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-SIZE (KDE/kdeaccessibility-4.6.5.tar.bz2) = 5223262
+SHA256 (KDE/kdeaccessibility-4.7.2.tar.bz2) = 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
+SIZE (KDE/kdeaccessibility-4.7.2.tar.bz2) = 876861
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool/pkg-plist
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@ -22,26 +22,21 @@ USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	xtst
+QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xext xtst
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DBUILD_jovie=OFF

 MAN1=	kmag.1 \
 	kmousetool.1 \
 	kmouth.1

-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-OPTIONS=	KTTS "Enable KTTS speech service" off
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on

 .include <bsd.port.options.mk>

-.if defined(WITH_KTTS)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
+.ifndef(WITHOUT_JOVIE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's/speechd/$$$\{SPEECHD_LIBRARY}/g' \
-		${PATCH_WRKSRC}/kaccessible/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.6.5.tar.bz2) = 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-SIZE (KDE/kdeaccessibility-4.6.5.tar.bz2) = 5223262
+SHA256 (KDE/kdeaccessibility-4.7.2.tar.bz2) = 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
+SIZE (KDE/kdeaccessibility-4.7.2.tar.bz2) = 876861
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth/pkg-plist
--- a/accessibility/ktts/Makefile
+++ b/accessibility/ktts/Makefile
@ -1,44 +0,0 @@
-# New ports collection makefile for:	ktts
-# Date created:		2010-03-27
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ktts
-PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeaccessibility-${PORTVERSION}
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE text-to-speech subsystem
-
-LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
-
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdeprefix kdelibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
-USE_LDCONFIG=	yes
-DISTINFO_FILE=	${PORTSDIR}/accessibility/kdeaccessibility4/distinfo
-MAKE_JOBS_SAFE=	yes
-
-CMAKE_ARGS+=	-DBUILD_kmousetool:BOOL=OFF
-
-BUILD_WRKSRC=	${WRKSRC}/jovie
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-
-post-patch:
-	${REINPLACE_CMD} -e 's|speechd|$$$\{SPEECHD_LIBRARY}|g' \
-		${PATCH_WRKSRC}/jovie/kcmkttsmgr/CMakeLists.txt \
-		${PATCH_WRKSRC}/jovie/jovie/CMakeLists.txt
-
-post-install:
-	cd ${WRKSRC}/doc/jovie && ${MAKE} install
-	${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
--- a/accessibility/ktts/pkg-descr
+++ b/accessibility/ktts/pkg-descr
@ -1,6 +0,0 @@
-KTTS -- KDE Text-to-Speech -- is a subsystem within the KDE desktop
-for conversion of text to audible speech. KTTS is currently under
-development and aims to become the standard subsystem for all KDE
-applications to provide speech output.
-
-WWW:	http://www.kde.org/
--- a/accessibility/ktts/pkg-message
+++ b/accessibility/ktts/pkg-message
@ -1,11 +0,0 @@
-======================================================================
-
-To enable Text-to-Speech System (KTTSD), you first need to start
-speech-dispatcher and Jovie (locally):
-
-$ speech-dispatcher
-$ jovie
-
-You may want to launch them via the KDE Autostart module.
-
-======================================================================
--- a/accessibility/ktts/pkg-plist
+++ b/accessibility/ktts/pkg-plist
@ -1,58 +0,0 @@
-bin/jovie
-lib/kde4/jovie_stringreplacerplugin.so
-lib/kde4/jovie_talkerchooserplugin.so
-lib/kde4/jovie_xmltransformerplugin.so
-lib/kde4/kcm_kttsd.so
-lib/libkttsd.so
-lib/libkttsd.so.5
-lib/libkttsd.so.5.0.1
-share/applications/kde4/jovieapp.desktop
-share/apps/jovie/kcmkttsd_testmessage.desktop
-share/apps/jovie/stringreplacer/abbreviations.xml
-share/apps/jovie/stringreplacer/chat-de.xml
-share/apps/jovie/stringreplacer/chat.xml
-share/apps/jovie/stringreplacer/emoticons.xml
-share/apps/jovie/stringreplacer/festival_unspeakable_chars.xml
-share/apps/jovie/stringreplacer/kmail.xml
-share/apps/jovie/stringreplacer/polish_festival_fixes.xml
-share/apps/jovie/stringreplacer/polish_festival_unspeakables.xml
-share/apps/jovie/stringreplacer/qt2plaintext.xml
-share/apps/jovie/talkerchooser/female_notifications_rc
-share/apps/jovie/xmltransformer/xhtml2ssml.xsl
-share/apps/jovie/xmltransformer/xhtml2ssml_simple.xsl
-share/apps/kttsd/xslt/SSMLtoPlainText.xsl
-share/doc/HTML/en/jovie/addtalker.png
-share/doc/HTML/en/jovie/common
-share/doc/HTML/en/jovie/filters.png
-share/doc/HTML/en/jovie/general.png
-share/doc/HTML/en/jovie/index.cache.bz2
-share/doc/HTML/en/jovie/index.docbook
-share/doc/HTML/en/jovie/jobs.png
-share/doc/HTML/en/jovie/stringreplacer.png
-share/doc/HTML/en/jovie/talkerchooser.png
-share/doc/HTML/en/jovie/talkers.png
-share/doc/HTML/en/jovie/xmltransformer.png
-share/icons/hicolor/16x16/actions/female.png
-share/icons/hicolor/16x16/actions/male.png
-share/icons/hicolor/16x16/actions/nospeak.png
-share/icons/hicolor/16x16/actions/speak.png
-share/icons/hicolor/22x22/actions/nospeak.png
-share/icons/hicolor/22x22/actions/speak.png
-share/icons/hicolor/32x32/actions/nospeak.png
-share/icons/hicolor/32x32/actions/speak.png
-share/icons/hicolor/48x48/actions/nospeak.png
-share/icons/hicolor/48x48/actions/speak.png
-share/kde4/services/jovie.desktop
-share/kde4/services/jovie_stringreplacerplugin.desktop
-share/kde4/services/jovie_talkerchooserplugin.desktop
-share/kde4/services/jovie_xmltransformerplugin.desktop
-share/kde4/services/kcmkttsd.desktop
-share/kde4/services/kttsd.desktop
-share/kde4/servicetypes/jovie_filterplugin.desktop
-@dirrm share/doc/HTML/en/jovie
-@dirrm share/apps/kttsd/xslt
-@dirrm share/apps/kttsd
-@dirrm share/apps/jovie/xmltransformer
-@dirrm share/apps/jovie/talkerchooser
-@dirrm share/apps/jovie/stringreplacer
-@dirrm share/apps/jovie
--- a/arabic/kde4-l10n/distinfo
+++ b/arabic/kde4-l10n/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kde-l10n/kde-l10n-ar-4.6.5.tar.bz2) = dbe624ec1bb966951f1a5e026fe290b7c6079c3dc3502bf9f16b55c9da4cad9c
-SIZE (KDE/kde-l10n/kde-l10n-ar-4.6.5.tar.bz2) = 3563553
+SHA256 (KDE/kde-l10n/kde-l10n-ar-4.7.2.tar.bz2) = e27db561abfa68464d4662df3afdb969f325ebf5463e2956293998927d68409f
+SIZE (KDE/kde-l10n/kde-l10n-ar-4.7.2.tar.bz2) = 3593739
--- a/arabic/kde4-l10n/pkg-plist
+++ b/arabic/kde4-l10n/pkg-plist
@ -95,8 +95,6 @@ share/locale/ar/LC_MESSAGES/katefilebrowserplugin.mo
 share/locale/ar/LC_MESSAGES/katefiletemplates.mo
 share/locale/ar/LC_MESSAGES/katefindinfilesplugin.mo
 share/locale/ar/LC_MESSAGES/katehelloworld.mo
-share/locale/ar/LC_MESSAGES/kateinsertcommand.mo
-share/locale/ar/LC_MESSAGES/katekjswrapper.mo
 share/locale/ar/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/ar/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/ar/LC_MESSAGES/kateopenheader.mo
@ -343,6 +341,7 @@ share/locale/ar/LC_MESSAGES/krunner.mo
 share/locale/ar/LC_MESSAGES/ksaneplugin.mo
 share/locale/ar/LC_MESSAGES/kscd.mo
 share/locale/ar/LC_MESSAGES/kscreensaver.mo
+share/locale/ar/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/ar/LC_MESSAGES/kshisen.mo
 share/locale/ar/LC_MESSAGES/kshorturifilter.mo
 share/locale/ar/LC_MESSAGES/ksirk.mo
@ -365,7 +364,6 @@ share/locale/ar/LC_MESSAGES/ksystraycmd.mo
 share/locale/ar/LC_MESSAGES/kteatime.mo
 share/locale/ar/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/ar/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
-share/locale/ar/LC_MESSAGES/kthememanager.mo
 share/locale/ar/LC_MESSAGES/ktimer.mo
 share/locale/ar/LC_MESSAGES/ktimetracker.mo
 share/locale/ar/LC_MESSAGES/ktouch.mo
@ -384,7 +382,6 @@ share/locale/ar/LC_MESSAGES/kwin.mo
 share/locale/ar/LC_MESSAGES/kwin_art_clients.mo
 share/locale/ar/LC_MESSAGES/kwin_clients.mo
 share/locale/ar/LC_MESSAGES/kwin_effects.mo
-share/locale/ar/LC_MESSAGES/kwin_lib.mo
 share/locale/ar/LC_MESSAGES/kwinstartmenu.mo
 share/locale/ar/LC_MESSAGES/kwordquiz.mo
 share/locale/ar/LC_MESSAGES/kwrite.mo
@ -399,6 +396,7 @@ share/locale/ar/LC_MESSAGES/libkcal.mo
 share/locale/ar/LC_MESSAGES/libkcddb.mo
 share/locale/ar/LC_MESSAGES/libkcompactdisc.mo
 share/locale/ar/LC_MESSAGES/libkdcraw.mo
+share/locale/ar/LC_MESSAGES/libkdecorations.mo
 share/locale/ar/LC_MESSAGES/libkdeedu.mo
 share/locale/ar/LC_MESSAGES/libkdegames.mo
 share/locale/ar/LC_MESSAGES/libkdepim.mo
@ -466,7 +464,6 @@ share/locale/ar/LC_MESSAGES/okular_poppler.mo
 share/locale/ar/LC_MESSAGES/okular_tiff.mo
 share/locale/ar/LC_MESSAGES/okular_xps.mo
 share/locale/ar/LC_MESSAGES/parley.mo
-share/locale/ar/LC_MESSAGES/phonon-xine.mo
 share/locale/ar/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/ar/LC_MESSAGES/phonon_kde.mo
 share/locale/ar/LC_MESSAGES/phononserver.mo
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@ -6,52 +6,61 @@

 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Utilities for the KDE4 integrated X11 Desktop
+COMMENT=	Collection of utilities for KDE 4

 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		qca.2:${PORTSDIR}/devel/qca
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg

 LATEST_LINK=	${PORTNAME}4

-USE_BZIP2=	yes
-USE_QT_VER=	4
-USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace kdebase
-QT_COMPONENTS=	network gui porting xml \
+		kdelibs pimlibs workspace baseapps
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xrender xtst
+USE_BZIP2=	yes
+CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
+		-DBUILD_printer-applet:BOOL=FALSE
 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 \
+OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
+		LIRC "Support for IR remote controls" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
+		7ZIP "Support for 7-Zip archives in Ark" off \
 		RAR "Support for RAR archives in Ark" off \
 		ZIP "Support for ZIP archives in Ark" off

 .include <bsd.port.options.mk>

-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.ifndef(WITHOUT_FILELIGHT)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
+.endif
+
+.ifdef(WITH_LIRC)
+RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif

 .ifdef(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif

+.ifdef(WITH_7ZIP)
+RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.endif
+
 .ifdef(WITH_ZIP)
 RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
 		zip:${PORTSDIR}/archivers/zip
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.5.tar.bz2) = 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-SIZE (KDE/kdeutils-4.6.5.tar.bz2) = 3699961
+SHA256 (KDE/kdeutils-4.7.2.tar.bz2) = cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
+SIZE (KDE/kdeutils-4.7.2.tar.bz2) = 3800427
--- a/archivers/ark/files/patch-ark-kerfuffle-cliiterface.cpp
+++ b/archivers/ark/files/patch-ark-kerfuffle-cliiterface.cpp
@ -1,35 +0,0 @@
-SVN commit 1240907 by rkcosta:
-
-cliinterface: Do not assume a process does not exist in runProcess().
-
-The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when
-one is adding files to an archive (or creating an archive) processFinished()
-calls list(), which in turn calls runProcess() as well, thus making the assert
-fail.
-
-The best thing to do is just wait for the existing process to finish before
-launching the new one.
-
-Backport of r1240907, in case the 4.6 ever gets packaged again.
-
-CCBUG: 277393
-
-http://websvn.kde.org/?view=revision&revision=1240908
-- ark/kerfuffle/cliinterface.cpp	2011/06/01 20:35:06	1234597
-+++ ark/kerfuffle/cliinterface.cpp	2011/07/11 03:23:39	1240908
-@@ -325,10 +325,13 @@
-         return false;
-     }
- 
-    Q_ASSERT(!m_process);
-
-     kDebug() << "Executing" << programPath << arguments;
- 
-+    if (m_process) {
-+        m_process->waitForFinished();
-+        delete m_process;
-+    }
-+
- #ifdef Q_OS_WIN
-     m_process = new KProcess();
- #else
--- a/archivers/ark/files/patch-kcalc-kcalc.ui
+++ b/archivers/ark/files/patch-kcalc-kcalc.ui
@ -1,99 +0,0 @@
-SVN commit 1240130 by teran:
-
-rolling back change made by r1235446, it broke keybindings entirely.
-
-BUG: 277020
-
-http://websvn.kde.org/?view=revision&revision=1240130
--- kcalc/kcalc.ui	2011/06/05 18:25:18	1235446
-+++ kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
--- a/archivers/ark/pkg-descr
+++ b/archivers/ark/pkg-descr
@ -1 +1,4 @@
-KDE provides an integrated X11 based environment, much like CDE.
+The KDE utilities are a compilation of various desktop utilities,
+developed in the KDE module kdeutils.
+
+WWW: http://utils.kde.org
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@ -1,5 +1,4 @@
 bin/ark
-bin/filelight
 bin/kcalc
 bin/kcharselect
 bin/kdf
@ -12,7 +11,6 @@ bin/kwikdisk
 bin/superkaramba
 bin/sweeper
 lib/kde4/arkpart.so
-lib/kde4/filelightpart.so
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
 lib/kde4/kcm_remotecontrol.so
@ -24,6 +22,7 @@ lib/kde4/kerfuffle_libarchive.so
 lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
+lib/kde4/kremotecontrol_lirc.so
 lib/kde4/libextracthere.so
 lib/kde4/plasma_engine_kremoteconrol.so
 lib/kde4/plasma_package_superkaramba.so
@ -41,7 +40,6 @@ lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
-share/applications/kde4/filelight.desktop
 share/applications/kde4/kcalc.desktop
 share/applications/kde4/kdf.desktop
 share/applications/kde4/kgpg.desktop
@ -54,8 +52,6 @@ share/applications/kde4/superkaramba.desktop
 share/applications/kde4/sweeper.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
-share/apps/filelight/filelightui.rc
-share/apps/filelightpart/filelightpartui.rc
 share/apps/kcalc/kcalcui.rc
 share/apps/kcalc/scienceconstants.xml
 share/apps/kcharselect/kcharselectui.rc
@ -119,7 +115,6 @@ share/autostart/kgpg.desktop
 share/config.kcfg/ark.kcfg
 share/config.kcfg/kcalc.kcfg
 share/config.kcfg/kgpg.kcfg
-share/config/filelightrc
 share/config/superkaramba.knsrc
 share/dbus-1/interfaces/org.kde.kgpg.Key.xml
 share/dbus-1/interfaces/org.kde.superkaramba.xml
@ -129,13 +124,6 @@ share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/filelight/common
-share/doc/HTML/en/filelight/config_appear.png
-share/doc/HTML/en/filelight/config_scan.png
-share/doc/HTML/en/filelight/index.cache.bz2
-share/doc/HTML/en/filelight/index.docbook
-share/doc/HTML/en/filelight/radial_map.png
-share/doc/HTML/en/filelight/radial_map_context_menu.png
 share/doc/HTML/en/kcalc/commands.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
@ -211,7 +199,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
 share/icons/hicolor/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/filelight.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@ -223,7 +210,6 @@ share/icons/hicolor/16x16/apps/superkaramba.png
 share/icons/hicolor/16x16/devices/infrared-remote.png
 share/icons/hicolor/22x22/actions/krcd_flash.png
 share/icons/hicolor/22x22/actions/krcd_off.png
-share/icons/hicolor/22x22/apps/filelight.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
@ -232,8 +218,6 @@ share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
 share/icons/hicolor/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/actions/view_filelight.png
-share/icons/hicolor/32x32/apps/filelight.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@ -244,7 +228,6 @@ share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/superkaramba.png
 share/icons/hicolor/32x32/devices/infrared-remote.png
 share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/filelight.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@ -254,7 +237,6 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/superkaramba.png
 share/icons/hicolor/48x48/devices/infrared-remote.png
-share/icons/hicolor/64x64/apps/filelight.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
@ -278,7 +260,6 @@ share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
-share/kde4/services/filelightpart.desktop
 share/kde4/services/kcm_remotecontrol.desktop
 share/kde4/services/kcmdf.desktop
 share/kde4/services/kded/kremotecontroldaemon.desktop
@ -290,12 +271,15 @@ share/kde4/services/kerfuffle_libarchive_readonly.desktop
 share/kde4/services/kerfuffle_libbz2.desktop
 share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libxz.desktop
+share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
 share/kde4/services/kwalletconfig.desktop
 share/kde4/services/kwalletmanager_show.desktop
 share/kde4/services/plasma-engine-kremotecontrol.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
+share/kde4/servicetypes/kremotecontrolmanager.desktop
+@dirrm share/kde4/services/kremotecontrolbackends
@dirrmtry share/icons/oxygen/42x42/devices
@dirrmtry share/icons/oxygen/42x42
@dirrmtry share/icons/hicolor/8x8/devices
@ -312,7 +296,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/doc/HTML/en/kcontrol/blockdevices
@dirrm share/doc/HTML/en/kcharselect
@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/filelight
@dirrm share/doc/HTML/en/ark
@dirrm share/apps/sweeper
@dirrm share/apps/superkaramba
@ -344,6 +327,4 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/apps/kgpg
@dirrm share/apps/kdf
@dirrm share/apps/kcalc
-@dirrm share/apps/filelightpart
-@dirrm share/apps/filelight
@dirrm share/apps/ark
--- a/astro/Makefile
+++ b/astro/Makefile
@ -32,6 +32,7 @@
    SUBDIR += gpxloggerd
    SUBDIR += jday
    SUBDIR += josm
+    SUBDIR += kstars
    SUBDIR += libgal
    SUBDIR += libnova
    SUBDIR += libroadnav
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@ -0,0 +1,34 @@
+# New ports collection makefile for:	kstars
+# Date created:				6 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kstars
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	astro kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE 4 desktop planetarium
+
+LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio
+
+BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \
+		xplanet:${PORTSDIR}/astro/xplanet
+
+RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet
+
+CONFLICTS=	kdeedu-4.[0-6].*
+
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.mk>
--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/kstars-4.7.2.tar.bz2) = dd27e35642710dc34d59c4f12635f628243cf280e573cf7cf24ce6035f5cad8f
+SIZE (KDE/kstars-4.7.2.tar.bz2) = 13123677
--- a/astro/kstars/pkg-descr
+++ b/astro/kstars/pkg-descr
@ -0,0 +1,7 @@
+KStars is a desktop planetarium for KDE. It provides an accurate
+graphical simulation of the night sky, from any location on Earth, at
+any date and time. The display includes up to 100 million stars,
+13,000 deep-sky objects, all 8 planets, the Sun and Moon, and
+thousands of comets and asteroids.
+
+WWW:	http://edu.kde.org/kstars
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@ -0,0 +1,440 @@
+bin/kstars
+lib/libhtmesh.a
+share/applications/kde4/kstars.desktop
+share/apps/kstars/Cities.dat
+share/apps/kstars/TZrules.dat
+share/apps/kstars/advinterface.dat
+share/apps/kstars/asteroids.dat
+share/apps/kstars/cbounds-3.idx
+share/apps/kstars/cbounds-4.idx
+share/apps/kstars/cbounds-5.idx
+share/apps/kstars/cbounds-6.idx
+share/apps/kstars/cbounds.dat
+share/apps/kstars/chart.colors
+share/apps/kstars/classic.colors
+share/apps/kstars/clines.dat
+share/apps/kstars/cnames.dat
+share/apps/kstars/comets.dat
+share/apps/kstars/defaultflag.gif
+share/apps/kstars/earth.B0.vsop
+share/apps/kstars/earth.B1.vsop
+share/apps/kstars/earth.B2.vsop
+share/apps/kstars/earth.B3.vsop
+share/apps/kstars/earth.B4.vsop
+share/apps/kstars/earth.L0.vsop
+share/apps/kstars/earth.L1.vsop
+share/apps/kstars/earth.L2.vsop
+share/apps/kstars/earth.L3.vsop
+share/apps/kstars/earth.L4.vsop
+share/apps/kstars/earth.L5.vsop
+share/apps/kstars/earth.R0.vsop
+share/apps/kstars/earth.R1.vsop
+share/apps/kstars/earth.R2.vsop
+share/apps/kstars/earth.R3.vsop
+share/apps/kstars/earth.R4.vsop
+share/apps/kstars/earth.R5.vsop
+share/apps/kstars/earth.orbit
+share/apps/kstars/fitsviewer.rc
+share/apps/kstars/geomap.png
+share/apps/kstars/glossary.xml
+share/apps/kstars/histogram.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_cbound.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_advanced.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_catalog.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_cbound.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_colors.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_guides.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_solarsystem.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_xplanet.png
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_cbound.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_clines.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_cnames.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_deepsky.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_grid.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_horizon.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_mw.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_planets.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_stars.svgz
+share/apps/kstars/image_url.dat
+share/apps/kstars/info_url.dat
+share/apps/kstars/jupiter.B0.vsop
+share/apps/kstars/jupiter.B1.vsop
+share/apps/kstars/jupiter.B2.vsop
+share/apps/kstars/jupiter.B3.vsop
+share/apps/kstars/jupiter.B4.vsop
+share/apps/kstars/jupiter.B5.vsop
+share/apps/kstars/jupiter.L0.vsop
+share/apps/kstars/jupiter.L1.vsop
+share/apps/kstars/jupiter.L2.vsop
+share/apps/kstars/jupiter.L3.vsop
+share/apps/kstars/jupiter.L4.vsop
+share/apps/kstars/jupiter.L5.vsop
+share/apps/kstars/jupiter.R0.vsop
+share/apps/kstars/jupiter.R1.vsop
+share/apps/kstars/jupiter.R2.vsop
+share/apps/kstars/jupiter.R3.vsop
+share/apps/kstars/jupiter.R4.vsop
+share/apps/kstars/jupiter.R5.vsop
+share/apps/kstars/jupiter.orbit
+share/apps/kstars/kstars.png
+share/apps/kstars/kstarsui.rc
+share/apps/kstars/lmc.dat
+share/apps/kstars/mars.B0.vsop
+share/apps/kstars/mars.B1.vsop
+share/apps/kstars/mars.B2.vsop
+share/apps/kstars/mars.B3.vsop
+share/apps/kstars/mars.B4.vsop
+share/apps/kstars/mars.B5.vsop
+share/apps/kstars/mars.L0.vsop
+share/apps/kstars/mars.L1.vsop
+share/apps/kstars/mars.L2.vsop
+share/apps/kstars/mars.L3.vsop
+share/apps/kstars/mars.L4.vsop
+share/apps/kstars/mars.L5.vsop
+share/apps/kstars/mars.R0.vsop
+share/apps/kstars/mars.R1.vsop
+share/apps/kstars/mars.R2.vsop
+share/apps/kstars/mars.R3.vsop
+share/apps/kstars/mars.R4.vsop
+share/apps/kstars/mars.R5.vsop
+share/apps/kstars/mars.orbit
+share/apps/kstars/mercury.B0.vsop
+share/apps/kstars/mercury.B1.vsop
+share/apps/kstars/mercury.B2.vsop
+share/apps/kstars/mercury.B3.vsop
+share/apps/kstars/mercury.B4.vsop
+share/apps/kstars/mercury.B5.vsop
+share/apps/kstars/mercury.L0.vsop
+share/apps/kstars/mercury.L1.vsop
+share/apps/kstars/mercury.L2.vsop
+share/apps/kstars/mercury.L3.vsop
+share/apps/kstars/mercury.L4.vsop
+share/apps/kstars/mercury.L5.vsop
+share/apps/kstars/mercury.R0.vsop
+share/apps/kstars/mercury.R1.vsop
+share/apps/kstars/mercury.R2.vsop
+share/apps/kstars/mercury.R3.vsop
+share/apps/kstars/mercury.R4.vsop
+share/apps/kstars/mercury.R5.vsop
+share/apps/kstars/mercury.orbit
+share/apps/kstars/milkyway.dat
+share/apps/kstars/moonB.dat
+share/apps/kstars/moonLR.dat
+share/apps/kstars/moonless-night.colors
+share/apps/kstars/namedstars.dat
+share/apps/kstars/neptune.B0.vsop
+share/apps/kstars/neptune.B1.vsop
+share/apps/kstars/neptune.B2.vsop
+share/apps/kstars/neptune.B3.vsop
+share/apps/kstars/neptune.B4.vsop
+share/apps/kstars/neptune.B5.vsop
+share/apps/kstars/neptune.L0.vsop
+share/apps/kstars/neptune.L1.vsop
+share/apps/kstars/neptune.L2.vsop
+share/apps/kstars/neptune.L3.vsop
+share/apps/kstars/neptune.L4.vsop
+share/apps/kstars/neptune.L5.vsop
+share/apps/kstars/neptune.R0.vsop
+share/apps/kstars/neptune.R1.vsop
+share/apps/kstars/neptune.R2.vsop
+share/apps/kstars/neptune.R3.vsop
+share/apps/kstars/neptune.R4.vsop
+share/apps/kstars/neptune.orbit
+share/apps/kstars/ngcic.dat
+share/apps/kstars/night.colors
+share/apps/kstars/noimage.png
+share/apps/kstars/pluto.orbit
+share/apps/kstars/satellites.dat
+share/apps/kstars/saturn.B0.vsop
+share/apps/kstars/saturn.B1.vsop
+share/apps/kstars/saturn.B2.vsop
+share/apps/kstars/saturn.B3.vsop
+share/apps/kstars/saturn.B4.vsop
+share/apps/kstars/saturn.B5.vsop
+share/apps/kstars/saturn.L0.vsop
+share/apps/kstars/saturn.L1.vsop
+share/apps/kstars/saturn.L2.vsop
+share/apps/kstars/saturn.L3.vsop
+share/apps/kstars/saturn.L4.vsop
+share/apps/kstars/saturn.L5.vsop
+share/apps/kstars/saturn.R0.vsop
+share/apps/kstars/saturn.R1.vsop
+share/apps/kstars/saturn.R2.vsop
+share/apps/kstars/saturn.R3.vsop
+share/apps/kstars/saturn.R4.vsop
+share/apps/kstars/saturn.R5.vsop
+share/apps/kstars/saturn.orbit
+share/apps/kstars/smc.dat
+share/apps/kstars/starlnum.idx
+share/apps/kstars/starnames.dat
+share/apps/kstars/stars.dat
+share/apps/kstars/textures/defaultflag.png
+share/apps/kstars/textures/galaxy-cluster.png
+share/apps/kstars/textures/galaxy.png
+share/apps/kstars/textures/gaseous-nebula.png
+share/apps/kstars/textures/globular-cluster.png
+share/apps/kstars/textures/jupiter.png
+share/apps/kstars/textures/mars.png
+share/apps/kstars/textures/mercury.png
+share/apps/kstars/textures/moon00.png
+share/apps/kstars/textures/moon01.png
+share/apps/kstars/textures/moon02.png
+share/apps/kstars/textures/moon03.png
+share/apps/kstars/textures/moon04.png
+share/apps/kstars/textures/moon05.png
+share/apps/kstars/textures/moon06.png
+share/apps/kstars/textures/moon07.png
+share/apps/kstars/textures/moon08.png
+share/apps/kstars/textures/moon09.png
+share/apps/kstars/textures/moon10.png
+share/apps/kstars/textures/moon11.png
+share/apps/kstars/textures/moon12.png
+share/apps/kstars/textures/moon13.png
+share/apps/kstars/textures/moon14.png
+share/apps/kstars/textures/moon15.png
+share/apps/kstars/textures/moon16.png
+share/apps/kstars/textures/moon17.png
+share/apps/kstars/textures/moon18.png
+share/apps/kstars/textures/moon19.png
+share/apps/kstars/textures/moon20.png
+share/apps/kstars/textures/moon21.png
+share/apps/kstars/textures/moon22.png
+share/apps/kstars/textures/moon23.png
+share/apps/kstars/textures/moon24.png
+share/apps/kstars/textures/moon25.png
+share/apps/kstars/textures/moon26.png
+share/apps/kstars/textures/moon27.png
+share/apps/kstars/textures/moon28.png
+share/apps/kstars/textures/moon29.png
+share/apps/kstars/textures/moon30.png
+share/apps/kstars/textures/moon31.png
+share/apps/kstars/textures/moon32.png
+share/apps/kstars/textures/moon33.png
+share/apps/kstars/textures/moon34.png
+share/apps/kstars/textures/moon35.png
+share/apps/kstars/textures/neptune.png
+share/apps/kstars/textures/obslistsymbol.png
+share/apps/kstars/textures/open-cluster.png
+share/apps/kstars/textures/planetary-nebula.png
+share/apps/kstars/textures/pluto.png
+share/apps/kstars/textures/saturn.png
+share/apps/kstars/textures/star.png
+share/apps/kstars/textures/sun.png
+share/apps/kstars/textures/uranus.png
+share/apps/kstars/textures/venus.png
+share/apps/kstars/tips
+share/apps/kstars/unnamedstars.dat
+share/apps/kstars/uranus.B0.vsop
+share/apps/kstars/uranus.B1.vsop
+share/apps/kstars/uranus.B2.vsop
+share/apps/kstars/uranus.B3.vsop
+share/apps/kstars/uranus.B4.vsop
+share/apps/kstars/uranus.L0.vsop
+share/apps/kstars/uranus.L1.vsop
+share/apps/kstars/uranus.L2.vsop
+share/apps/kstars/uranus.L3.vsop
+share/apps/kstars/uranus.L4.vsop
+share/apps/kstars/uranus.L5.vsop
+share/apps/kstars/uranus.R0.vsop
+share/apps/kstars/uranus.R1.vsop
+share/apps/kstars/uranus.R2.vsop
+share/apps/kstars/uranus.R3.vsop
+share/apps/kstars/uranus.R4.vsop
+share/apps/kstars/uranus.orbit
+share/apps/kstars/valaav.txt
+share/apps/kstars/venus.B0.vsop
+share/apps/kstars/venus.B1.vsop
+share/apps/kstars/venus.B2.vsop
+share/apps/kstars/venus.B3.vsop
+share/apps/kstars/venus.B4.vsop
+share/apps/kstars/venus.B5.vsop
+share/apps/kstars/venus.L0.vsop
+share/apps/kstars/venus.L1.vsop
+share/apps/kstars/venus.L2.vsop
+share/apps/kstars/venus.L3.vsop
+share/apps/kstars/venus.L4.vsop
+share/apps/kstars/venus.L5.vsop
+share/apps/kstars/venus.R0.vsop
+share/apps/kstars/venus.R1.vsop
+share/apps/kstars/venus.R2.vsop
+share/apps/kstars/venus.R3.vsop
+share/apps/kstars/venus.R4.vsop
+share/apps/kstars/venus.R5.vsop
+share/apps/kstars/venus.orbit
+share/apps/kstars/wzdownload.png
+share/apps/kstars/wzgeo.png
+share/apps/kstars/wzscope.png
+share/apps/kstars/wzstars.png
+share/config.kcfg/kstars.kcfg
+share/config/kstars.knsrc
+share/doc/HTML/en/kstars/aavso.png
+share/doc/HTML/en/kstars/ai-contents.docbook
+share/doc/HTML/en/kstars/alpha.png
+share/doc/HTML/en/kstars/altvstime.docbook
+share/doc/HTML/en/kstars/altvstime.png
+share/doc/HTML/en/kstars/astroinfo.docbook
+share/doc/HTML/en/kstars/blackbody.docbook
+share/doc/HTML/en/kstars/blackbody.png
+share/doc/HTML/en/kstars/calc-angdist.docbook
+share/doc/HTML/en/kstars/calc-angdist.png
+share/doc/HTML/en/kstars/calc-apcoords.docbook
+share/doc/HTML/en/kstars/calc-apcoords.png
+share/doc/HTML/en/kstars/calc-dayduration.docbook
+share/doc/HTML/en/kstars/calc-daylength.png
+share/doc/HTML/en/kstars/calc-ecliptic.docbook
+share/doc/HTML/en/kstars/calc-ecliptic.png
+share/doc/HTML/en/kstars/calc-eqgal.docbook
+share/doc/HTML/en/kstars/calc-eqgal.png
+share/doc/HTML/en/kstars/calc-equinox.docbook
+share/doc/HTML/en/kstars/calc-equinox.png
+share/doc/HTML/en/kstars/calc-geodetic.docbook
+share/doc/HTML/en/kstars/calc-geodetic.png
+share/doc/HTML/en/kstars/calc-horizontal.docbook
+share/doc/HTML/en/kstars/calc-horizontal.png
+share/doc/HTML/en/kstars/calc-julian.png
+share/doc/HTML/en/kstars/calc-julianday.docbook
+share/doc/HTML/en/kstars/calc-planetcoords.docbook
+share/doc/HTML/en/kstars/calc-planetcoords.png
+share/doc/HTML/en/kstars/calc-sidereal.docbook
+share/doc/HTML/en/kstars/calc-sidereal.png
+share/doc/HTML/en/kstars/calculator.docbook
+share/doc/HTML/en/kstars/cequator.docbook
+share/doc/HTML/en/kstars/color_indices.png
+share/doc/HTML/en/kstars/colorandtemp.docbook
+share/doc/HTML/en/kstars/commands.docbook
+share/doc/HTML/en/kstars/common
+share/doc/HTML/en/kstars/config.docbook
+share/doc/HTML/en/kstars/cpoles.docbook
+share/doc/HTML/en/kstars/credits.docbook
+share/doc/HTML/en/kstars/csphere.docbook
+share/doc/HTML/en/kstars/darkmatter.docbook
+share/doc/HTML/en/kstars/detaildialog.png
+share/doc/HTML/en/kstars/details.docbook
+share/doc/HTML/en/kstars/devicemanager.png
+share/doc/HTML/en/kstars/dumpmode.docbook
+share/doc/HTML/en/kstars/ecliptic.docbook
+share/doc/HTML/en/kstars/ellipticalgalaxies.docbook
+share/doc/HTML/en/kstars/equinox.docbook
+share/doc/HTML/en/kstars/faq.docbook
+share/doc/HTML/en/kstars/find.png
+share/doc/HTML/en/kstars/fitsarea.png
+share/doc/HTML/en/kstars/fitsviewer.docbook
+share/doc/HTML/en/kstars/flux.docbook
+share/doc/HTML/en/kstars/flux.png
+share/doc/HTML/en/kstars/flux1.png
+share/doc/HTML/en/kstars/flux2.png
+share/doc/HTML/en/kstars/fovdialog.png
+share/doc/HTML/en/kstars/geocoords.docbook
+share/doc/HTML/en/kstars/geolocator.png
+share/doc/HTML/en/kstars/greatcircle.docbook
+share/doc/HTML/en/kstars/horizon.docbook
+share/doc/HTML/en/kstars/hourangle.docbook
+share/doc/HTML/en/kstars/index.cache.bz2
+share/doc/HTML/en/kstars/index.docbook
+share/doc/HTML/en/kstars/indi.docbook
+share/doc/HTML/en/kstars/indicapture.png
+share/doc/HTML/en/kstars/indiclient.png
+share/doc/HTML/en/kstars/indicontrolpanel.png
+share/doc/HTML/en/kstars/install.docbook
+share/doc/HTML/en/kstars/jmoons.docbook
+share/doc/HTML/en/kstars/jmoons.png
+share/doc/HTML/en/kstars/julianday.docbook
+share/doc/HTML/en/kstars/kepler2nd.png
+share/doc/HTML/en/kstars/kepler3d.png
+share/doc/HTML/en/kstars/lambda_ex.png
+share/doc/HTML/en/kstars/lambda_max.png
+share/doc/HTML/en/kstars/leapyear.docbook
+share/doc/HTML/en/kstars/lightcurve.png
+share/doc/HTML/en/kstars/lightcurves.docbook
+share/doc/HTML/en/kstars/luminosity.docbook
+share/doc/HTML/en/kstars/luminosity.png
+share/doc/HTML/en/kstars/luminosity_ex.png
+share/doc/HTML/en/kstars/magnitude.docbook
+share/doc/HTML/en/kstars/meridian.docbook
+share/doc/HTML/en/kstars/newfov.png
+share/doc/HTML/en/kstars/observinglist.docbook
+share/doc/HTML/en/kstars/observinglist.png
+share/doc/HTML/en/kstars/parallax.docbook
+share/doc/HTML/en/kstars/popup.png
+share/doc/HTML/en/kstars/precession.docbook
+share/doc/HTML/en/kstars/quicktour.docbook
+share/doc/HTML/en/kstars/retrograde.docbook
+share/doc/HTML/en/kstars/screen1.png
+share/doc/HTML/en/kstars/scriptbuilder.docbook
+share/doc/HTML/en/kstars/scriptbuilder.png
+share/doc/HTML/en/kstars/sidereal.docbook
+share/doc/HTML/en/kstars/skycoords.docbook
+share/doc/HTML/en/kstars/skymapdevice.png
+share/doc/HTML/en/kstars/solarsys.docbook
+share/doc/HTML/en/kstars/solarsystem.png
+share/doc/HTML/en/kstars/spiralgalaxies.docbook
+share/doc/HTML/en/kstars/star_colors.png
+share/doc/HTML/en/kstars/stars.docbook
+share/doc/HTML/en/kstars/timezones.docbook
+share/doc/HTML/en/kstars/tools.docbook
+share/doc/HTML/en/kstars/utime.docbook
+share/doc/HTML/en/kstars/viewops.png
+share/doc/HTML/en/kstars/wut.docbook
+share/doc/HTML/en/kstars/wut.png
+share/doc/HTML/en/kstars/zenith.docbook
+share/icons/hicolor/128x128/apps/kstars.png
+share/icons/hicolor/16x16/apps/kstars.png
+share/icons/hicolor/32x32/apps/kstars.png
+share/icons/hicolor/48x48/apps/kstars.png
+share/icons/hicolor/64x64/apps/kstars.png
+share/icons/hicolor/scalable/apps/kstars.svgz
+@dirrm share/doc/HTML/en/kstars
+@dirrm share/apps/kstars/textures
+@dirrm share/apps/kstars/icons/hicolor/scalable/actions
+@dirrm share/apps/kstars/icons/hicolor/scalable
+@dirrm share/apps/kstars/icons/hicolor/64x64/actions
+@dirrm share/apps/kstars/icons/hicolor/64x64
+@dirrm share/apps/kstars/icons/hicolor/48x48/actions
+@dirrm share/apps/kstars/icons/hicolor/48x48
+@dirrm share/apps/kstars/icons/hicolor/32x32/actions
+@dirrm share/apps/kstars/icons/hicolor/32x32
+@dirrm share/apps/kstars/icons/hicolor/22x22/actions
+@dirrm share/apps/kstars/icons/hicolor/22x22
+@dirrm share/apps/kstars/icons/hicolor
+@dirrm share/apps/kstars/icons
+@dirrm share/apps/kstars
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@ -10,25 +10,36 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeedu-${PORTVERSION}
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE

-LIB_DEPENDS=	gps.20:${PORTSDIR}/astro/gpsd
+CONFLICTS=	kdeedu-4.4.[0-4]

-CONFLICTS=	kdeedu-4.5.[0-5]
-
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG=	yes
-DISTINFO_FILE=	${PORTSDIR}/misc/kdeedu4/distinfo
+QT_COMPONENTS=	dbus declarative gui network \
+		phonon script sql svg webkit xml \
+		qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes

-WRKSRC=		${WRKDIR}/${DISTNAME}/marble
-CMAKE_OUTSOURCE=	yes
+OPTIONS=	GPS "Support for GPS position provider" on
+
+.include <bsd.port.options.mk>
+
+.ifndef(WITHOUT_GPS)
+LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
+PLIST_SUB+=	GPS=""
+.else
+CMAKE_ARGS+=	-DWITH_libgps:BOOL=FALSE
+PLIST_SUB+=	GPS="@comment "
+.endif
+
+pre-configure:
+	${REINPLACE_CMD} -e '/libgps/ s/FIND_PACKAGE/macro_optional_find_package/' \
+		${WRKSRC}/src/plugins/positionprovider/CMakeLists.txt

 .include <bsd.port.mk>
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/marble-4.7.2.tar.bz2) = d9d9d8f522f6fead4c2a13afd1f76ec03ee87a37d4b8d35a6b20cf6fa11633c4
+SIZE (KDE/marble-4.7.2.tar.bz2) = 21066804
--- a/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp
+++ b/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp
@ -1,64 +0,0 @@
--- ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig	2011-03-22 18:32:49.000000000 +0300
-+++ ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp	2011-03-22 19:24:18.000000000 +0300
-@@ -18,7 +18,8 @@
- 
- GpsdConnection::GpsdConnection( QObject* parent )
-     : QObject( parent ),
-      m_timer( 0 )
-+      m_timer( 0 ),
-+      m_gpsd("localhost", DEFAULT_GPSD_PORT)
- {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
- }
-@@ -26,15 +27,15 @@
- void GpsdConnection::initialize()
- {
-     m_timer.stop();
-    gps_data_t* data = m_gpsd.open();
-    if ( data ) {
-+#if 0	/* I don't see error handling in the new libgpsmm API */
-+    if ( m_gpsd.to_user != NULL ) {
-+#endif
-         m_status = PositionProviderStatusAcquiring;
-         emit statusChanged( m_status );
- 
-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE )
-         m_gpsd.stream( WATCH_ENABLE );
-#endif
-         m_timer.start( 1000 );
-+#if 0
-     }
-     else {
-         // There is also gps_errstr() for libgps version >= 2.90,
-@@ -68,28 +69,17 @@
- 
-         mDebug() << "Connection to gpsd failed, no position info available: " << m_error;
-     }
-+#endif
- }
- 
- void GpsdConnection::update()
- {
-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-    if ( m_gpsd.waiting() ) {
-        gps_data_t* data = m_gpsd.poll();
-+    if ( m_gpsd.waiting(5000000) ) {
-+        gps_data_t* data = m_gpsd.read();
-         if ( data && data->set & PACKET_SET ) {
-             emit gpsdInfo( *data );
-         }
-     }
-#else
-    gps_data_t* data = m_gpsd.query( "o" );
-
-    if ( data ) {
-        emit gpsdInfo( *data );
-    }
-    else if ( m_status != PositionProviderStatusAcquiring ) {
-        mDebug() << "Lost connection to gpsd, trying to re-open.";
-        initialize();
-    }
-#endif
- }
- 
- QString GpsdConnection::error() const
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@ -9,6 +9,7 @@ include/marble/AbstractFloatItem.h
 include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
+include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
 include/marble/DownloadRegionDialog.h
@ -54,16 +55,17 @@ include/marble/LayerInterface.h
 include/marble/LegendWidget.h
 include/marble/MapThemeManager.h
 include/marble/MapViewWidget.h
+include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
 include/marble/MarbleAbstractRunner.h
 include/marble/MarbleControlBox.h
-include/marble/MarbleDataFacade.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGraphicsGridLayout.h
 include/marble/MarbleGraphicsItem.h
 include/marble/MarbleMap.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
+include/marble/MarbleRunnerManager.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MercatorProjection.h
@ -99,16 +101,19 @@ lib/kde4/plasma_applet_worldclock.so
 lib/kde4/plugins/marble/AprsPlugin.so
 lib/kde4/plugins/marble/CompassFloatItem.so
 lib/kde4/plugins/marble/CrosshairsPlugin.so
+lib/kde4/plugins/marble/EarthquakePlugin.so
 lib/kde4/plugins/marble/GosmorePlugin.so
-lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
+%%GPS%%lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
 lib/kde4/plugins/marble/GraticulePlugin.so
 lib/kde4/plugins/marble/HostipPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
+lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
 lib/kde4/plugins/marble/MapScaleFloatItem.so
 lib/kde4/plugins/marble/MonavPlugin.so
 lib/kde4/plugins/marble/NavigationFloatItem.so
 lib/kde4/plugins/marble/NominatimPlugin.so
+lib/kde4/plugins/marble/OpenDesktopPlugin.so
 lib/kde4/plugins/marble/OpenRouteServicePlugin.so
 lib/kde4/plugins/marble/OverviewMap.so
 lib/kde4/plugins/marble/Photo.so
@ -124,13 +129,16 @@ lib/kde4/plugins/marble/YoursPlugin.so
 lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 lib/kde4/plugins/marble/org/kde/edu/marble/qmldir
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.11.0
-lib/libmarblewidget.so.11
+lib/libmarblewidget.so.0.12.0
+lib/libmarblewidget.so.12
 share/applications/kde4/marble.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
+share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
+share/apps/marble/data/audio/KDE-Sys-List-End.ogg
 share/apps/marble/data/bitmaps/airport.png
 share/apps/marble/data/bitmaps/annotation.png
+share/apps/marble/data/bitmaps/bookmark.png
 share/apps/marble/data/bitmaps/border_1.png
 share/apps/marble/data/bitmaps/border_2.png
 share/apps/marble/data/bitmaps/city_1_orange.png
@ -161,6 +169,7 @@ share/apps/marble/data/bitmaps/cursor_tl.xpm
 share/apps/marble/data/bitmaps/cursor_tr.xpm
 share/apps/marble/data/bitmaps/default_location.png
 share/apps/marble/data/bitmaps/earth_apollo.jpg
+share/apps/marble/data/bitmaps/folder.png
 share/apps/marble/data/bitmaps/hand.png
 share/apps/marble/data/bitmaps/lake.png
 share/apps/marble/data/bitmaps/manned_landing.png
@ -170,6 +179,51 @@ share/apps/marble/data/bitmaps/observatory.png
 share/apps/marble/data/bitmaps/ocean.png
 share/apps/marble/data/bitmaps/osm.png
 share/apps/marble/data/bitmaps/other.png
+share/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_motel.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_youth_hostel.p.16.png
+share/apps/marble/data/bitmaps/poi/amenity_library.p.16.png
+share/apps/marble/data/bitmaps/poi/education_college.p.16.png
+share/apps/marble/data/bitmaps/poi/education_school.p.16.png
+share/apps/marble/data/bitmaps/poi/education_university.p.16.png
+share/apps/marble/data/bitmaps/poi/food_bar.p.16.png
+share/apps/marble/data/bitmaps/poi/food_biergarten.p.16.png
+share/apps/marble/data/bitmaps/poi/food_cafe.p.16.png
+share/apps/marble/data/bitmaps/poi/food_fastfood2.p.16.png
+share/apps/marble/data/bitmaps/poi/food_pub.p.16.png
+share/apps/marble/data/bitmaps/poi/food_restaurant.p.16.png
+share/apps/marble/data/bitmaps/poi/health_doctors2.p.16.png
+share/apps/marble/data/bitmaps/poi/health_hospital.p.16.png
+share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png
+share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png
+share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_attraction.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_castle2.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_cinema.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_monument.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_museum.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_ruin.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_theatre.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_theme_park.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_view_point.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_zoo.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_aerodrome.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_airport_terminal.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_bus_station.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_bus_stop.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_car_share.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_fuel.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_parking.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_rental_bicycle.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_rental_car.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_taxi_rank.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_train_station.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_tram_stop.p.16.png
 share/apps/marble/data/bitmaps/pole_1.png
 share/apps/marble/data/bitmaps/pole_2.png
 share/apps/marble/data/bitmaps/river.png
@ -462,6 +516,7 @@ share/apps/marble/data/maps/earth/citylights/legend/lightterrain.png
 share/apps/marble/data/maps/earth/citylights/legend/water.png
 share/apps/marble/data/maps/earth/clouds/0/000000/000000_000000.jpg
 share/apps/marble/data/maps/earth/clouds/0/000000/000000_000001.jpg
+share/apps/marble/data/maps/earth/hillshading/0/0/0.png
 share/apps/marble/data/maps/earth/openstreetmap/0/0/0.png
 share/apps/marble/data/maps/earth/openstreetmap/legend.html
 share/apps/marble/data/maps/earth/openstreetmap/legend/airportapron.png
@ -700,7 +755,6 @@ share/apps/marble/data/mwdbii/RIVER.PNT
 share/apps/marble/data/placemarks/baseplacemarks.cache
 share/apps/marble/data/placemarks/boundaryplacemarks.cache
 share/apps/marble/data/placemarks/cityplacemarks.cache
-share/apps/marble/data/placemarks/cityplacemarks_large_population.cache
 share/apps/marble/data/placemarks/elevplacemarks.cache
 share/apps/marble/data/placemarks/moonlandingsites.cache
 share/apps/marble/data/placemarks/moonterrain.cache
@ -711,7 +765,6 @@ share/apps/marble/data/stars/stars.dat
 share/apps/marble/data/svg/application-x-marble-gray.png
 share/apps/marble/data/svg/application-x-marble.png
 share/apps/marble/data/svg/application-x-marble.svg
-share/apps/marble/data/svg/compass.svg
 share/apps/marble/data/svg/coordinate.svg
 share/apps/marble/data/svg/lunarmap.svg
 share/apps/marble/data/svg/marble-logo-32dpi.png
@ -721,6 +774,7 @@ share/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 share/apps/marble/data/svg/marble-logo.png
 share/apps/marble/data/svg/marble-logo.svg
 share/apps/marble/data/svg/sunshine.png
+share/apps/marble/data/svg/track_turtle.svg
 share/apps/marble/data/svg/wikipedia.svg
 share/apps/marble/data/svg/wikipedia_shadow.svg
 share/apps/marble/data/svg/worldmap.svg
@ -752,8 +806,8 @@ share/apps/marble/data/weather/weather-storm-night.png
 share/apps/marble/data/weather/weather-storm.png
 share/apps/marble/data/weather/wind-arrows.svgz
 share/apps/marble/marble.knsrc
+share/apps/marble/marble_part.rc
 share/apps/marble/marbleui.rc
-share/apps/marble_part/marble_part.rc
 share/config.kcfg/marble.kcfg
 share/doc/HTML/en/marble/common
 share/doc/HTML/en/marble/configure-cacheproxy.png
@ -787,7 +841,6 @@ share/icons/hicolor/64x64/apps/marble.png
 share/kde4/services/marble_part.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
@dirrm share/doc/HTML/en/marble
-@dirrm share/apps/marble_part
@dirrm share/apps/marble/data/weather
@dirrm share/apps/marble/data/svg
@dirrm share/apps/marble/data/stars
@ -826,6 +879,9 @@ share/kde4/services/plasma-applet-kworldclock.desktop
@dirrm share/apps/marble/data/maps/earth/openstreetmap/0/0
@dirrm share/apps/marble/data/maps/earth/openstreetmap/0
@dirrm share/apps/marble/data/maps/earth/openstreetmap
+@dirrm share/apps/marble/data/maps/earth/hillshading/0/0
+@dirrm share/apps/marble/data/maps/earth/hillshading/0
+@dirrm share/apps/marble/data/maps/earth/hillshading
@dirrm share/apps/marble/data/maps/earth/clouds/0/000000
@dirrm share/apps/marble/data/maps/earth/clouds/0
@dirrm share/apps/marble/data/maps/earth/clouds
@ -837,7 +893,9 @@ share/kde4/services/plasma-applet-kworldclock.desktop
@dirrm share/apps/marble/data/maps
@dirrm share/apps/marble/data/licenses
@dirrm share/apps/marble/data/flags
+@dirrm share/apps/marble/data/bitmaps/poi
@dirrm share/apps/marble/data/bitmaps
+@dirrm share/apps/marble/data/audio
@dirrm share/apps/marble/data
@dirrm share/apps/marble
@dirrm lib/kde4/plugins/marble/org/kde/edu/marble
--- a/chinese/kde4-l10n-zh_CN/distinfo
+++ b/chinese/kde4-l10n-zh_CN/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kde-l10n/kde-l10n-zh_CN-4.6.5.tar.bz2) = 516f77d85bf9aac72ff6f834b40d95512540411b5171444e93d222ccbeec1d3c
-SIZE (KDE/kde-l10n/kde-l10n-zh_CN-4.6.5.tar.bz2) = 3625564
+SHA256 (KDE/kde-l10n/kde-l10n-zh_CN-4.7.2.tar.bz2) = 3944d5cbd54e51d2ab92860c67832a203acf83b33e3733561d73c0d6409d4565
+SIZE (KDE/kde-l10n/kde-l10n-zh_CN-4.7.2.tar.bz2) = 3664744
--- a/chinese/kde4-l10n-zh_CN/pkg-plist
+++ b/chinese/kde4-l10n-zh_CN/pkg-plist
@ -39,6 +39,7 @@ share/doc/HTML/zh_CN/gwenview/keybindings.docbook
 share/doc/HTML/zh_CN/gwenview/mouse.docbook
 share/doc/HTML/zh_CN/gwenview/view_mode.png
 share/locale/zh_CN/LC_MESSAGES/accountwizard.mo
+share/locale/zh_CN/LC_MESSAGES/accountwizard_ical.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_imap.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_kolab.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_mailbox.mo
@ -53,6 +54,9 @@ share/locale/zh_CN/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_invitations_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_kabc_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_kalarm_dir_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_kalarm_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_kalarm_resource_common.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_kcal_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_kdeaccounts_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_knut_resource.mo
@ -72,7 +76,9 @@ share/locale/zh_CN/LC_MESSAGES/akonadi_next.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nntp_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_openxchange_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_pop3_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_serializer_plugins.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_singlefile_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_strigi_feeder.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_vcard_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_vcarddir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadicontact.mo
@ -148,13 +154,12 @@ share/locale/zh_CN/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_CN/LC_MESSAGES/katefindinfilesplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kategdbplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katehelloworld.mo
-share/locale/zh_CN/LC_MESSAGES/kateinsertcommand.mo
-share/locale/zh_CN/LC_MESSAGES/katekjswrapper.mo
 share/locale/zh_CN/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_CN/LC_MESSAGES/katepart4.mo
 share/locale/zh_CN/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+share/locale/zh_CN/LC_MESSAGES/katesearch.mo
 share/locale/zh_CN/LC_MESSAGES/katesnippets_tng.mo
 share/locale/zh_CN/LC_MESSAGES/katesql.mo
 share/locale/zh_CN/LC_MESSAGES/katesymbolviewer.mo
@ -258,11 +263,13 @@ share/locale/zh_CN/LC_MESSAGES/kdecalendarsystems.mo
 share/locale/zh_CN/LC_MESSAGES/kdelibs4.mo
 share/locale/zh_CN/LC_MESSAGES/kdelibs_colors4.mo
 share/locale/zh_CN/LC_MESSAGES/kdepasswd.mo
+share/locale/zh_CN/LC_MESSAGES/kdepim-runtime-qml.mo
 share/locale/zh_CN/LC_MESSAGES/kdepimwizards.mo
 share/locale/zh_CN/LC_MESSAGES/kdeqt.mo
 share/locale/zh_CN/LC_MESSAGES/kdesu.mo
 share/locale/zh_CN/LC_MESSAGES/kdesud.mo
 share/locale/zh_CN/LC_MESSAGES/kdf.mo
+share/locale/zh_CN/LC_MESSAGES/kdgantt2.mo
 share/locale/zh_CN/LC_MESSAGES/kdialog.mo
 share/locale/zh_CN/LC_MESSAGES/kdiamond.mo
 share/locale/zh_CN/LC_MESSAGES/kdmconfig.mo
@ -276,6 +283,7 @@ share/locale/zh_CN/LC_MESSAGES/kfile_drgeo.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_exr.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_flac.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_kig.mo
+share/locale/zh_CN/LC_MESSAGES/kfile_mail.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_mp3.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_mpc.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_ogg.mo
@ -423,6 +431,7 @@ share/locale/zh_CN/LC_MESSAGES/ksaneplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kscd.mo
 share/locale/zh_CN/LC_MESSAGES/kscreensaver.mo
 share/locale/zh_CN/LC_MESSAGES/ksendemail.mo
+share/locale/zh_CN/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kshisen.mo
 share/locale/zh_CN/LC_MESSAGES/kshorturifilter.mo
 share/locale/zh_CN/LC_MESSAGES/ksirk.mo
@ -448,7 +457,6 @@ share/locale/zh_CN/LC_MESSAGES/ktesnippets_editor.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditor_codesnippets_core.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
-share/locale/zh_CN/LC_MESSAGES/kthememanager.mo
 share/locale/zh_CN/LC_MESSAGES/ktimer.mo
 share/locale/zh_CN/LC_MESSAGES/ktimetracker.mo
 share/locale/zh_CN/LC_MESSAGES/ktouch.mo
@ -469,7 +477,7 @@ share/locale/zh_CN/LC_MESSAGES/kwin.mo
 share/locale/zh_CN/LC_MESSAGES/kwin_art_clients.mo
 share/locale/zh_CN/LC_MESSAGES/kwin_clients.mo
 share/locale/zh_CN/LC_MESSAGES/kwin_effects.mo
-share/locale/zh_CN/LC_MESSAGES/kwin_lib.mo
+share/locale/zh_CN/LC_MESSAGES/kwinshutdown.mo
 share/locale/zh_CN/LC_MESSAGES/kwinstartmenu.mo
 share/locale/zh_CN/LC_MESSAGES/kwordquiz.mo
 share/locale/zh_CN/LC_MESSAGES/kwrite.mo
@ -489,6 +497,7 @@ share/locale/zh_CN/LC_MESSAGES/libkcalutils.mo
 share/locale/zh_CN/LC_MESSAGES/libkcddb.mo
 share/locale/zh_CN/LC_MESSAGES/libkcompactdisc.mo
 share/locale/zh_CN/LC_MESSAGES/libkdcraw.mo
+share/locale/zh_CN/LC_MESSAGES/libkdecorations.mo
 share/locale/zh_CN/LC_MESSAGES/libkdeedu.mo
 share/locale/zh_CN/LC_MESSAGES/libkdegames.mo
 share/locale/zh_CN/LC_MESSAGES/libkdepim.mo
@ -515,6 +524,7 @@ share/locale/zh_CN/LC_MESSAGES/libkunitconversion.mo
 share/locale/zh_CN/LC_MESSAGES/libkworkspace.mo
 share/locale/zh_CN/LC_MESSAGES/libkxmlrpcclient.mo
 share/locale/zh_CN/LC_MESSAGES/liblancelot-datamodels.mo
+share/locale/zh_CN/LC_MESSAGES/libmailcommon.mo
 share/locale/zh_CN/LC_MESSAGES/libmailtransport.mo
 share/locale/zh_CN/LC_MESSAGES/libmessagecomposer.mo
 share/locale/zh_CN/LC_MESSAGES/libmessagecore.mo
@ -544,11 +554,13 @@ share/locale/zh_CN/LC_MESSAGES/minitoolsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukbackup.mo
+share/locale/zh_CN/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukservicestub.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukstorage.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukstrigiservice.mo
+share/locale/zh_CN/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/zh_CN/LC_MESSAGES/notes-mobile.mo
 share/locale/zh_CN/LC_MESSAGES/nsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/okteta-mobile.mo
@ -572,16 +584,18 @@ share/locale/zh_CN/LC_MESSAGES/okular_tiff.mo
 share/locale/zh_CN/LC_MESSAGES/okular_xps.mo
 share/locale/zh_CN/LC_MESSAGES/palapeli.mo
 share/locale/zh_CN/LC_MESSAGES/parley.mo
-share/locale/zh_CN/LC_MESSAGES/phonon-xine.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_kde.mo
+share/locale/zh_CN/LC_MESSAGES/phonon_vlc.mo
 share/locale/zh_CN/LC_MESSAGES/phononserver.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-desktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-netbook.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-overlay.mo
+share/locale/zh_CN/LC_MESSAGES/plasma-remote-helper.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-windowed.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_BbalL.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_CharSelectApplet.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_Molmasscalculator.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_akonotes_note.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_battery.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_binaryclock.mo
@ -643,6 +657,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_rtm.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_sal.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_saverdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_searchbox.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_showactivitymanager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_showdashboard.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_showdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_skapplet.mo
@ -679,6 +694,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_engine_soliddevice.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_weather.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_packagestructure_comic.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_CharacterRunner.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_runner_activities.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_audioplayercontrol.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_bookmarksrunner.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_browserhistory.mo
@ -731,6 +747,7 @@ share/locale/zh_CN/LC_MESSAGES/processcore.mo
 share/locale/zh_CN/LC_MESSAGES/processui.mo
 share/locale/zh_CN/LC_MESSAGES/randrmonitor.mo
 share/locale/zh_CN/LC_MESSAGES/rellinks.mo
+share/locale/zh_CN/LC_MESSAGES/remote-widgets-browser.mo
 share/locale/zh_CN/LC_MESSAGES/rocs.mo
 share/locale/zh_CN/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_CN/LC_MESSAGES/solid-hardware.mo
--- a/chinese/kde4-l10n-zh_TW/distinfo
+++ b/chinese/kde4-l10n-zh_TW/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kde-l10n/kde-l10n-zh_TW-4.6.5.tar.bz2) = b1a0efbfa10f1f29fd9577072b37716eb99a59fd8b7f0e8ef540adec0f2d0d3a
-SIZE (KDE/kde-l10n/kde-l10n-zh_TW-4.6.5.tar.bz2) = 2785581
+SHA256 (KDE/kde-l10n/kde-l10n-zh_TW-4.7.2.tar.bz2) = ce33ed59430105b2d015104a98820f218b85ec2edc5a91e4c46a101734046c61
+SIZE (KDE/kde-l10n/kde-l10n-zh_TW-4.7.2.tar.bz2) = 2829192
--- a/chinese/kde4-l10n-zh_TW/pkg-plist
+++ b/chinese/kde4-l10n-zh_TW/pkg-plist
@ -18,6 +18,9 @@ share/locale/zh_TW/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_invitations_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_kabc_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_kalarm_dir_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_kalarm_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_kalarm_resource_common.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_kcal_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_kdeaccounts_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_knut_resource.mo
@ -115,13 +118,12 @@ share/locale/zh_TW/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_TW/LC_MESSAGES/katefindinfilesplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kategdbplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katehelloworld.mo
-share/locale/zh_TW/LC_MESSAGES/kateinsertcommand.mo
-share/locale/zh_TW/LC_MESSAGES/katekjswrapper.mo
 share/locale/zh_TW/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_TW/LC_MESSAGES/katepart4.mo
 share/locale/zh_TW/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+share/locale/zh_TW/LC_MESSAGES/katesearch.mo
 share/locale/zh_TW/LC_MESSAGES/katesnippets_tng.mo
 share/locale/zh_TW/LC_MESSAGES/katesql.mo
 share/locale/zh_TW/LC_MESSAGES/katesymbolviewer.mo
@ -393,6 +395,7 @@ share/locale/zh_TW/LC_MESSAGES/ksaneplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kscd.mo
 share/locale/zh_TW/LC_MESSAGES/kscreensaver.mo
 share/locale/zh_TW/LC_MESSAGES/ksendemail.mo
+share/locale/zh_TW/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kshisen.mo
 share/locale/zh_TW/LC_MESSAGES/kshorturifilter.mo
 share/locale/zh_TW/LC_MESSAGES/ksirk.mo
@ -418,7 +421,6 @@ share/locale/zh_TW/LC_MESSAGES/ktesnippets_editor.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditor_codesnippets_core.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
-share/locale/zh_TW/LC_MESSAGES/kthememanager.mo
 share/locale/zh_TW/LC_MESSAGES/ktimer.mo
 share/locale/zh_TW/LC_MESSAGES/ktimetracker.mo
 share/locale/zh_TW/LC_MESSAGES/ktouch.mo
@ -439,7 +441,6 @@ share/locale/zh_TW/LC_MESSAGES/kwin.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_effects.mo
-share/locale/zh_TW/LC_MESSAGES/kwin_lib.mo
 share/locale/zh_TW/LC_MESSAGES/kwinshutdown.mo
 share/locale/zh_TW/LC_MESSAGES/kwinstartmenu.mo
 share/locale/zh_TW/LC_MESSAGES/kwordquiz.mo
@ -460,6 +461,7 @@ share/locale/zh_TW/LC_MESSAGES/libkcalutils.mo
 share/locale/zh_TW/LC_MESSAGES/libkcddb.mo
 share/locale/zh_TW/LC_MESSAGES/libkcompactdisc.mo
 share/locale/zh_TW/LC_MESSAGES/libkdcraw.mo
+share/locale/zh_TW/LC_MESSAGES/libkdecorations.mo
 share/locale/zh_TW/LC_MESSAGES/libkdeedu.mo
 share/locale/zh_TW/LC_MESSAGES/libkdegames.mo
 share/locale/zh_TW/LC_MESSAGES/libkdepim.mo
@ -516,6 +518,7 @@ share/locale/zh_TW/LC_MESSAGES/minitoolsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_TW/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukbackup.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukservicestub.mo
@ -545,13 +548,14 @@ share/locale/zh_TW/LC_MESSAGES/okular_tiff.mo
 share/locale/zh_TW/LC_MESSAGES/okular_xps.mo
 share/locale/zh_TW/LC_MESSAGES/palapeli.mo
 share/locale/zh_TW/LC_MESSAGES/parley.mo
-share/locale/zh_TW/LC_MESSAGES/phonon-xine.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_kde.mo
+share/locale/zh_TW/LC_MESSAGES/phonon_vlc.mo
 share/locale/zh_TW/LC_MESSAGES/phononserver.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-desktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-netbook.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-overlay.mo
+share/locale/zh_TW/LC_MESSAGES/plasma-remote-helper.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-windowed.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_BbalL.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_CharSelectApplet.mo
@ -617,6 +621,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_rtm.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_sal.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_saverdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_searchbox.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_showactivitymanager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_showdashboard.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_showdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_skapplet.mo
@ -653,6 +658,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_engine_soliddevice.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_weather.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_packagestructure_comic.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_CharacterRunner.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_runner_activities.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_audioplayercontrol.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_bookmarksrunner.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_browserhistory.mo
@ -705,6 +711,7 @@ share/locale/zh_TW/LC_MESSAGES/processcore.mo
 share/locale/zh_TW/LC_MESSAGES/processui.mo
 share/locale/zh_TW/LC_MESSAGES/randrmonitor.mo
 share/locale/zh_TW/LC_MESSAGES/rellinks.mo
+share/locale/zh_TW/LC_MESSAGES/remote-widgets-browser.mo
 share/locale/zh_TW/LC_MESSAGES/rocs.mo
 share/locale/zh_TW/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_TW/LC_MESSAGES/solid-hardware.mo
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@ -6,52 +6,61 @@

 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Utilities for the KDE4 integrated X11 Desktop
+COMMENT=	Collection of utilities for KDE 4

 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		qca.2:${PORTSDIR}/devel/qca
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg

 LATEST_LINK=	${PORTNAME}4

-USE_BZIP2=	yes
-USE_QT_VER=	4
-USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace kdebase
-QT_COMPONENTS=	network gui porting xml \
+		kdelibs pimlibs workspace baseapps
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xrender xtst
+USE_BZIP2=	yes
+CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
+		-DBUILD_printer-applet:BOOL=FALSE
 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 \
+OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
+		LIRC "Support for IR remote controls" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
+		7ZIP "Support for 7-Zip archives in Ark" off \
 		RAR "Support for RAR archives in Ark" off \
 		ZIP "Support for ZIP archives in Ark" off

 .include <bsd.port.options.mk>

-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.ifndef(WITHOUT_FILELIGHT)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
+.endif
+
+.ifdef(WITH_LIRC)
+RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif

 .ifdef(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif

+.ifdef(WITH_7ZIP)
+RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.endif
+
 .ifdef(WITH_ZIP)
 RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
 		zip:${PORTSDIR}/archivers/zip
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.5.tar.bz2) = 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-SIZE (KDE/kdeutils-4.6.5.tar.bz2) = 3699961
+SHA256 (KDE/kdeutils-4.7.2.tar.bz2) = cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
+SIZE (KDE/kdeutils-4.7.2.tar.bz2) = 3800427
--- a/comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp
+++ b/comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp
@ -1,35 +0,0 @@
-SVN commit 1240907 by rkcosta:
-
-cliinterface: Do not assume a process does not exist in runProcess().
-
-The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when
-one is adding files to an archive (or creating an archive) processFinished()
-calls list(), which in turn calls runProcess() as well, thus making the assert
-fail.
-
-The best thing to do is just wait for the existing process to finish before
-launching the new one.
-
-Backport of r1240907, in case the 4.6 ever gets packaged again.
-
-CCBUG: 277393
-
-http://websvn.kde.org/?view=revision&revision=1240908
-- ark/kerfuffle/cliinterface.cpp	2011/06/01 20:35:06	1234597
-+++ ark/kerfuffle/cliinterface.cpp	2011/07/11 03:23:39	1240908
-@@ -325,10 +325,13 @@
-         return false;
-     }
- 
-    Q_ASSERT(!m_process);
-
-     kDebug() << "Executing" << programPath << arguments;
- 
-+    if (m_process) {
-+        m_process->waitForFinished();
-+        delete m_process;
-+    }
-+
- #ifdef Q_OS_WIN
-     m_process = new KProcess();
- #else
--- a/comms/kremotecontrol/files/patch-kcalc-kcalc.ui
+++ b/comms/kremotecontrol/files/patch-kcalc-kcalc.ui
@ -1,99 +0,0 @@
-SVN commit 1240130 by teran:
-
-rolling back change made by r1235446, it broke keybindings entirely.
-
-BUG: 277020
-
-http://websvn.kde.org/?view=revision&revision=1240130
--- kcalc/kcalc.ui	2011/06/05 18:25:18	1235446
-+++ kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
--- a/comms/kremotecontrol/pkg-descr
+++ b/comms/kremotecontrol/pkg-descr
@ -1 +1,4 @@
-KDE provides an integrated X11 based environment, much like CDE.
+The KDE utilities are a compilation of various desktop utilities,
+developed in the KDE module kdeutils.
+
+WWW: http://utils.kde.org
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/pkg-plist
@ -1,5 +1,4 @@
 bin/ark
-bin/filelight
 bin/kcalc
 bin/kcharselect
 bin/kdf
@ -12,7 +11,6 @@ bin/kwikdisk
 bin/superkaramba
 bin/sweeper
 lib/kde4/arkpart.so
-lib/kde4/filelightpart.so
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
 lib/kde4/kcm_remotecontrol.so
@ -24,6 +22,7 @@ lib/kde4/kerfuffle_libarchive.so
 lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
+lib/kde4/kremotecontrol_lirc.so
 lib/kde4/libextracthere.so
 lib/kde4/plasma_engine_kremoteconrol.so
 lib/kde4/plasma_package_superkaramba.so
@ -41,7 +40,6 @@ lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
-share/applications/kde4/filelight.desktop
 share/applications/kde4/kcalc.desktop
 share/applications/kde4/kdf.desktop
 share/applications/kde4/kgpg.desktop
@ -54,8 +52,6 @@ share/applications/kde4/superkaramba.desktop
 share/applications/kde4/sweeper.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
-share/apps/filelight/filelightui.rc
-share/apps/filelightpart/filelightpartui.rc
 share/apps/kcalc/kcalcui.rc
 share/apps/kcalc/scienceconstants.xml
 share/apps/kcharselect/kcharselectui.rc
@ -119,7 +115,6 @@ share/autostart/kgpg.desktop
 share/config.kcfg/ark.kcfg
 share/config.kcfg/kcalc.kcfg
 share/config.kcfg/kgpg.kcfg
-share/config/filelightrc
 share/config/superkaramba.knsrc
 share/dbus-1/interfaces/org.kde.kgpg.Key.xml
 share/dbus-1/interfaces/org.kde.superkaramba.xml
@ -129,13 +124,6 @@ share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/filelight/common
-share/doc/HTML/en/filelight/config_appear.png
-share/doc/HTML/en/filelight/config_scan.png
-share/doc/HTML/en/filelight/index.cache.bz2
-share/doc/HTML/en/filelight/index.docbook
-share/doc/HTML/en/filelight/radial_map.png
-share/doc/HTML/en/filelight/radial_map_context_menu.png
 share/doc/HTML/en/kcalc/commands.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
@ -211,7 +199,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
 share/icons/hicolor/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/filelight.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@ -223,7 +210,6 @@ share/icons/hicolor/16x16/apps/superkaramba.png
 share/icons/hicolor/16x16/devices/infrared-remote.png
 share/icons/hicolor/22x22/actions/krcd_flash.png
 share/icons/hicolor/22x22/actions/krcd_off.png
-share/icons/hicolor/22x22/apps/filelight.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
@ -232,8 +218,6 @@ share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
 share/icons/hicolor/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/actions/view_filelight.png
-share/icons/hicolor/32x32/apps/filelight.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@ -244,7 +228,6 @@ share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/superkaramba.png
 share/icons/hicolor/32x32/devices/infrared-remote.png
 share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/filelight.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@ -254,7 +237,6 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/superkaramba.png
 share/icons/hicolor/48x48/devices/infrared-remote.png
-share/icons/hicolor/64x64/apps/filelight.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
@ -278,7 +260,6 @@ share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
-share/kde4/services/filelightpart.desktop
 share/kde4/services/kcm_remotecontrol.desktop
 share/kde4/services/kcmdf.desktop
 share/kde4/services/kded/kremotecontroldaemon.desktop
@ -290,12 +271,15 @@ share/kde4/services/kerfuffle_libarchive_readonly.desktop
 share/kde4/services/kerfuffle_libbz2.desktop
 share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libxz.desktop
+share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
 share/kde4/services/kwalletconfig.desktop
 share/kde4/services/kwalletmanager_show.desktop
 share/kde4/services/plasma-engine-kremotecontrol.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
+share/kde4/servicetypes/kremotecontrolmanager.desktop
+@dirrm share/kde4/services/kremotecontrolbackends
@dirrmtry share/icons/oxygen/42x42/devices
@dirrmtry share/icons/oxygen/42x42
@dirrmtry share/icons/hicolor/8x8/devices
@ -312,7 +296,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/doc/HTML/en/kcontrol/blockdevices
@dirrm share/doc/HTML/en/kcharselect
@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/filelight
@dirrm share/doc/HTML/en/ark
@dirrm share/apps/sweeper
@dirrm share/apps/superkaramba
@ -344,6 +327,4 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/apps/kgpg
@dirrm share/apps/kdf
@dirrm share/apps/kcalc
-@dirrm share/apps/filelightpart
-@dirrm share/apps/filelight
@dirrm share/apps/ark
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@ -147,6 +147,7 @@
    SUBDIR += kooldock
    SUBDIR += krefty
    SUBDIR += krss
+    SUBDIR += kruler
    SUBDIR += ksmoothdock
    SUBDIR += ksshaskpass
    SUBDIR += ktagebuch
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@ -6,52 +6,61 @@

 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Utilities for the KDE4 integrated X11 Desktop
+COMMENT=	Collection of utilities for KDE 4

 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		qca.2:${PORTSDIR}/devel/qca
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg

 LATEST_LINK=	${PORTNAME}4

-USE_BZIP2=	yes
-USE_QT_VER=	4
-USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace kdebase
-QT_COMPONENTS=	network gui porting xml \
+		kdelibs pimlibs workspace baseapps
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11 xrender xtst
+USE_BZIP2=	yes
+CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
+		-DBUILD_printer-applet:BOOL=FALSE
 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 \
+OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
+		LIRC "Support for IR remote controls" off \
 		PRINTER_APPLET "Install printer system tray utility" off \
+		7ZIP "Support for 7-Zip archives in Ark" off \
 		RAR "Support for RAR archives in Ark" off \
 		ZIP "Support for ZIP archives in Ark" off

 .include <bsd.port.options.mk>

-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.ifndef(WITHOUT_FILELIGHT)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
+.endif
+
+.ifdef(WITH_LIRC)
+RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif

 .ifdef(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif

+.ifdef(WITH_7ZIP)
+RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+.endif
+
 .ifdef(WITH_ZIP)
 RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
 		zip:${PORTSDIR}/archivers/zip
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.6.5.tar.bz2) = 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-SIZE (KDE/kdeutils-4.6.5.tar.bz2) = 3699961
+SHA256 (KDE/kdeutils-4.7.2.tar.bz2) = cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
+SIZE (KDE/kdeutils-4.7.2.tar.bz2) = 3800427
--- a/deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp
+++ b/deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp
@ -1,35 +0,0 @@
-SVN commit 1240907 by rkcosta:
-
-cliinterface: Do not assume a process does not exist in runProcess().
-
-The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when
-one is adding files to an archive (or creating an archive) processFinished()
-calls list(), which in turn calls runProcess() as well, thus making the assert
-fail.
-
-The best thing to do is just wait for the existing process to finish before
-launching the new one.
-
-Backport of r1240907, in case the 4.6 ever gets packaged again.
-
-CCBUG: 277393
-
-http://websvn.kde.org/?view=revision&revision=1240908
-- ark/kerfuffle/cliinterface.cpp	2011/06/01 20:35:06	1234597
-+++ ark/kerfuffle/cliinterface.cpp	2011/07/11 03:23:39	1240908
-@@ -325,10 +325,13 @@
-         return false;
-     }
- 
-    Q_ASSERT(!m_process);
-
-     kDebug() << "Executing" << programPath << arguments;
- 
-+    if (m_process) {
-+        m_process->waitForFinished();
-+        delete m_process;
-+    }
-+
- #ifdef Q_OS_WIN
-     m_process = new KProcess();
- #else
--- a/deskutils/kcharselect/files/patch-kcalc-kcalc.ui
+++ b/deskutils/kcharselect/files/patch-kcalc-kcalc.ui
@ -1,99 +0,0 @@
-SVN commit 1240130 by teran:
-
-rolling back change made by r1235446, it broke keybindings entirely.
-
-BUG: 277020
-
-http://websvn.kde.org/?view=revision&revision=1240130
--- kcalc/kcalc.ui	2011/06/05 18:25:18	1235446
-+++ kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
-             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
--- a/deskutils/kcharselect/pkg-descr
+++ b/deskutils/kcharselect/pkg-descr
@ -1 +1,4 @@
-KDE provides an integrated X11 based environment, much like CDE.
+The KDE utilities are a compilation of various desktop utilities,
+developed in the KDE module kdeutils.
+
+WWW: http://utils.kde.org
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@ -1,5 +1,4 @@
 bin/ark
-bin/filelight
 bin/kcalc
 bin/kcharselect
 bin/kdf
@ -12,7 +11,6 @@ bin/kwikdisk
 bin/superkaramba
 bin/sweeper
 lib/kde4/arkpart.so
-lib/kde4/filelightpart.so
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
 lib/kde4/kcm_remotecontrol.so
@ -24,6 +22,7 @@ lib/kde4/kerfuffle_libarchive.so
 lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
+lib/kde4/kremotecontrol_lirc.so
 lib/kde4/libextracthere.so
 lib/kde4/plasma_engine_kremoteconrol.so
 lib/kde4/plasma_package_superkaramba.so
@ -41,7 +40,6 @@ lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
-share/applications/kde4/filelight.desktop
 share/applications/kde4/kcalc.desktop
 share/applications/kde4/kdf.desktop
 share/applications/kde4/kgpg.desktop
@ -54,8 +52,6 @@ share/applications/kde4/superkaramba.desktop
 share/applications/kde4/sweeper.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
-share/apps/filelight/filelightui.rc
-share/apps/filelightpart/filelightpartui.rc
 share/apps/kcalc/kcalcui.rc
 share/apps/kcalc/scienceconstants.xml
 share/apps/kcharselect/kcharselectui.rc
@ -119,7 +115,6 @@ share/autostart/kgpg.desktop
 share/config.kcfg/ark.kcfg
 share/config.kcfg/kcalc.kcfg
 share/config.kcfg/kgpg.kcfg
-share/config/filelightrc
 share/config/superkaramba.knsrc
 share/dbus-1/interfaces/org.kde.kgpg.Key.xml
 share/dbus-1/interfaces/org.kde.superkaramba.xml
@ -129,13 +124,6 @@ share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/filelight/common
-share/doc/HTML/en/filelight/config_appear.png
-share/doc/HTML/en/filelight/config_scan.png
-share/doc/HTML/en/filelight/index.cache.bz2
-share/doc/HTML/en/filelight/index.docbook
-share/doc/HTML/en/filelight/radial_map.png
-share/doc/HTML/en/filelight/radial_map_context_menu.png
 share/doc/HTML/en/kcalc/commands.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
@ -211,7 +199,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
 share/icons/hicolor/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/filelight.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@ -223,7 +210,6 @@ share/icons/hicolor/16x16/apps/superkaramba.png
 share/icons/hicolor/16x16/devices/infrared-remote.png
 share/icons/hicolor/22x22/actions/krcd_flash.png
 share/icons/hicolor/22x22/actions/krcd_off.png
-share/icons/hicolor/22x22/apps/filelight.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
@ -232,8 +218,6 @@ share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
 share/icons/hicolor/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/actions/view_filelight.png
-share/icons/hicolor/32x32/apps/filelight.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@ -244,7 +228,6 @@ share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/superkaramba.png
 share/icons/hicolor/32x32/devices/infrared-remote.png
 share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/filelight.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@ -254,7 +237,6 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/superkaramba.png
 share/icons/hicolor/48x48/devices/infrared-remote.png
-share/icons/hicolor/64x64/apps/filelight.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
@ -278,7 +260,6 @@ share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
-share/kde4/services/filelightpart.desktop
 share/kde4/services/kcm_remotecontrol.desktop
 share/kde4/services/kcmdf.desktop
 share/kde4/services/kded/kremotecontroldaemon.desktop
@ -290,12 +271,15 @@ share/kde4/services/kerfuffle_libarchive_readonly.desktop
 share/kde4/services/kerfuffle_libbz2.desktop
 share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libxz.desktop
+share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
 share/kde4/services/kwalletconfig.desktop
 share/kde4/services/kwalletmanager_show.desktop
 share/kde4/services/plasma-engine-kremotecontrol.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
+share/kde4/servicetypes/kremotecontrolmanager.desktop
+@dirrm share/kde4/services/kremotecontrolbackends
@dirrmtry share/icons/oxygen/42x42/devices
@dirrmtry share/icons/oxygen/42x42
@dirrmtry share/icons/hicolor/8x8/devices
@ -312,7 +296,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/doc/HTML/en/kcontrol/blockdevices
@dirrm share/doc/HTML/en/kcharselect
@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/filelight
@dirrm share/doc/HTML/en/ark
@dirrm share/apps/sweeper
@dirrm share/apps/superkaramba
@ -344,6 +327,4 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/apps/kgpg
@dirrm share/apps/kdf
@dirrm share/apps/kcalc
-@dirrm share/apps/filelightpart
-@dirrm share/apps/filelight
@dirrm share/apps/ark
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@ -15,24 +14,28 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications

-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_thread:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
+		sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		ical.44:${PORTSDIR}/devel/libical \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		prison.0:${PORTSDIR}/graphics/prison \
+		soprano.4:${PORTSDIR}/textproc/soprano
+
+BUILD_DEPENDS=	${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
+		xsltproc:${PORTSDIR}/textproc/libxslt
+
+RUN_DEPENDS=	${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies

-USE_KDE4=	kdelibs akonadi kdeprefix kdehier automoc4
-KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus qt3support \
-		designer network svg qtestlib help \
-		qmake_build moc_build rcc_build uic_build
+USE_KDE4=	kdelibs akonadi kdeprefix kdehier automoc4 sharedmime
+KDE4_BUILDENV=	yes
 USE_OPENLDAP=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus designer gui network sql xml \
+		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes

-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libgpgme-pth.so)
 PLIST_SUB+=	WITH_PTH=''
 .else
@ -46,5 +49,11 @@ post-patch:
 		${PATCH_WRKSRC}/cmake/modules/FindAkonadi.cmake
 	${REINPLACE_CMD} -e 's|%%KDE4_PREFIX%%|${KDE4_PREFIX}|g' \
 		${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake
+	# Prevent updating MIME during build.
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
+		${PATCH_WRKSRC}/CMakeLists.txt

-.include <bsd.port.post.mk>
+post-install:
+	@-update-mime-database ${KDE4_PREFIX}/share/mime
+
+.include <bsd.port.mk>
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdepimlibs-4.6.5.tar.bz2) = f2033feac905a6bcd64060653e8d0d2f8ac28ba8039562ec1b2fad7c708a4477
-SIZE (KDE/kdepimlibs-4.6.5.tar.bz2) = 3201672
+SHA256 (KDE/kdepimlibs-4.7.2.tar.bz2) = 82791f00cc13aa5bbf3b69bd67029e6c040e63a16e10fb77dfec5ffbee57d204
+SIZE (KDE/kdepimlibs-4.7.2.tar.bz2) = 3232573
--- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
+++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
@ -1,9 +1,9 @@
--- ./CMakeLists.txt.orig	2010-06-06 12:01:57.000000000 -0400
-+++ ./CMakeLists.txt	2010-06-06 12:02:08.000000000 -0400
+--- ./CMakeLists.txt.orig	2011-07-20 08:36:16.000000000 +1100
+++ ./CMakeLists.txt	2011-08-09 00:34:17.959934057 +1100
@@ -81,7 +81,7 @@
 if (NOT KDEPIM_ONLY_KLEO)
   #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
-   set(Akonadi_MIN_VERSION "1.4.81")
+   set(Akonadi_MIN_VERSION "1.5.52")
 -  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE)
 +  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET)
   macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "")
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@ -1204,7 +1204,6 @@ share/kde4/services/kresources/kabc/file.desktop
 share/kde4/services/kresources/kabc/ldapkio.desktop
 share/kde4/services/kresources/kabc/net.desktop
 share/kde4/services/kresources/kabc_manager.desktop
-share/kde4/services/kresources/kcal/local.desktop
 share/kde4/services/kresources/kcal/localdir.desktop
 share/kde4/services/kresources/kcal_manager.desktop
 share/kde4/services/ldap.protocol
@ -1224,7 +1223,7 @@ share/kde4/servicetypes/kresources_plugin.desktop
 share/mime/application/x-vnd.kde.contactgroup.xml
 share/mime/packages/kdepimlibs-mime.xml
@dirrm share/kde4/services/akonadi/contact
-@dirrm share/kde4/services/akonadi
+@dirrmtry share/kde4/services/akonadi
@dirrm share/doc/HTML/en/kioslave/smtp
@dirrm share/doc/HTML/en/kioslave/sieve
@dirrm share/doc/HTML/en/kioslave/pop3
@ -1301,3 +1300,5 @@ share/mime/packages/kdepimlibs-mime.xml
@dirrm include/KDE/Akonadi/KCal
@dirrm include/KDE/Akonadi/Contact
@dirrm include/KDE/Akonadi
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@ -15,43 +15,52 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE4

-BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	kexiv2:${PORTSDIR}/graphics/kdegraphics4 \
+LIB_DEPENDS=	kexiv2.10:${PORTSDIR}/graphics/libkexiv2-kde4 \
 		qalculate.5:${PORTSDIR}/math/libqalculate \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
-		marblewidget.11:${PORTSDIR}/astro/marble
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		attica.0:${PORTSDIR}/x11-toolkits/attica \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		qca.2:${PORTSDIR}/devel/qca
+
+BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2

-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
-KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs workspace \
+		akonadi sharedmime automoc4
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus qt3support webkit \
-		designer network svg qtestlib xml \
+QT_COMPONENTS=	dbus gui network opengl script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
-
+USE_XORG=	x11 xrender xtst
 MAKE_JOBS_SAFE=	yes

-OPTIONS=	SCIM "Enable SCIM method input dialog" off
+OPTIONS=	MARBLE "Support for desktop globe wallpaper" on \
+		SCIM "Enable SCIM method input dialog" off

 .include <bsd.port.options.mk>

-.if defined(WITHOUT_SCIM)
-PLIST_SUB+=	SCIM="@comment "
+.ifndef(WITHOUT_MARBLE)
+LIB_DEPENDS+=	marblewidget.12:${PORTSDIR}/astro/marble
+PLIST_SUB+=	MARBLE=""
 .else
+CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
+PLIST_SUB+=	MARBLE="@comment "
+.endif
+
+.ifdef(WITH_SCIM)
 LIB_DEPENDS+=	scim-1.0.10:${PORTSDIR}/textproc/scim
 PLIST_SUB+=	SCIM=""
+.else
+CMAKE_ARGS+=	-DWITH_SCIM:BOOL=FALSE
+PLIST_SUB+=	SCIM="@comment "
 .endif

 post-patch:
 	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
-
-.if defined(WITHOUT_SCIM)
-	${REINPLACE_CMD} -e '/add_subdirectory(kimpanel)/d' \
-		${WRKSRC}/applets/CMakeLists.txt
-.endif
-	#respect prefix, don't update mime when installing
-	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
+	# Respect prefix, don't update MIME when installing.
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${WRKSRC}/applets/lancelot/parts/CMakeLists.txt

 post-install:
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925
-SIZE (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 1936845
+SHA256 (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 71956a99c943728696ba52bd7d0e165ae1d28f940da8c8676d79fdf18e1ec931
+SIZE (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 1973434
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
--- ./CMakeLists.txt.orig	2009-04-06 07:00:39.000000000 +1100
-+++ ./CMakeLists.txt	2009-06-26 11:00:58.000000000 +1100
-@@ -26,16 +26,20 @@
+--- ./CMakeLists.txt.orig	2011-05-21 07:37:49.000000000 +1100
+++ ./CMakeLists.txt	2011-08-15 14:56:28.177306481 +1100
+@@ -36,17 +36,21 @@
 endif (DEPEND_PACKAGE_Marble)
 macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
 
@ -9,8 +9,9 @@
 -endif (NEPOMUK_FOUND)
 -
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 -include_directories (${KDE4_INCLUDES}
-+INCLUDE_DIRECTORIES (${QT_QTGUI_INCLUDE_DIR}
+include_directories (${QT_QTGUI_INCLUDE_DIR}
 +                     ${QT_QTCORE_INCLUDE_DIR}
 +                     ${QT_QTXML_INCLUDE_DIR}
 +                     ${PHONON_INCLUDE_DIR}
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@ -179,7 +179,7 @@ lib/kde4/plasma_potd_wcpotdprovider.so
 lib/kde4/plasma_runner_datetime.so
 lib/kde4/plasma_runner_events.so
 lib/kde4/plasma_wallpaper_mandelbrot.so
-lib/kde4/plasma_wallpaper_marble.so
+%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so
 lib/kde4/plasma_wallpaper_pattern.so
 lib/kde4/plasma_wallpaper_virus.so
 lib/kde4/plasma_wallpaper_weather.so
@ -211,6 +211,19 @@ share/apps/bball/bounce.ogg
 share/apps/bball/football.svgz
 share/apps/cmake/modules/FindLancelot-Datamodels.cmake
 share/apps/cmake/modules/FindLancelot.cmake
+share/apps/desktoptheme/Androbit/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Androbit/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Androbit/lancelot/inner-background.svgz
+share/apps/desktoptheme/Androbit/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Androbit/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/theme.config
 share/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz
 share/apps/desktoptheme/Aya/lancelot/category-triangle.svgz
 share/apps/desktoptheme/Aya/lancelot/inner-background.svgz
@ -222,6 +235,32 @@ share/apps/desktoptheme/Aya/lancelot/section-buttons.svgz
 share/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz
 share/apps/desktoptheme/Aya/lancelot/system-buttons.svgz
 share/apps/desktoptheme/Aya/lancelot/theme.config
+share/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Produkt/lancelot/inner-background.svgz
+share/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/theme.config
+share/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz
+share/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/theme.config
 share/apps/desktoptheme/default/bubblemon/bubble.svg
 share/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
 share/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz
@ -249,6 +288,7 @@ share/apps/desktoptheme/default/widgets/eyes.svg
 share/apps/desktoptheme/default/widgets/luna.svgz
 share/apps/desktoptheme/default/widgets/microblog.svgz
 share/apps/desktoptheme/default/widgets/notes.svgz
+share/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz
 share/apps/desktoptheme/default/widgets/previewer-16.svgz
 share/apps/desktoptheme/default/widgets/previewer-22.svgz
 share/apps/desktoptheme/default/widgets/timer.svgz
@ -479,7 +519,7 @@ share/kde4/services/plasma-runner-techbase.desktop
 share/kde4/services/plasma-runner-wikipedia.desktop
 share/kde4/services/plasma-runner-wikitravel.desktop
 share/kde4/services/plasma-wallpaper-mandelbrot.desktop
-share/kde4/services/plasma-wallpaper-marble.desktop
+%%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
 share/kde4/services/plasma-wallpaper-pattern.desktop
 share/kde4/services/plasma-wallpaper-virus.desktop
 share/kde4/services/plasma-wallpaper-weather.desktop
@ -503,6 +543,7 @@ share/mime/packages/lancelotpart-mime.xml
@dirrmtry share/apps/desktoptheme/slim-glow
@dirrm share/apps/desktoptheme/oxygen/lancelot
@dirrmtry share/apps/desktoptheme/oxygen
+@dirrm share/apps/desktoptheme/default/widgets/nowplaying
@dirrm share/apps/desktoptheme/default/weatherstation
@dirrm share/apps/desktoptheme/default/weather
@dirrm share/apps/desktoptheme/default/stylesheets
@ -510,9 +551,15 @@ share/mime/packages/lancelotpart-mime.xml
@dirrm share/apps/desktoptheme/default/lancelot
@dirrm share/apps/desktoptheme/default/fifteenPuzzle
@dirrm share/apps/desktoptheme/default/bubblemon
+@dirrm share/apps/desktoptheme/Tibanna/lancelot
+@dirrmtry share/apps/desktoptheme/Tibanna
+@dirrm share/apps/desktoptheme/Produkt/lancelot
+@dirrmtry share/apps/desktoptheme/Produkt
@dirrmtry share/apps/desktoptheme/Clean-Bend
@dirrm share/apps/desktoptheme/Aya/lancelot
@dirrmtry share/apps/desktoptheme/Aya
+@dirrm share/apps/desktoptheme/Androbit/lancelot
+@dirrmtry share/apps/desktoptheme/Androbit
@dirrmtry share/apps/cmake/modules
@dirrmtry share/apps/cmake
@dirrm share/apps/bball
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@ -0,0 +1,28 @@
+# New ports collection makefile for:	kruler
+# Date created:				5 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kruler
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	deskutils kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE 4 screen ruler
+
+CONFLICTS=	kdegraphics-4.[0-6].*
+
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib qmake_build moc_build uic_build rcc_build
+USE_XORG=	x11
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.mk>
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/kruler-4.7.2.tar.bz2) = 3c5a0bb613d032683d7495dc4bbc73c67e2f3b5d2c93e3e41498ad6f16b867bd
+SIZE (KDE/kruler-4.7.2.tar.bz2) = 139998
--- a/deskutils/kruler/pkg-descr
+++ b/deskutils/kruler/pkg-descr
@ -0,0 +1,9 @@
+KRuler displays on screen a ruler measuring pixels.
+
+FEATURES
+- Integrated color picker.
+- Change the length of the ruler.
+- Change the orientation of the ruler.
+- Change the color, transparency and font of the ruler.
+
+WWW: http://www.kde.org/applications/graphics/kruler
--- a/deskutils/kruler/pkg-plist
+++ b/deskutils/kruler/pkg-plist
@ -0,0 +1,27 @@
+bin/kruler
+share/applications/kde4/kruler.desktop
+share/apps/kruler/kruler.notifyrc
+share/apps/kruler/sounds/move.wav
+share/doc/HTML/en/kruler/common
+share/doc/HTML/en/kruler/index.cache.bz2
+share/doc/HTML/en/kruler/index.docbook
+share/doc/HTML/en/kruler/kruler-settings.png
+share/doc/HTML/en/kruler/kruler.png
+share/icons/hicolor/128x128/apps/kruler.png
+share/icons/hicolor/16x16/actions/kruler-east.png
+share/icons/hicolor/16x16/actions/kruler-north.png
+share/icons/hicolor/16x16/actions/kruler-south.png
+share/icons/hicolor/16x16/actions/kruler-west.png
+share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/22x22/actions/kruler-east.png
+share/icons/hicolor/22x22/actions/kruler-north.png
+share/icons/hicolor/22x22/actions/kruler-south.png
+share/icons/hicolor/22x22/actions/kruler-west.png
+share/icons/hicolor/22x22/apps/kruler.png
+share/icons/hicolor/32x32/apps/kruler.png
+share/icons/hicolor/48x48/apps/kruler.png
+share/icons/hicolor/64x64/apps/kruler.png
+share/icons/hicolor/scalable/apps/kruler.svgz
+@dirrm share/doc/HTML/en/kruler
+@dirrm share/apps/kruler/sounds
+@dirrm share/apps/kruler
--- a/devel/Makefile
+++ b/devel/Makefile
@ -727,12 +727,19 @@
    SUBDIR += kcachegrind
    SUBDIR += kdbg
    SUBDIR += kdebindings4
+    SUBDIR += kdebindings4-kross-interpreters
    SUBDIR += kdebindings4-python
    SUBDIR += kdebindings4-python-krosspython
    SUBDIR += kdebindings4-python-pykde4
    SUBDIR += kdebindings4-python-pykdeuic4
    SUBDIR += kdebindings4-ruby
+    SUBDIR += kdebindings4-ruby-korundum
+    SUBDIR += kdebindings4-ruby-krossruby
+    SUBDIR += kdebindings4-ruby-qtruby
    SUBDIR += kdebindings4-smoke
+    SUBDIR += kdebindings4-smoke-smokegen
+    SUBDIR += kdebindings4-smoke-smokekde
+    SUBDIR += kdebindings4-smoke-smokeqt
    SUBDIR += kdesdk3
    SUBDIR += kdesdk4
    SUBDIR += kdesvn-kde4
--- a/devel/kdebindings4-kross-interpreters/Makefile
+++ b/devel/kdebindings4-kross-interpreters/Makefile
@ -0,0 +1,42 @@
+# New ports collection makefile for:	kdebindings4-kross-interpreters
+# Date created:				1 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kross-interpreters
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	# empty
+PKGNAMEPREFIX=	kdebindings-
+DISTFILES=	# empty
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Meta port of Kross scripting libraries for KDE 4
+
+USE_KDE4=	kdeprefix
+USE_RUBY=	yes
+RUBY_NO_BUILD_DEPENDS=	yes
+RUBY_NO_RUN_DEPENDS=	yes
+NO_BUILD=	yes
+
+OPTIONS=	KROSSPYTHON "Kross Python scripting library" on \
+		KROSSRUBY "Kross Ruby scripting library (broken with Ruby 1.9)" on
+
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_KROSSPYTHON)
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/kdebindings4-python-krosspython
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_KROSSRUBY) && ${RUBY_VER} != 1.9
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/krossruby.so:${PORTSDIR}/devel/kdebindings4-ruby-krossruby
+.endif
+
+do-install:
+	${DO_NADA}
+
+.include <bsd.port.post.mk>
--- a/devel/kdebindings4-kross-interpreters/distinfo
+++ b/devel/kdebindings4-kross-interpreters/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/kross-interpreters-4.7.2.tar.bz2) = 4235dfee6adc37d693ffdb4664bb4c13c15fe104e615cb1a57df225983946f34
+SIZE (KDE/kross-interpreters-4.7.2.tar.bz2) = 134896
--- a/devel/kdebindings4-kross-interpreters/pkg-descr
+++ b/devel/kdebindings4-kross-interpreters/pkg-descr
@ -0,0 +1,3 @@
+This is a meta port of KDE bindings for Python and Ruby.
+
+WWW:	http://www.kde.org/
--- a/devel/kdebindings4-python-krosspython/Makefile
+++ b/devel/kdebindings4-python-krosspython/Makefile
@ -5,18 +5,28 @@
 # $FreeBSD$
 #

-PORTNAME=	kdebindings
+PORTNAME=	krosspython
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	devel kde python
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}kdebindings-
+DISTNAME=	kross-interpreters-${PORTVERSION}
+DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kross Python scripting library

-BINDLANG=	python
-BINDMODULE=	krosspython
-
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_PYTHON=	2.5+
-QT_COMPONENTS=	gui
+USE_QT_VER=	4
+QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
+USE_BZIP2=	yes
+DISTINFO_FILE=	${PORTSDIR}/devel/kdebindings4-kross-interpreters/distinfo
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DBUILD_falcon:BOOL=FALSE \
+		-DBUILD_ruby:BOOL=FALSE \
+		-DBUILD_java:BOOL=FALSE
+MAKE_JOBS_SAFE=	yes

-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
 .include <bsd.port.mk>
--- a/devel/kdebindings4-python-krosspython/distinfo
+++ b/devel/kdebindings4-python-krosspython/distinfo
@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@ -5,54 +5,61 @@
 # $FreeBSD$
 #

-PORTNAME=	kdebindings
+PORTNAME=	pykde4
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	devel kde python
-PKGNAMESUFFIX=	-kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for KDE

-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative \
+LIB_DEPENDS=	okularcore.1:${PORTSDIR}/graphics/okular \
+		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+		soprano.4:${PORTSDIR}/textproc/soprano
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
+		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
 		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
 		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon
-LIB_DEPENDS=	okularcore.1:${PORTSDIR}/graphics/kdegraphics4 \
-		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon \
+		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative
+
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus

-BINDLANG=	python
-BINDMODULE=	pykde4
-
-USE_KDE4=	akonadi kdelibs pimlibs
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs akonadi automoc4
 USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib qmake_build moc_build uic_build rcc_build
+USE_BZIP2=	yes
+USE_CMAKE=	yes
 CMAKE_ARGS+=	-DWITH_PolkitQt:BOOL=FALSE
 MAKE_JOBS_SAFE=	yes

 SUB_FILES=	kdebindings4.pth
 SUB_LIST=	PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}

-EXAMPLESDIR=		${PREFIX}/share/examples/pykde4
-
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
 .include <bsd.port.pre.mk>

 post-patch:
 .if ${OSVERSION} < 800069
-	${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/s,RTLD_NOLOAD |,,' \
-		${PATCH_WRKSRC}/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+	${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/ s,RTLD_NOLOAD |,,' \
+		${PATCH_WRKSRC}/kpythonpluginfactory/kpythonpluginfactory.cpp
 .endif
-	${FIND} -d ${PATCH_WRKSRC}/python/pykde4/sip -name "*.orig" -delete
+	${FIND} -d ${PATCH_WRKSRC}/sip -name "*.orig" -delete

 pre-configure:
-	${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/${SIPDIR_REL},g' \
+	${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/share/py-sip,g' \
 		${BUILD_WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/d' \
-		-e '/ADD_SUBDIRECTORY(tools)/d' \
+	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/ d' \
+		-e '/ADD_SUBDIRECTORY(tools)/ d' \
 		${BUILD_WRKSRC}/CMakeLists.txt
 	${RM} ${BUILD_WRKSRC}/examples/CMakeLists.txt

--- a/devel/kdebindings4-python-pykde4/distinfo
+++ b/devel/kdebindings4-python-pykde4/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
+SHA256 (KDE/pykde4-4.7.2.tar.bz2) = 4ec71a9e3fc799118742ce7eec14ffab5ea94a008126bb0ab5878836890557e1
+SIZE (KDE/pykde4-4.7.2.tar.bz2) = 2106075
--- a/devel/kdebindings4-python-pykde4/files/patch-pythonpykde4init.py
+++ b/devel/kdebindings4-python-pykde4/files/patch-pythonpykde4init.py
@ -1,5 +1,5 @@
--- ./python/pykde4/__init__.py.orig	2008-07-22 04:00:52.000000000 +0400
-+++ ./python/pykde4/__init__.py	2009-05-03 23:18:43.000000000 +0400
+--- ./__init__.py.orig	2011-05-20 22:33:41.000000000 +0200
+++ ./__init__.py	2011-09-01 16:43:57.371033306 +0200
@@ -1,4 +1,3 @@
 -import sys,DLFCN
 +import sys, ctypes
--- a/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp
+++ b/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp
@ -1,5 +1,5 @@
--- python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp~	2009-10-31 16:30:02.000000000 +0200
-+++ python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp	2009-10-31 16:35:50.000000000 +0200
+--- ./kpythonpluginfactory/kpythonpluginfactory.cpp.orig	2011-05-20 22:33:41.000000000 +0200
+++ ./kpythonpluginfactory/kpythonpluginfactory.cpp	2011-09-01 16:43:57.371033306 +0200
@@ -18,6 +18,8 @@
    Boston, MA 02111-1307, USA.
 */
@ -9,7 +9,7 @@
 #include <QtCore/QCoreApplication>
 #include <QFileInfo>
 #include <QDir>
-@@ -295,6 +297,8 @@
+@@ -305,6 +307,8 @@
 // symbols global and available for later loaded libraries/module.
 QLibrary *LoadPythonLibrary()
 {
--- a/devel/kdebindings4-python-pykde4/pkg-plist
+++ b/devel/kdebindings4-python-pykde4/pkg-plist
@ -10,6 +10,7 @@ lib/kde4/kpythonpluginfactory.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kio.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/knewstuff.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kparts.so
+%%PYTHON_SITELIBDIR%%/PyKDE4/kterminal.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/ktexteditor.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kutils.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/nepomuk.so
@ -44,6 +45,7 @@ lib/kde4/kpythonpluginfactory.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kioExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/katepart.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/konsolepart.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kutilsExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/PkExampleUi.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/README
@ -334,8 +336,10 @@ share/py-sip/PyKDE4/kdeui/kconfigdialogmanager.sip
 share/py-sip/PyKDE4/kdeui/kconfigskeleton.sip
 share/py-sip/PyKDE4/kdeui/kcrash.sip
 share/py-sip/PyKDE4/kdeui/kcursor.sip
+share/py-sip/PyKDE4/kdeui/kdatecombobox.sip
 share/py-sip/PyKDE4/kdeui/kdatepicker.sip
 share/py-sip/PyKDE4/kdeui/kdatetable.sip
+share/py-sip/PyKDE4/kdeui/kdatetimeedit.sip
 share/py-sip/PyKDE4/kdeui/kdatetimewidget.sip
 share/py-sip/PyKDE4/kdeui/kdatewidget.sip
 share/py-sip/PyKDE4/kdeui/kdeprintdialog.sip
@ -359,6 +363,7 @@ share/py-sip/PyKDE4/kdeui/kfontcombobox.sip
 share/py-sip/PyKDE4/kdeui/kfontdialog.sip
 share/py-sip/PyKDE4/kdeui/kfontrequester.sip
 share/py-sip/PyKDE4/kdeui/kfontsizeaction.sip
+share/py-sip/PyKDE4/kdeui/kfontutils.sip
 share/py-sip/PyKDE4/kdeui/kgesture.sip
 share/py-sip/PyKDE4/kdeui/kglobalaccel.sip
 share/py-sip/PyKDE4/kdeui/kglobalsettings.sip
@ -390,6 +395,7 @@ share/py-sip/PyKDE4/kdeui/kmenu.sip
 share/py-sip/PyKDE4/kdeui/kmenubar.sip
 share/py-sip/PyKDE4/kdeui/kmessagebox.sip
 share/py-sip/PyKDE4/kdeui/kmessageboxmessagehandler.sip
+share/py-sip/PyKDE4/kdeui/kmessagewidget.sip
 share/py-sip/PyKDE4/kdeui/kmodelindexproxymapper.sip
 share/py-sip/PyKDE4/kdeui/kmodifierkeyinfo.sip
 share/py-sip/PyKDE4/kdeui/kmultitabbar.sip
@ -403,7 +409,6 @@ share/py-sip/PyKDE4/kdeui/kpagemodel.sip
 share/py-sip/PyKDE4/kdeui/kpageview.sip
 share/py-sip/PyKDE4/kdeui/kpagewidget.sip
 share/py-sip/PyKDE4/kdeui/kpagewidgetmodel.sip
-share/py-sip/PyKDE4/kdeui/kpalette.sip
 share/py-sip/PyKDE4/kdeui/kpassivepopup.sip
 share/py-sip/PyKDE4/kdeui/kpassivepopupmessagehandler.sip
 share/py-sip/PyKDE4/kdeui/kpassworddialog.sip
@ -458,7 +463,7 @@ share/py-sip/PyKDE4/kdeui/ktabbar.sip
 share/py-sip/PyKDE4/kdeui/ktabwidget.sip
 share/py-sip/PyKDE4/kdeui/ktextbrowser.sip
 share/py-sip/PyKDE4/kdeui/ktextedit.sip
-share/py-sip/PyKDE4/kdeui/ktimezone.sip
+share/py-sip/PyKDE4/kdeui/ktimecombobox.sip
 share/py-sip/PyKDE4/kdeui/ktimezonewidget.sip
 share/py-sip/PyKDE4/kdeui/ktip.sip
 share/py-sip/PyKDE4/kdeui/ktitlewidget.sip
@ -556,6 +561,7 @@ share/py-sip/PyKDE4/kio/global.sip
 share/py-sip/PyKDE4/kio/job.sip
 share/py-sip/PyKDE4/kio/jobclasses.sip
 share/py-sip/PyKDE4/kio/jobuidelegate.sip
+share/py-sip/PyKDE4/kio/kabstractfileitemactionplugin.sip
 share/py-sip/PyKDE4/kio/kabstractfilemodule.sip
 share/py-sip/PyKDE4/kio/kabstractfilewidget.sip
 share/py-sip/PyKDE4/kio/kacl.sip
@ -580,7 +586,6 @@ share/py-sip/PyKDE4/kio/kdesktopfileactions.sip
 share/py-sip/PyKDE4/kio/kdevicelistmodel.sip
 share/py-sip/PyKDE4/kio/kdirlister.sip
 share/py-sip/PyKDE4/kio/kdirmodel.sip
-share/py-sip/PyKDE4/kio/kdirnotify.sip
 share/py-sip/PyKDE4/kio/kdiroperator.sip
 share/py-sip/PyKDE4/kio/kdirselectdialog.sip
 share/py-sip/PyKDE4/kio/kdirsortfilterproxymodel.sip
@ -622,10 +627,12 @@ share/py-sip/PyKDE4/kio/kopenwithdialog.sip
 share/py-sip/PyKDE4/kio/kpreviewwidgetbase.sip
 share/py-sip/PyKDE4/kio/kpropertiesdialog.sip
 share/py-sip/PyKDE4/kio/kprotocolmanager.sip
+share/py-sip/PyKDE4/kio/krecentdirs.sip
 share/py-sip/PyKDE4/kio/krecentdocument.sip
 share/py-sip/PyKDE4/kio/kremoteencoding.sip
 share/py-sip/PyKDE4/kio/krun.sip
 share/py-sip/PyKDE4/kio/ksambashare.sip
+share/py-sip/PyKDE4/kio/ksambasharedata.sip
 share/py-sip/PyKDE4/kio/kscan.sip
 share/py-sip/PyKDE4/kio/kservicegroup.sip
 share/py-sip/PyKDE4/kio/kshellcompletion.sip
@ -721,6 +728,19 @@ share/py-sip/PyKDE4/kparts/sipkpartspart6.cpp
 share/py-sip/PyKDE4/kparts/sipkpartspart7.cpp
 share/py-sip/PyKDE4/kparts/statusbarextension.sip
 share/py-sip/PyKDE4/kparts/textextension.sip
+share/py-sip/PyKDE4/kterminal/kterminal.sip
+share/py-sip/PyKDE4/kterminal/kterminalmod.sip
+share/py-sip/PyKDE4/kterminal/sipAPIkterminal.h
+share/py-sip/PyKDE4/kterminal/sipkterminalpart0.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart1.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart2.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart3.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart4.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart5.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart6.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart7.cpp
+share/py-sip/PyKDE4/kterminal/terminal_interface.sip
+share/py-sip/PyKDE4/kterminal/terminal_interface_v2.sip
 share/py-sip/PyKDE4/ktexteditor/attribute.sip
 share/py-sip/PyKDE4/ktexteditor/codecompletioninterface.sip
 share/py-sip/PyKDE4/ktexteditor/codecompletionmodel.sip
@ -857,6 +877,7 @@ share/py-sip/PyKDE4/phonon/mediacontroller.sip
 share/py-sip/PyKDE4/phonon/medianode.sip
 share/py-sip/PyKDE4/phonon/mediaobject.sip
 share/py-sip/PyKDE4/phonon/mediasource.sip
+share/py-sip/PyKDE4/phonon/mrl.sip
 share/py-sip/PyKDE4/phonon/objectdescription.sip
 share/py-sip/PyKDE4/phonon/objectdescriptionmodel.sip
 share/py-sip/PyKDE4/phonon/packet.sip
@ -1002,6 +1023,7 @@ share/py-sip/PyKDE4/solid/genericinterface.sip
 share/py-sip/PyKDE4/solid/internetgateway.sip
 share/py-sip/PyKDE4/solid/networking.sip
 share/py-sip/PyKDE4/solid/networkinterface.sip
+share/py-sip/PyKDE4/solid/networkshare.sip
 share/py-sip/PyKDE4/solid/opticaldisc.sip
 share/py-sip/PyKDE4/solid/opticaldrive.sip
 share/py-sip/PyKDE4/solid/portablemediaplayer.sip
@ -1103,6 +1125,7 @@ share/py-sip/PyKDE4/soprano/xsd.sip
@dirrm share/py-sip/PyKDE4/nepomuk
@dirrm share/py-sip/PyKDE4/kutils
@dirrm share/py-sip/PyKDE4/ktexteditor
+@dirrm share/py-sip/PyKDE4/kterminal
@dirrm share/py-sip/PyKDE4/kparts
@dirrm share/py-sip/PyKDE4/knewstuff
@dirrm share/py-sip/PyKDE4/kio
--- a/devel/kdebindings4-python-pykdeuic4/Makefile
+++ b/devel/kdebindings4-python-pykdeuic4/Makefile
@ -5,30 +5,31 @@
 # $FreeBSD$
 #

-PORTNAME=	kdebindings
+PORTNAME=	pykdeuic4
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	devel kde python
-PKGNAMESUFFIX=	-pykdeuic4
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}kdebindings-
+DISTNAME=	pykde4-${PORTVERSION}
+DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	An enhanced version of pyuic4

-BINDLANG=	python
-BINDMODULE=	pykde4
-
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4 pykde4
 USE_PYTHON=	2.5+
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
-#override USE_KDE4 from Makefile.kdebindings:
-USE_KDE4=	kdelibs automoc4 pykde4
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib qmake_build moc_build uic_build rcc_build
+USE_BZIP2=	yes
+DISTINFO_FILE=	${PORTSDIR}/devel/kdebindings4-python-pykde4/distinfo
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes

-CMAKE_SOURCE_PATH=	${BUILD_WRKSRC}
-CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
-BUILD_WRKSRC=	${WRKSRC}/python/pykde4/tools
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+WRKSRC=		${WRKDIR}/${DISTNAME}/tools/${PORTNAME}

 pre-configure:
-	${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/${SIPDIR_REL},g' \
-		-e 's,$${PYTHON_SITE_PACKAGES_DIR},${PYTHONPREFIX_SITELIBDIR},g' \
-		${BUILD_WRKSRC}/pykdeuic4/CMakeLists.txt
+	${REINPLACE_CMD} -e 's,$${PYTHON_SITE_PACKAGES_INSTALL_DIR},${PYTHONPREFIX_SITELIBDIR},g' \
+		${WRKSRC}/CMakeLists.txt

 .include <bsd.port.mk>
--- a/devel/kdebindings4-python-pykdeuic4/distinfo
+++ b/devel/kdebindings4-python-pykdeuic4/distinfo
@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
--- a/devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt
+++ b/devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt
@ -0,0 +1,9 @@
+--- ./CMakeLists.txt.orig	2011-05-20 22:33:41.000000000 +0200
+++ ./CMakeLists.txt	2011-09-01 17:21:32.451109357 +0200
+@@ -1,3 +1,6 @@
+find_package(KDE4 REQUIRED)
+FIND_PACKAGE(PythonLibrary REQUIRED)
+INCLUDE(PythonMacros)
+ 
+ PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
+ PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
--- a/devel/kdebindings4-python-pykdeuic4/files/patch-pythonpykde4tools__CMakeLists.txt
+++ b/devel/kdebindings4-python-pykdeuic4/files/patch-pythonpykde4tools__CMakeLists.txt
@ -1,8 +0,0 @@
--- ./python/pykde4/tools/CMakeLists.txt.orig	2009-12-31 16:34:47.000000000 +0300
-+++ ./python/pykde4/tools/CMakeLists.txt	2010-05-30 17:50:19.644735673 +0400
-@@ -1 +1,5 @@
-+find_package(KDE4 REQUIRED)
-+FIND_PACKAGE(PythonLibrary REQUIRED)
-+INCLUDE(PythonMacros)
-+
- ADD_SUBDIRECTORY(pykdeuic4)
--- a/devel/kdebindings4-python/Makefile
+++ b/devel/kdebindings4-python/Makefile
@ -7,21 +7,21 @@

 PORTNAME=	kdebindings
 PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	devel kde
+CATEGORIES=	devel kde python
 MASTER_SITES=	# empty
-PKGNAMESUFFIX=	-python
-DISTFILES=	# none
-UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	# empty

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Meta port of Python bindings for KDE
+COMMENT=	Meta-port of Python bindings for KDE

 USE_KDE4=	kdeprefix
+USE_PYTHON=	yes
+PYTHON_NO_DEPENDS=	yes
 NO_BUILD=	yes
-# NO_INSTALL=	yes

-OPTIONS+=	KROSSPYTHON "Kross Python scripting library" on
-OPTIONS+=	PYKDE4 "Kde bindings" on
+OPTIONS=	KROSSPYTHON "Kross Python scripting library" on \
+		PYKDE4 "KDE bindings" on

 .include <bsd.port.options.mk>

@ -31,7 +31,7 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/kdebindin

 .if !defined(WITHOUT_PYKDE4)
 RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so:${PORTSDIR}/devel/kdebindings4-python-pykde4 \
-		${LOCALBASE}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
+		${KDE4_PREFIX}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
 .endif

 do-install:
--- a/devel/kdebindings4-ruby-korundum/Makefile
+++ b/devel/kdebindings4-ruby-korundum/Makefile
@ -0,0 +1,59 @@
+# New ports collection makefile for:	korundum
+# Date created:				2 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	korundum
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Ruby bindings for KDE
+
+LIB_DEPENDS=	qtruby4shared.2:${PORTSDIR}/devel/kdebindings4-ruby-qtruby \
+		smokekdecore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokekde \
+		smokebase.3:${PORTSDIR}/devel/kdebindings4-smoke-smokegen \
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		kateinterfaces.5:${PORTSDIR}/editors/kate \
+		smokeqtcore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt \
+		okularcore.1:${PORTSDIR}/graphics/okular
+
+CONFLICTS=	ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs akonadi automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus network opengl sql svg xml \
+		qmake_build moc_build uic_build rcc_build
+USE_RUBY=	yes
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+SUB_FILES=	ruby-kdebindings-env.sh pkg-message
+SUB_LIST+=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \
+		RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR}
+
+.include <bsd.port.pre.mk>
+
+CMAKE_ARGS+=	-DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
+		-DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
+		-DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \
+		-DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR}
+
+pre-configure:
+	${REINPLACE_CMD} -e '/examples/ d' \
+		${WRKSRC}/CMakeLists.txt \
+		${WRKSRC}/modules/plasma/CMakeLists.txt
+
+post-install:
+	${MKDIR} ${PREFIX}/env
+	${INSTALL_SCRIPT} ${WRKDIR}/ruby-kdebindings-env.sh ${PREFIX}/env
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
--- a/devel/kdebindings4-ruby-korundum/distinfo
+++ b/devel/kdebindings4-ruby-korundum/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/korundum-4.7.2.tar.bz2) = cb787541100e29470926f1a7dd7bd5be497fdedadc8ecdfd86da272415cd24b5
+SIZE (KDE/korundum-4.7.2.tar.bz2) = 180137
--- a/devel/kdebindings4-ruby-korundum/files/pkg-message.in
+++ b/devel/kdebindings4-ruby-korundum/files/pkg-message.in
--- a/devel/kdebindings4-ruby-korundum/files/ruby-kdebindings-env.sh.in
+++ b/devel/kdebindings4-ruby-korundum/files/ruby-kdebindings-env.sh.in
--- a/devel/kdebindings4-ruby-korundum/pkg-descr
+++ b/devel/kdebindings4-ruby-korundum/pkg-descr
@ -0,0 +1,3 @@
+This port provides Ruby bindings for KDE.
+
+WWW:	http://www.kde.org/
--- a/devel/kdebindings4-ruby-korundum/pkg-plist
+++ b/devel/kdebindings4-ruby-korundum/pkg-plist
@ -0,0 +1,38 @@
+bin/krubyapplication
+bin/rbkconfig_compiler4
+env/ruby-kdebindings-env.sh
+lib/kde4/krubypluginfactory.so
+%%RUBY_SITELIBDIR%%/KDE/kate.rb
+%%RUBY_SITELIBDIR%%/KDE/korundum4.rb
+%%RUBY_SITELIBDIR%%/KDE/plasma.rb
+%%RUBY_SITELIBDIR%%/akonadi/akonadi.rb
+%%RUBY_SITEARCHLIBDIR%%/akonadi.so
+%%RUBY_SITEARCHLIBDIR%%/kate.so
+%%RUBY_SITEARCHLIBDIR%%/khtml.so
+%%RUBY_SITEARCHLIBDIR%%/kio.so
+%%RUBY_SITEARCHLIBDIR%%/korundum4.so
+%%RUBY_SITEARCHLIBDIR%%/ktexteditor.so
+%%RUBY_SITEARCHLIBDIR%%/nepomuk.so
+%%RUBY_SITEARCHLIBDIR%%/okular.so
+%%RUBY_SITEARCHLIBDIR%%/plasma_applet.so
+%%RUBY_SITEARCHLIBDIR%%/solid.so
+%%RUBY_SITEARCHLIBDIR%%/soprano.so
+%%RUBY_SITELIBDIR%%/khtml/khtml.rb
+%%RUBY_SITELIBDIR%%/kio/kio.rb
+%%RUBY_SITELIBDIR%%/ktexteditor/ktexteditor.rb
+%%RUBY_SITELIBDIR%%/nepomuk/nepomuk.rb
+%%RUBY_SITELIBDIR%%/okular/okular.rb
+%%RUBY_SITELIBDIR%%/solid/solid.rb
+%%RUBY_SITELIBDIR%%/soprano/soprano.rb
+@dirrm %%RUBY_SITELIBDIR%%/soprano
+@dirrm %%RUBY_SITELIBDIR%%/solid
+@dirrm %%RUBY_SITELIBDIR%%/okular
+@dirrm %%RUBY_SITELIBDIR%%/nepomuk
+@dirrm %%RUBY_SITELIBDIR%%/ktexteditor
+@dirrm %%RUBY_SITELIBDIR%%/kio
+@dirrm %%RUBY_SITELIBDIR%%/khtml
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITELIBDIR%%/akonadi
+@dirrm %%RUBY_SITELIBDIR%%/KDE
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry env
--- a/devel/kdebindings4-ruby-krossruby/Makefile
+++ b/devel/kdebindings4-ruby-krossruby/Makefile
@ -0,0 +1,41 @@
+# New ports collection makefile for:	kdebindings4-ruby-krossruby
+# Date created:				1 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	krossruby
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}kdebindings-
+DISTNAME=	kross-interpreters-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Ruby bindings for Qt/KDE
+
+CONFLICTS=	ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
+USE_RUBY=	yes
+USE_BZIP2=	yes
+DISTINFO_FILE=	${PORTSDIR}/devel/kdebindings4-kross-interpreters/distinfo
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DBUILD_python:BOOL=FALSE \
+		-DBUILD_falcon:BOOL=FALSE \
+		-DBUILD_java:BOOL=FALSE
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.pre.mk>
+
+# Kross Ruby is broken with Ruby 1.9, see http://bugs.kde.org/243565
+.if ${RUBY_VER} == 1.9
+BROKEN=		does not build with Ruby 1.9
+.endif
+
+.include <bsd.port.post.mk>
--- a/devel/kdebindings4-ruby-krossruby/pkg-descr
+++ b/devel/kdebindings4-ruby-krossruby/pkg-descr
@ -0,0 +1,3 @@
+This port provides Ruby bindings for Qt and KDE.
+
+WWW:	http://www.kde.org/
--- a/devel/kdebindings4-ruby-krossruby/pkg-plist
+++ b/devel/kdebindings4-ruby-krossruby/pkg-plist
@ -0,0 +1 @@
+lib/kde4/krossruby.so
--- a/devel/kdebindings4-ruby-qtruby/Makefile
+++ b/devel/kdebindings4-ruby-qtruby/Makefile
@ -0,0 +1,53 @@
+# New ports collection makefile for:	kdebindings4-ruby
+# Date created:		2008-08-19
+# Whom:			Max Brazhnikov <makc@issp.ac.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	qtruby
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Ruby bindings for Qt
+
+LIB_DEPENDS=	smokeqtcore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt \
+		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+		qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+
+CONFLICTS=	ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4=	kdehier kdeprefix
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus declarative designer gui network \
+		phonon qtestlib script webkit xml \
+		qmake_build moc_build uic_build rcc_build
+USE_RUBY=	yes
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	yes
+
+SUB_LIST+=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \
+		RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR}
+
+.include <bsd.port.pre.mk>
+
+CMAKE_ARGS+=	-DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
+		-DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
+		-DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \
+		-DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR}
+
+post-patch:
+	${REINPLACE_CMD} -e 's|QWT_FOUND|Qwt5_FOUND|g' \
+		${WRKSRC}/src/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|share/qtruby4/cmake|lib/cmake/qtruby4|g' \
+		${WRKSRC}/cmake/CMakeLists.txt \
+		${WRKSRC}/src/CMakeLists.txt
+
+.include <bsd.port.post.mk>
--- a/devel/kdebindings4-ruby-qtruby/distinfo
+++ b/devel/kdebindings4-ruby-qtruby/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/qtruby-4.7.2.tar.bz2) = c4be0d334b77360ce0cdc2c4d5bbf421ee232ad520ad7711a2b3e4ef260e2edc
+SIZE (KDE/qtruby-4.7.2.tar.bz2) = 613635
--- a/Show more
+++ b/Show more