diff options
author | Will Andrews <will@FreeBSD.org> | 2002-04-21 23:47:50 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2002-04-21 23:47:50 +0000 |
commit | d1c2f0dddd4a74a79847b017915f3482671e055c (patch) | |
tree | 31ccd02a7c0d295ec66bf2eefa0f980fbb92cb91 /x11/kdebase4-runtime/files/patch-conf.c | |
parent | Update module: status. (diff) |
Please welcome Qt3/KDE3 to our ports tree. This includes work since the
original versions of these ports, so some PORTREVISIONs were bumped. See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.
bsd.kde.mk has already been updated a few days ago to work with these.
Some patches applied to fix a few bugs were:
deskutils/kdepim3:
[1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
[2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
[3] Fix compile problem with kvoctrain.
x11/kdebase3:
[4] Fix KDM CPU usage and login bug.
Some caveats:
* All PLISTs are broken for deinstall due to script bug that I
didn't notice until very recently. This will be fixed when I
commit an update tomorrow. These ports should still install
perfectly fine though. They should also deinstall without
giving errors, but will leave directories behind.
* You can't install this with any other version of QT or KDE
already installed. I am not sure the checks are 100% working,
but fixes for these will be forthcoming. This is mainly due
to a policy decision made by kde@ to make QT/KDE ports install
the way the rest of the world expects it to while also still
conforming to FreeBSD's hier(7). For reference on this decision,
please consult the KDE/FreeBSD mailing list archives. This
decision fixes 2-year-old bug reports relating to how we handled
this for KDE2 vs KDE1.
Submitted by: [1] Adrian de Groot <adridg@cs.kun.nl>,
[2] David Faure <faure@kde.org>,
Andy Fawcett <andy@athame.co.uk>
Lauri Watts <lauri@kde.org>
[3] Lauri Watts <lauri@kde.org>
[4] Alan Eldridge <alane@geeksrus.net>
Oswald Buddenhagen <ossi@kde.org>
Reviewed by: kde
Notes
Notes:
svn path=/head/; revision=57964
Diffstat (limited to 'x11/kdebase4-runtime/files/patch-conf.c')
-rw-r--r-- | x11/kdebase4-runtime/files/patch-conf.c | 136 |
1 files changed, 0 insertions, 136 deletions
diff --git a/x11/kdebase4-runtime/files/patch-conf.c b/x11/kdebase4-runtime/files/patch-conf.c deleted file mode 100644 index a4de97379b10..000000000000 --- a/x11/kdebase4-runtime/files/patch-conf.c +++ /dev/null @@ -1,136 +0,0 @@ ---- /dev/null Mon Nov 19 17:14:17 2001 -+++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 -@@ -0,0 +1,133 @@ -+/* -+ KSysGuard, the KDE System Guard -+ -+ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of version 2 of the GNU General Public -+ License as published by the Free Software Foundation. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ -+*/ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#include "Command.h" -+#include "ccont.h" -+#include "conf.h" -+ -+CONTAINER LogFileList = 0; -+CONTAINER SensorList = 0; -+ -+void parseConfigFile(const char *filename) -+{ -+ FILE* config; -+ char line[2048]; -+ char *begin, *token, *tmp, *confSensor; -+ ConfigLogFile *confLog; -+ -+ -+ if (LogFileList) -+ destr_ctnr(LogFileList, free); -+ -+ if (SensorList) -+ destr_ctnr(SensorList, free); -+ -+ LogFileList = new_ctnr(CT_DLL); -+ SensorList = new_ctnr(CT_DLL); -+ -+ if ((config = fopen(filename, "r")) == NULL) { -+ log_error("can't open config file '%s'", filename); -+ -+ /* if we can't open a config file we have to add the -+ available sensors manually -+ */ -+ -+ confSensor = strdup("ProcessList"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("Memory"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("Stat"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("NetDev"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("NetStat"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("CpuInfo"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("LoadAvg"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("DiskStat"); -+ push_ctnr(SensorList, confSensor); -+ confSensor = strdup("LogFile"); -+ push_ctnr(SensorList, confSensor); -+ -+ return; -+ } -+ -+ while (fgets(line, sizeof(line), config) != NULL) { -+ if ((line[0] == '#') || (strlen(line) == 0)) { -+ continue; -+ } -+ -+ if (strchr(line, '#')) -+ *(strchr(line, '#')) = '\0'; -+ -+ if (line[strlen(line) - 1] == '\n') -+ line[strlen(line) - 1] = '\0'; -+ -+ if (!strncmp(line, "LogFiles", 8)) { -+ begin = strchr(line, '='); -+ begin++; -+ -+ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { -+ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { -+ log_error("malloc() no free memory avail"); -+ continue; -+ } -+ confLog->name = strdup(token); -+ tmp = strchr(confLog->name, ':'); -+ *tmp = '\0'; -+ confLog->path = tmp; -+ confLog->path++; -+ -+ push_ctnr(LogFileList, confLog); -+ } -+ } -+ if (!strncmp(line, "Sensors", 7)) { -+ begin = strchr(line, '='); -+ begin++; -+ -+ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { -+ confSensor = strdup(token); -+ push_ctnr(SensorList, confSensor); -+ } -+ } -+ } -+ -+ fclose(config); -+} -+ -+int sensorAvailable(const char *sensor) -+{ -+ int i; -+ -+ for (i = 0; i < level_ctnr(SensorList); i++) { -+ char* name = get_ctnr(SensorList, i); -+ if (!strcmp(name, sensor)) -+ return 1; -+ } -+ -+ return 0; -+} |