Update to KDE SC 4.8.0

5 files changed, 24 insertions, 79 deletions

diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index a60a02ce217..0b4aa6715ce 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,32 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2012/03/03 00:13:55 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.28 2012/03/20 05:41:02 markd Exp $
 
-DISTNAME=	filelight-1.0
-PKGREVISION=	20
+DISTNAME=	filelight-${_KDE_VERSION}
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.methylblue.com/filelight/packages/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.methylblue.com/filelight/
 COMMENT=	Graphical filesystem usage monitor
+LICENSE=	gnu-gpl-v3
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=	yes
-SET_LIBDIR=	yes
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	perl
+.include "../../meta-pkgs/kde4/Makefile.kde4"
 
-pre-build:
-	cd ${WRKSRC}/src/part && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} dialog.h
+.include "../../meta-pkgs/kde4/kde4.mk"
 
-.include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/filelight/PLIST b/sysutils/filelight/PLIST
index 7a85d43e96f..00f32d28410 100644
--- a/sysutils/filelight/PLIST
+++ b/sysutils/filelight/PLIST
@@ -1,14 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/20 05:41:02 markd Exp $
 bin/filelight
-lib/kde3/libfilelight.la
-share/icons/crystalsvg/32x32/actions/view_filelight.png
+lib/kde4/filelightpart.so
+share/applications/kde4/filelight.desktop
+share/doc/kde/HTML/en/filelight/common
+share/doc/kde/HTML/en/filelight/config_appear.png
+share/doc/kde/HTML/en/filelight/config_scan.png
+share/doc/kde/HTML/en/filelight/index.cache.bz2
+share/doc/kde/HTML/en/filelight/index.docbook
+share/doc/kde/HTML/en/filelight/radial_map.png
+share/doc/kde/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/applications/kde/filelight.desktop
-share/kde/apps/filelight/filelight_partui.rc
 share/kde/apps/filelight/filelightui.rc
+share/kde/apps/filelightpart/filelightpartui.rc
 share/kde/config/filelightrc
-share/kde/services/filelight_part.desktop
+share/kde4/services/filelightpart.desktop
diff --git a/sysutils/filelight/distinfo b/sysutils/filelight/distinfo
index 28c2763b72c..2b2f572ba5e 100644
--- a/sysutils/filelight/distinfo
+++ b/sysutils/filelight/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/10/17 10:03:59 rillig Exp $
+$NetBSD: distinfo,v 1.4 2012/03/20 05:41:02 markd Exp $
 
-SHA1 (filelight-1.0.tar.bz2) = 2a4644c598dfcc408af0af65e655e2525494708d
-RMD160 (filelight-1.0.tar.bz2) = 67ce0deb03f14cc280f7471156c4f2a3135ebb5e
-Size (filelight-1.0.tar.bz2) = 530449 bytes
-SHA1 (patch-aa) = f068ff507d46c00a5ac6a941e3b5e564b3b9b3ff
-SHA1 (patch-ab) = 36669e158ad403669adb803adf242fa64b7caa5d
+SHA1 (filelight-4.8.0.tar.bz2) = d0e628ba95f60b7c67ad10e4f6ab14d0e24fc8f5
+RMD160 (filelight-4.8.0.tar.bz2) = a2202a806440638b8cb9cca82911967ae36817f0
+Size (filelight-4.8.0.tar.bz2) = 303609 bytes
diff --git a/sysutils/filelight/patches/patch-aa b/sysutils/filelight/patches/patch-aa
deleted file mode 100644
index acec58f7213..00000000000
--- a/sysutils/filelight/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/10/17 10:04:00 rillig Exp $
-
---- src/part/radialMap/map.cpp.orig	2001-08-06 01:00:00.000000000 +0200
-+++ src/part/radialMap/map.cpp	2007-10-17 11:56:15.000000000 +0200
-@@ -337,7 +337,7 @@ RadialMap::Map::paint( unsigned int scal
-    {
-       int width = rect.width() / 2;
-       //clever geometric trick to find largest angle that will give biggest arrow head
--      int a_max = int(acos( (double)width / double((width + 5) * scaleFactor) ) * (180*16 / M_PI));
-+      double a_max = acos( (double)width / double((width + 5) * scaleFactor) ) * (180*16 / M_PI);
- 
-       for( ConstIterator<Segment> it = m_signature[x].constIterator(); it != m_signature[x].end(); ++it )
-       {
-@@ -351,10 +351,10 @@ RadialMap::Map::paint( unsigned int scal
-             //draw arrow head to indicate undisplayed files/directories
-             QPointArray pts( 3 );
-             QPoint pos, cpos = rect.center();
--            int a[3] = { (*it)->start(), (*it)->length(), 0 };
-+            double a[3] = { (*it)->start(), (*it)->length(), 0 };
- 
-             a[2] = a[0] + (a[1] / 2); //assign to halfway between
--            if( a[1] > a_max )
-+            if(a[1] > a_max )
-             {
-                a[1] = a_max;
-                a[0] = a[2] - a_max / 2;
diff --git a/sysutils/filelight/patches/patch-ab b/sysutils/filelight/patches/patch-ab
deleted file mode 100644
index 26b35fee908..00000000000
--- a/sysutils/filelight/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/10/17 10:04:00 rillig Exp $
-
---- src/part/radialMap/sincos.h.orig	2001-08-06 01:00:00.000000000 +0200
-+++ src/part/radialMap/sincos.h	2007-10-17 11:06:22.000000000 +0200
-@@ -9,11 +9,11 @@
- #if !defined(__GLIBC__) || (__GLIBC__ < 2) ||  (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
- 
-    void
--   sincos( int angleRadians, double *Sin, double *Cos );
-+   sincos( double angleRadians, double *Sin, double *Cos );
- 
- #ifdef SINCOS_H_IMPLEMENTATION
-    void
--   sincos( int angleRadians, double *Sin, double *Cos )
-+   sincos( double angleRadians, double *Sin, double *Cos )
-    {
-       *Sin = sin( angleRadians );
-       *Cos = cos( angleRadians );