Add patch to make superkaramba calculate memory correctly on FreeBSD.

Package-Manager: portage-2.0.53

4 files changed, 172 insertions, 7 deletions

diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 86b84078dd40..b7e06b23eacc 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.14 2005/12/04 12:33:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.15 2005/12/09 13:58:03 flameeyes Exp $
+
+  09 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/superkaramba-3.5.0-fbsd.patch, superkaramba-3.5.0.ebuild:
+  Add patch to make superkaramba calculate memory correctly on FreeBSD.
 
   04 Dec 2005; Bryan Østergaard <kloeri@gentoo.org>
   superkaramba-3.5.0.ebuild:
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index a610e78e4e76..a20e1d0b76e0 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 68d91fffb3414f6b67b0a9f03957a389 ChangeLog 1886
+MD5 def5bf93898998e5701a94ef36d40291 ChangeLog 2082
 MD5 61427700c31d5d6a145005b5945e00e5 files/digest-superkaramba-3.5.0 68
+MD5 82cc61148d380f77c98ea1b8bc88dbef files/superkaramba-3.5.0-fbsd.patch 4218
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 59b08f81326ab035a33519c8b3ee942f superkaramba-3.5.0.ebuild 466
+MD5 9c7972bb272902182dd70dd58b30fad7 superkaramba-3.5.0.ebuild 508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDkuIXugEuf3OQ0akRAtcKAJ0cyKfAQATGkL+4jkgKGKYPf/obWwCfUQWG
-z7i5KZeGd5GjuTQetGt83uY=
-=cdud
+iD8DBQFDmY1+AiZjviIA2XgRAnEHAJ9tLT2mlwRXnU7uM37o8HatEJwRWACgsIVS
+bX3QUR5+3tCDoLVYFQSud44=
+=oPMd
 -----END PGP SIGNATURE-----
diff --git a/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch b/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch
new file mode 100644
index 000000000000..4528b7fa6fe7
--- /dev/null
+++ b/kde-base/superkaramba/files/superkaramba-3.5.0-fbsd.patch
@@ -0,0 +1,158 @@
+Index: superkaramba/src/memsensor.cpp
+===================================================================
+--- superkaramba/src/memsensor.cpp	(revision 487000)
++++ superkaramba/src/memsensor.cpp	(revision 487001)
+@@ -14,7 +14,7 @@
+ #include <qstring.h>
+ #include <qregexp.h>
+ 
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+ #include <sys/time.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -32,14 +32,14 @@
+ #include <sys/swap.h>
+ #endif
+ 
+-#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
++#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
+ /* define pagetok in terms of pageshift */
+ #define pagetok(size) ((size) << pageshift)
+ #endif
+ 
+ MemSensor::MemSensor(int msec) : Sensor(msec)
+ {
+-#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
++#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
+    /* get the page size with "getpagesize" and calculate pageshift from it */
+     int pagesize = getpagesize();
+     pageshift = 0;
+@@ -51,7 +51,7 @@
+ 
+     /* we only need the amount of log(2)1024 for our conversion */
+     pageshift -= 10;
+-# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
++# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
+     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
+             this,SLOT(receivedStdout(KProcess *, char *, int )));
+     connect(&ksp, SIGNAL(processExited(KProcess *)),
+@@ -62,7 +62,7 @@
+     MaxSet = false;
+ 
+     readValues();
+-# elif defined __FreeBSD__
++# elif defined Q_OS_FREEBSD
+     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
+ # endif
+ #else
+@@ -73,7 +73,7 @@
+ MemSensor::~MemSensor()
+ {}
+ 
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+ void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
+ {
+     buffer[len] = 0;
+@@ -87,7 +87,7 @@
+ 
+ void MemSensor::processExited(KProcess *)
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+     QStringList stringList = QStringList::split('\n',sensorResult);
+     sensorResult = "";
+     QStringList itemsList = QStringList::split(' ', stringList[1]);
+@@ -99,7 +99,7 @@
+ 
+ int MemSensor::getMemTotal()
+ {
+-#if defined __FreeBSD || defined(Q_OS_NETBSD)
++#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
+     static int mem = 0;
+     size_t size = sizeof(mem);
+ 
+@@ -114,7 +114,7 @@
+ 
+ int MemSensor::getMemFree()
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+     static int mem = 0;
+     size_t size = sizeof(mem);
+ 
+@@ -138,7 +138,7 @@
+ 
+ int MemSensor::getBuffers()
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+     static int mem = 0;
+     size_t size = sizeof(mem);
+ 
+@@ -159,7 +159,7 @@
+ 
+ int MemSensor::getCached()
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+     static int mem = 0;
+     size_t size = sizeof(mem);
+ 
+@@ -179,7 +179,7 @@
+ 
+ int MemSensor::getSwapTotal()
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+ # if __FreeBSD_version < 500018
+     return(swapTotal);
+ # else
+@@ -221,7 +221,7 @@
+ 
+ int MemSensor::getSwapFree()
+ {
+-#ifdef __FreeBSD__
++#ifdef Q_OS_FREEBSD
+ # if __FreeBSD_version < 500018
+     return(swapTotal - swapUsed);
+ # else
+@@ -266,8 +266,8 @@
+ 
+ void MemSensor::readValues()
+ {
+-#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
+-# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
++#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
++# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
+     ksp.clearArguments();
+     ksp << "swapinfo";
+     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
+@@ -291,7 +291,7 @@
+     SensorParams *sp;
+     Meter *meter;
+     QObjectListIt it( *objList );
+-#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
++#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
+     bool set = false;
+ #endif
+     int totalMem = getMemTotal();
+@@ -303,7 +303,7 @@
+     while (it != 0)
+     {
+         sp = (SensorParams*)(*it);
+-#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
++#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
+         if ( (!MaxSet) && (totalSwap > 0) ) {
+            setMaxValue(sp);
+            bool set = true;
+@@ -331,7 +331,7 @@
+         meter->setValue(format);
+         ++it;
+     }
+-#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
++#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
+     if (set)
+         MaxSet = true;
+ #endif
diff --git a/kde-base/superkaramba/superkaramba-3.5.0.ebuild b/kde-base/superkaramba/superkaramba-3.5.0.ebuild
index c7840162e3c4..a93041ecb413 100644
--- a/kde-base/superkaramba/superkaramba-3.5.0.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0.ebuild,v 1.4 2005/12/04 12:33:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0.ebuild,v 1.5 2005/12/09 13:58:03 flameeyes Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -13,3 +13,5 @@ IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
 
+PATCHES="${FILESDIR}/${P}-fbsd.patch"
+