4 files changed, 36 insertions, 28 deletions

diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 57a1a3875fc4..8794c784f439 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -6,24 +6,28 @@
 #
 
 PORTNAME=	filelight
-PORTVERSION=	1.9
-PORTREVISION=	2
+PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils kde
-MASTER_SITES=	http://www.kde-apps.org/CONTENT/content-files/
-DISTNAME=	99561-${PORTNAME}-${PORTVERSION}rc3
-EXTRACT_SUFX=	.tgz
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}rc3
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DISTNAME=	kdeutils-${PORTVERSION}
+DIST_SUBDIR=	KDE
 
-MAINTAINER=	rnejdl@ringofsaturn.com
-COMMENT=	Represent a file system as a set of concentric segmented-rings
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Map of concentric segmented-rings representing your file system
 
-LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+LATEST_LINK=	${PORTNAME}-kde4
+
+CONFLICTS=	kdeutils-4.6.*
+
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+DISTINFO_FILE=	${PORTSDIR}/misc/kdeutils4/distinfo
 MAKE_JOBS_SAFE=	yes
-USE_CMAKE=	yes
-USE_LDCONFG=	yes
-LATEST_LINK=	filelight-kde4
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/filelight-kde4/distinfo b/sysutils/filelight-kde4/distinfo
deleted file mode 100644
index 5c487028f8e3..000000000000
--- a/sysutils/filelight-kde4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (99561-filelight-1.9rc3.tgz) = 58a323aff9939c5c31629bd5ac96118d092c90a2b1d7dd42d479332287e85e52
-SIZE (99561-filelight-1.9rc3.tgz) = 93481
diff --git a/sysutils/filelight-kde4/pkg-descr b/sysutils/filelight-kde4/pkg-descr
index d64113c5bf46..ed937adb96fd 100644
--- a/sysutils/filelight-kde4/pkg-descr
+++ b/sysutils/filelight-kde4/pkg-descr
@@ -1,9 +1,7 @@
-Filelight graphically represents a file system as a set of
-concentric segmented-rings, indicating where diskspace is
-being used. Segments expanding from the center represent
-files (including directories), with each segment's size 
-being proportional to the file's size and directories
-having child segments. 
+Filelight allows you to quickly understand exactly where your
+diskspace is being used by graphically representing your file system
+as a set of concentric segmented-rings. You can use it to locate
+hotspots of disk usage and then manipulate those areas using a file
+manager.
 
-Author: Max Howell <max.howell@methylblue.com>
-WWW: http://www.methylblue.com/filelight/
+WWW: http://utils.kde.org/projects/filelight
diff --git a/sysutils/filelight-kde4/pkg-plist b/sysutils/filelight-kde4/pkg-plist
index bb83306e65e4..57f67cabf89d 100644
--- a/sysutils/filelight-kde4/pkg-plist
+++ b/sysutils/filelight-kde4/pkg-plist
@@ -1,15 +1,23 @@
 bin/filelight
 lib/kde4/filelightpart.so
-share/kde4/services/filelight_part.desktop
 share/applications/kde4/filelight.desktop
-share/config/filelightrc
-share/apps/filelightpart/filelight_partui.rc
 share/apps/filelight/filelightui.rc
-share/icons/hicolor/32x32/actions/view_filelight.png
+share/apps/filelightpart/filelightpartui.rc
+share/config/filelightrc
+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/icons/hicolor/16x16/apps/filelight.png
 share/icons/hicolor/22x22/apps/filelight.png
+share/icons/hicolor/32x32/actions/view_filelight.png
 share/icons/hicolor/32x32/apps/filelight.png
 share/icons/hicolor/48x48/apps/filelight.png
 share/icons/hicolor/64x64/apps/filelight.png
+share/kde4/services/filelightpart.desktop
+@dirrm share/doc/HTML/en/filelight
 @dirrm share/apps/filelightpart
 @dirrm share/apps/filelight