From 1d206a3483e848f4589962473bdf169313ea740f Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Tue, 4 Dec 2001 03:47:18 +0000 Subject: Upgrade KDE to 2.2.2: * General: - Support for objprelink. - Hack for autoconf 2.13/automake 1.4. Note that we can't use the standard USE_AUTO* because they change things in work/*; KDE has its own way of doing that. - Light cleanup of extra dirs in the PLISTs provided by my mkplistpkg[1] script. - Speedups of both compile and runtime through the usage of --disable-debug and --enable-final. The latter did not work with the kdemultimedia package, unfortunately. - Patch updates. * audio/kdemultimedia2: - Patch to fix KSCD on FreeBSD[2]. It works very well now. * deskutils/kdepim: - Enable kpilot[3]. Pull in the latest pilot-link stuff. * devel/kdesdk, * devel/kdevelop: - No specific changes. * devel/qt-designer: - Make this port depend almost entirely on qt23 to make it more maintainable, so I don't have to keep hacking the patches to get them to apply. * editors/koffice, * games/kdegames, * graphics/kdegraphics: - No specific changes. * misc/kdeaddons: - SDL is required now. Cull SDL PLIST_SUB and such. - Fix breakage from hardcoding "sdl-config". * misc/kdeutils2: - Fix problem with klaptopdaemon[4] where it didn't properly display the battery time. This patch is untested, but applied. * net/kdenetwork2: - Fix DCC for KSIRC[5]. - Remove ktalkd from the build. It requires some weird thing in the configure script that I don't have time to look at. * sysutils/kdeadmin: - No specific changes. * textproc/kdoc: - Remove bogus requirement that kdoc requires Perl 5.6.0; it sure seems to operate fine with >= 5.005. But I'll let time tell. * www/quanta: - No specific changes (--disable-debug support only). * x11/kde2: - No specific changes. * x11/kdebase2: - Fix ksysguard compile by merging the files from the HEAD branch of KDE CVS that were missing at release time for FreeBSD[6]. :\ * x11/kdelibs2: - Recognize CUPS' spinoff[7]. - Add libxslt dependency since it was removed from kdelibs. - Fix libxml compile problems[8] (accomplished by upgrading). - Remove libkformula from port Makefile; this library has been spun off into koffice. - Fix mode problems with DCOP[9]. This allows you to save files properly. It also seems to be a FreeBSD specific problem. - Fix bashisms in kdeprint/imagetops script[10]. * x11-clocks/kdetoys2: - No specific changes. * x11-toolkits/qt23: - Do NOT upgrade to QT 2.3.2[11]. - Allow devel/qt-designer to depend on this port entirely for the patches by adding a perlre to accomplish this. * x11-wm/kdeartwork: - No specific changes. Thanks to the FreeBSD/KDE[1] team[12] who helped me test these out! [1] http://freebsd.kde.org/; http://www.databits.net/cgi-bin/cvsweb.cgi/scripts/portbuild/mkplistpkg [2] Submitted by: Matthew Holmes [3] PR: 31914 Submitted by: Alan Eldridge [4] PR: 28475 Submitted by: Arun Sharma [5] Submitted by: Luc Morin [6] Found at: http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/ [7] PR: 32321 Reported by: gad Submitted by: James A. Halstead [8] PR: 32055 Reported by: William Richard , others [9] PR: 31629 Submitted by: Alan Eldridge [10] PR: 32358 Submitted by: Alexander N. Kabaev [11] PR: 31809 Requested by: Nathan Ahlstrom (denied) [12] http://freebsd.kde.org/contact.shtml; http://lists.csociety.org/pipermail/kde-freebsd; http://lists.csociety.org/listinfo/kde-freebsd --- x11/kdebase3/files/patch-conf.c | 136 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 x11/kdebase3/files/patch-conf.c (limited to 'x11/kdebase3/files/patch-conf.c') diff --git a/x11/kdebase3/files/patch-conf.c b/x11/kdebase3/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase3/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /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 ++ ++ 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 ++#include ++#include ++ ++#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; ++} -- cgit v1.2.3