4 files changed, 4 insertions, 59 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 7d9796b9cc08..da3c846ba773 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 8bbc0f452193..bbc8a5665152 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdegraphics-4.6.1.tar.bz2) = ab5c45f99ef0649d60ef4cc2936573d9561d1ec8c4ce4721191a3079aae2894e
-SIZE (KDE/kdegraphics-4.6.1.tar.bz2) = 5101555
+SHA256 (KDE/kdegraphics-4.6.2.tar.bz2) = 7941c4b1caedca839b27c7d405fb5a63bb76ae98f2ba332fcb319ee1dd4efeaa
+SIZE (KDE/kdegraphics-4.6.2.tar.bz2) = 5165180
diff --git a/graphics/kdegraphics4/files/patch-gwenview__lib__memoryutils.cpp b/graphics/kdegraphics4/files/patch-gwenview__lib__memoryutils.cpp
deleted file mode 100644
index 88fbfea2b84e..000000000000
--- a/graphics/kdegraphics4/files/patch-gwenview__lib__memoryutils.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
---- ./gwenview/lib/memoryutils.cpp.orig	2010-12-13 02:03:56.937466810 +0100
-+++ ./gwenview/lib/memoryutils.cpp	2010-12-13 02:10:42.437502217 +0100
-@@ -32,6 +32,10 @@
- #ifdef Q_OS_WIN
- #define _WIN32_WINNT 0x0500
- #include <windows.h>
-+#elif defined(Q_OS_FREEBSD)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <vm/vm_param.h>
- #endif
- 
- namespace Gwenview {
-@@ -61,6 +64,12 @@
-         if ( entry.startsWith( "MemTotal:" ) )
-             return (cachedValue = (Q_UINT64_C(1024) * entry.section( ' ', -2, -2 ).toULongLong()));
-     }
-+#elif defined(Q_OS_FREEBSD)
-+    qulonglong physmem;
-+    int mib[] = {CTL_HW, HW_PHYSMEM};
-+    size_t len = sizeof( physmem );
-+    if ( sysctl( mib, 2, &physmem, &len, NULL, 0 ) == 0 )
-+        return (cachedValue = physmem);
- #elif defined(Q_OS_WIN)
-     MEMORYSTATUSEX stat;
-     stat.dwLength = sizeof(stat);
-@@ -107,6 +116,26 @@
-     lastUpdate = QTime::currentTime();
- 
-     return ( cachedValue = (Q_UINT64_C(1024) * memoryFree) );
-+#elif defined(Q_OS_FREEBSD)
-+    qulonglong cache, inact, free, psize;
-+    size_t cachelen, inactlen, freelen, psizelen;
-+    cachelen = sizeof( cache );
-+    inactlen = sizeof( inact );
-+    freelen = sizeof( free );
-+    psizelen = sizeof( psize );
-+    // sum up inactive, cached and free memory
-+    if ( sysctlbyname( "vm.stats.vm.v_cache_count", &cache, &cachelen, NULL, 0 ) == 0 &&
-+            sysctlbyname( "vm.stats.vm.v_inactive_count", &inact, &inactlen, NULL, 0 ) == 0 &&
-+            sysctlbyname( "vm.stats.vm.v_free_count", &free, &freelen, NULL, 0 ) == 0 &&
-+            sysctlbyname( "vm.stats.vm.v_page_size", &psize, &psizelen, NULL, 0 ) == 0 )
-+    {
-+        lastUpdate = QTime::currentTime();
-+        return (cachedValue = (cache + inact + free) * psize);
-+    }
-+    else
-+    {
-+        return 0;
-+    }
- #elif defined(Q_OS_WIN)
-     MEMORYSTATUSEX stat;
-     stat.dwLength = sizeof(stat);
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index f13db71659c6..3461c30d458a 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -66,6 +66,7 @@ include/okular/core/version.h
 include/okular/interfaces/configinterface.h
 include/okular/interfaces/guiinterface.h
 include/okular/interfaces/printinterface.h
+lib/cmake/KSane/KSaneConfig.cmake
 lib/cmake/Okular/OkularConfig.cmake
 lib/cmake/Okular/OkularConfigVersion.cmake
 lib/kde4/gsthumbnail.so
@@ -143,7 +144,6 @@ share/applications/kde4/okularApplication_pdf.desktop
 share/applications/kde4/okularApplication_plucker.desktop
 share/applications/kde4/okularApplication_tiff.desktop
 share/applications/kde4/okularApplication_xps.desktop
-share/apps/cmake/modules/FindKSane.cmake
 share/apps/gvpart/gvpart.rc
 share/apps/gwenview/cursors/zoom.png
 share/apps/gwenview/fullscreenthemes/blackglass/checked.png
@@ -547,9 +547,8 @@ share/kde4/servicetypes/okularGenerator.desktop
 @dirrm share/apps/gwenview/cursors
 @dirrm share/apps/gwenview
 @dirrm share/apps/gvpart
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
 @dirrm lib/cmake/Okular
+@dirrm lib/cmake/KSane
 @dirrmtry lib/cmake
 @dirrm include/okular/interfaces
 @dirrm include/okular/core