Add patch to make superkaramba calculate memory correctly on FreeBSD.

Package-Manager: portage-2.0.53

4 files changed, 180 insertions, 4 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 5df2c8808032..fb69ae3d5feb 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.142 2005/12/06 05:58:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.143 2005/12/09 14:03:41 flameeyes Exp $
+
+  09 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/superkaramba-3.5.0-fbsd.patch, kdeutils-3.5.0.ebuild:
+  Add patch to make superkaramba calculate memory correctly on FreeBSD.
 
   06 Dec 2005; Joseph Jezak <josejx@gentoo.org> kdeutils-3.4.3-r1.ebuild:
   Marked ppc stable for bug #112842.
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index 0095d7a5464d..767de0ac1c29 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,4 +1,7 @@
-MD5 e171d3aca71c6b97a4b7b2fab06406d0 ChangeLog 16555
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4ff1d487dddc2b15b3d6f7cee59c91f ChangeLog 16747
 MD5 95a30bd883c334e2f6c5f417ac53c9c9 files/digest-kdeutils-3.3.2 68
 MD5 4534ccb147438685553826778c267aac files/digest-kdeutils-3.4.1 68
 MD5 5ec470abb58c9e1fe99f0410cb14dffd files/digest-kdeutils-3.4.2 68
@@ -7,10 +10,18 @@ MD5 7693585dde083d1c2cc205db10692163 files/digest-kdeutils-3.4.3-r1 68
 MD5 61427700c31d5d6a145005b5945e00e5 files/digest-kdeutils-3.5.0 68
 MD5 e733c7ad1c42938d7b945ea0f6f563ab files/kdeutils-3.4-configure.patch 2539
 MD5 0ebe4d00a1fd5845db2172027d12f531 files/kdeutils-3.4.3-klaptopdaemon.patch 1895
+MD5 82cc61148d380f77c98ea1b8bc88dbef files/superkaramba-3.5.0-fbsd.patch 4218
 MD5 41ded646b6eaf390c425e03bb9d21df1 kdeutils-3.3.2.ebuild 395
 MD5 9981cd5b2ebaac3d28a6158e5f4b05c0 kdeutils-3.4.1.ebuild 556
 MD5 326614fcd8c1c2f949a93435d1ae2965 kdeutils-3.4.2.ebuild 869
 MD5 4c3c4b5c4e29d726032aab0fe4d88f0d kdeutils-3.4.3-r1.ebuild 981
 MD5 195b86327e8bd5a018eba7ff40e80bda kdeutils-3.4.3.ebuild 875
-MD5 5d3b66abe017b84f259c0a9e1d00a306 kdeutils-3.5.0.ebuild 923
+MD5 605ed064b7abb2f650c5fa2f96394f52 kdeutils-3.5.0.ebuild 1024
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDmY7KAiZjviIA2XgRAvtYAJ9ioioYUqjbhe0qjNSUSw6XfAwMZACfUuGZ
+MubWh9WAmazcFk+d/BxhRmw=
+=lJic
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch b/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch
new file mode 100644
index 000000000000..4528b7fa6fe7
--- /dev/null
+++ b/kde-base/kdeutils/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/kdeutils/kdeutils-3.5.0.ebuild b/kde-base/kdeutils/kdeutils-3.5.0.ebuild
index 88ba59dfe783..74aa74ec5dc8 100644
--- a/kde-base/kdeutils/kdeutils-3.5.0.ebuild
+++ b/kde-base/kdeutils/kdeutils-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/kdeutils/kdeutils-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0.ebuild,v 1.2 2005/12/09 14:03:41 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -25,6 +25,9 @@ src_unpack() {
 
 	# Fix output of klaptopdaemon (kde bug 103437).
 	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
+
+	# Fix memory calculations for FreeBSD systems
+	epatch "${FILESDIR}/superkaramba-3.5.0-fbsd.patch"
 }
 
 src_compile() {