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 <matt@speakeasy.net>
[3]  PR:		31914
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[4]  PR:		28475
     Submitted by:	Arun Sharma <arun@sharmas.dhs.org>
[5]  Submitted by:	Luc Morin <luc_m@videotron.ca>
[6]  Found at:	http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/
[7]  PR:		32321
     Reported by:	gad
     Submitted by:	James A. Halstead <jah4007@cs.rit.edu>
[8]  PR:		32055
     Reported by:	William Richard <wrichard@trivalley.com>, others
[9]  PR:		31629
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[10] PR:		32358
     Submitted by:	Alexander N. Kabaev <ak03@gte.com>
[11] PR:		31809
     Requested by:	Nathan Ahlstrom <nrahlstr@winternet.com> (denied)
[12] http://freebsd.kde.org/contact.shtml;
     http://lists.csociety.org/pipermail/kde-freebsd;
     http://lists.csociety.org/listinfo/kde-freebsd

1 files changed, 184 insertions, 0 deletions

diff --git a/x11/kde4-runtime/files/patch-logfile.c b/x11/kde4-runtime/files/patch-logfile.c
new file mode 100644
index 000000000000..5fd3def1ae6b
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-logfile.c
@@ -0,0 +1,184 @@
+--- /dev/null	Mon Nov 19 17:14:17 2001
++++ ksysguard/ksysguardd/FreeBSD/logfile.c	Mon Nov 19 17:07:55 2001
+@@ -0,0 +1,181 @@
++/*
++    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: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
++*/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#include "Command.h"
++#include "ccont.h"
++#include "conf.h"
++#include "ksysguardd.h"
++#include "logfile.h"
++
++static CONTAINER LogFiles = 0;
++static unsigned long counter = 1;
++
++typedef struct {
++	char name[256];
++	FILE* fh;
++	unsigned long id;
++} LogFileEntry;
++
++extern CONTAINER LogFileList;
++
++/*
++================================ public part =================================
++*/
++
++void initLogFile(void)
++{
++	int i;
++	char monitor[1024];
++
++	registerCommand("logfile_register", registerLogFile);
++	registerCommand("logfile_unregister", unregisterLogFile);
++	registerCommand("logfile_registered", printRegistered);
++
++	for (i = 0; i < level_ctnr(LogFileList); i++)
++	{
++		FILE* fp;
++		ConfigLogFile *entry = get_ctnr(LogFileList, i);
++		/* register the log file if we can actually read the file. */
++		if ((fp = fopen(entry->path, "r")) != NULL)
++		{
++			fclose(fp);
++			snprintf(monitor, 1024, "logfiles/%s", entry->name);
++			registerMonitor(monitor, "logfile", printLogFile,
++							printLogFileInfo);
++		}
++	}
++
++	LogFiles = new_ctnr(CT_DLL);
++}
++
++void exitLogFile(void)
++{
++	if (LogFiles)
++		destr_ctnr(LogFiles, free);
++}
++
++void printLogFile(const char* cmd)
++{
++	char line[1024];
++	unsigned long id;
++	int i;
++	char ch;
++	
++	sscanf(cmd, "%*s %lu", &id);
++
++	for (i = 0; i < level_ctnr(LogFiles); i++) {
++		LogFileEntry *entry = get_ctnr(LogFiles, i);
++
++		if (entry->id == id) {
++			while (fgets(line, sizeof(line), entry->fh) != NULL) {
++				fprintf(CurrentClient, "%s", line);
++			}
++			clearerr(entry->fh);
++		}
++	}
++
++	fprintf(CurrentClient, "\n");
++}
++
++void printLogFileInfo(const char* cmd)
++{
++	fprintf(CurrentClient, "LogFile\n");
++}
++
++void registerLogFile(const char* cmd)
++{
++	char name[256];
++	FILE* file;
++	LogFileEntry *entry;
++	int i;
++
++	memset(name, 0, sizeof(name));
++	sscanf(cmd, "%*s %256s", name);
++	
++	for (i = 0; i < level_ctnr(LogFileList); i++) {
++		ConfigLogFile *conf = get_ctnr(LogFileList, i);
++		if (!strcmp(conf->name, name)) {
++			if ((file = fopen(conf->path, "r")) == NULL) {
++				print_error("fopen()");
++				fprintf(CurrentClient, "0\n");
++				return;
++			}
++
++			fseek(file, 0, SEEK_END);
++
++			if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) {
++				print_error("malloc()");
++				fprintf(CurrentClient, "0\n");
++				return;
++			}
++
++			entry->fh = file;
++			strncpy(entry->name, conf->name, 256);
++			entry->id = counter;
++
++			push_ctnr(LogFiles, entry);	
++
++			fprintf(CurrentClient, "%lu\n", counter);
++			counter++;
++
++			return;
++		}
++	}
++
++	fprintf(CurrentClient, "0\n");
++}
++
++void unregisterLogFile(const char* cmd)
++{
++	unsigned long id;
++	int i;
++
++	sscanf(cmd, "%*s %lu", &id);
++	
++	for (i = 0; i < level_ctnr(LogFiles); i++) {
++		LogFileEntry *entry = get_ctnr(LogFiles, i);
++
++		if (entry->id == id) {
++			fclose(entry->fh);
++			free(remove_ctnr(LogFiles, i));
++			fprintf(CurrentClient, "\n");
++			return;
++		}
++	}
++
++	fprintf(CurrentClient, "\n");
++}
++
++void printRegistered(const char* cmd)
++{
++	int i;
++
++	for (i = 0; i < level_ctnr(LogFiles); i++) {
++		LogFileEntry *entry = get_ctnr(LogFiles, i);
++		fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id);
++	}
++
++	fprintf(CurrentClient, "\n");
++}