6 files changed, 34 insertions, 175 deletions

diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index e4026f85cf9f..bf11844a7c90 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/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
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 7998ee370781..1d6bc1f3ed86 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/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
diff --git a/sysutils/kfloppy/files/patch-ark-kerfuffle-cliiterface.cpp b/sysutils/kfloppy/files/patch-ark-kerfuffle-cliiterface.cpp
deleted file mode 100644
index f2298e0f4493..000000000000
--- a/sysutils/kfloppy/files/patch-ark-kerfuffle-cliiterface.cpp
+++ /dev/null
@@ -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
diff --git a/sysutils/kfloppy/files/patch-kcalc-kcalc.ui b/sysutils/kfloppy/files/patch-kcalc-kcalc.ui
deleted file mode 100644
index b5f94af5bfec..000000000000
--- a/sysutils/kfloppy/files/patch-kcalc-kcalc.ui
+++ /dev/null
@@ -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>
diff --git a/sysutils/kfloppy/pkg-descr b/sysutils/kfloppy/pkg-descr
index 90ae45773bea..e1be153978a1 100644
--- a/sysutils/kfloppy/pkg-descr
+++ b/sysutils/kfloppy/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
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 5d7d0ab4213d..075e9e1e6330 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/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