Index: trunk/dports/audio/arts/Portfile
===================================================================
--- trunk/dports/audio/arts/Portfile	(revision 1900)
+++ trunk/dports/audio/arts/Portfile	(revision 1900)
@@ -0,0 +1,53 @@
+PortSystem 1.0
+name		arts
+version		1.1
+revision	1
+categories	audio
+maintainers	ranger@befunk.com
+description	analog realtime synthesizer
+
+long_description aRts is a framework for developing modular multimedia applications. The \
+sound server, artsd, allows multiple applications to cooperatively process \
+and output sound and music. aRts is designed to provide its filter and \
+synthesis capabilities to other applications using the multimedia \
+communication protocol (MCOP). aRts is also capable of modular realtime \
+synthesis. It can create sounds & music (realtime midi synthesis) using \
+small modules like oscillators for creating waveforms, various filters, \
+mixers, faders, etc.
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	arts-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-arts-${version}.darwin
+depends_lib	lib:libaudiofile.0:audiofile lib:libdl.1:dlcompat lib:libglib-2.0.0:glib2 \
+		lib:libiconv:gettext lib:libintl:gettext lib:libmad:mad \
+		lib:libogg:libogg lib:libpng.3:libpng lib:libpoll:poll-emulator \
+		lib:libqt-mt.3.1:qt3 lib:libqui:qt3 lib:libvorbis.0:libvorbis \
+		lib:libX11.6:XFree86
+depends_build	bin:pkg-config:pkgconfig
+
+checksums	arts-${version}.tar.bz2 md5 c1c34063de7df4ac6cae0984803d34e1 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/audio/arts/files/patch-arts-1.1.darwin
===================================================================
--- trunk/dports/audio/arts/files/patch-arts-1.1.darwin	(revision 1900)
+++ trunk/dports/audio/arts/files/patch-arts-1.1.darwin	(revision 1900)
@@ -0,0 +1,1178 @@
+
+--- Makefile.am.in	1 Oct 2002 01:47:59 -0000	1.1.1.2
++++ Makefile.am.in	1 Oct 2002 01:54:35 -0000	1.3
+@@ -27,7 +27,7 @@
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs 
+ 
+ AUTOMAKE_OPTIONS = foreign 1.5
+-COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc 
++COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt x11 soundserver artsc examples tests doc 
+ EXTRA_DIST = admin
+ 
+ dist-hook:
+--- configure.in.in	26 Nov 2002 21:22:13 -0000	1.1.1.6
++++ configure.in.in	26 Nov 2002 21:24:05 -0000	1.19
+@@ -284,6 +284,19 @@
+ fi
+ ])
+ 
++dnl needed for mach realtime scheduling
++AC_DEFUN([AC_CHECK_MACH_REALTIME_SCHED],
++[
++  AC_CHECK_HEADERS([mach/mach.h mach/thread_policy.h sys/param.h sys/sysctl.h],
++    AC_CHECK_FUNCS(thread_policy_set,
++      arts_mach_realtime_sched=yes,
++      arts_mach_realtime_sched=no)
++  )
++  if test "x$arts_mach_realtime_sched" = "xyes"; then
++    AC_DEFINE(HAVE_MACH_REALTIME_SCHED,1, [Define if your system supports mach realtime scheduling])
++  fi
++])
++
+ dnl Type of the ioctl function test - after some tries, it seems that this
+ dnl not required for Linux vs. FreeBSD (for which this test was written), and
+ dnl that only the Linux documentation claims that it has an "int" as second
+@@ -434,6 +447,7 @@
+ AC_CHECK_LIBAUDIOFILE
+ AC_CHECK_SGILIBAUDIO
+ AC_CHECK_REALTIME_SCHED
++AC_CHECK_MACH_REALTIME_SCHED
+ AC_CHECK_GETDOMAINNAME
+ AC_CHECK_IOCTL_TYPE
+ AC_CHECK_X86_FLOAT_INT
+@@ -606,6 +620,27 @@
+ AC_CHECK_HEADERS(soundcard.h)
+ AC_CHECK_LIB(ossaudio, _oss_ioctl, [LIBOSSAUDIO="-lossaudio"])
+ AC_SUBST(LIBOSSAUDIO)
++
++dnl MacOSX has a similar library called liboss
++AC_MSG_CHECKING([for liboss])
++
++LIBOSS_CFLAGS=
++LIBOSS_LIBADD=
++LIBOSS_LDFLAGS=
++
++if test "x$PKG_CONFIG" != "xno" && test x`$PKG_CONFIG --modversion liboss 2>/dev/null` != x; then
++  LIBOSS_CFLAGS=""
++  LIBOSS_LIBADD="`$PKG_CONFIG --libs-only-l liboss`"
++  LIBOSS_LDFLAGS="`$PKG_CONFIG --libs-only-L liboss`"
++  AC_DEFINE(HAVE_LIBOSS,1,[Define if you have the liboss compatibility library])
++  AC_MSG_RESULT(yes)
++else
++  AC_MSG_RESULT(not installed)
++fi
++
++AC_SUBST(LIBOSS_CFLAGS)
++AC_SUBST(LIBOSS_LIBADD)
++AC_SUBST(LIBOSS_LDFLAGS)
+ 
+ dnl Don't remove !
+ dnl AC_OUTPUT(artsc/artsc-config)
+--- artsc/Makefile.am	14 Aug 2002 13:21:23 -0000	1.1.1.3
++++ artsc/Makefile.am	12 Jan 2003 18:00:00 -0000	1.10
+@@ -9,19 +9,19 @@
+ bin_SCRIPTS = artsc-config artsdsp
+ 
+ libartsdsp_la_SOURCES = artsdsp.c
+-libartsdsp_la_LDFLAGS = -no-undefined -module
++libartsdsp_la_LDFLAGS = -no-undefined -module -avoid-version
+ libartsdsp_la_LIBADD = libartsc.la
+ 
+ libartsdsp_st_la_SOURCES = artsc.c artsdsp.c
+-libartsdsp_st_la_LDFLAGS = -no-undefined -module
++libartsdsp_st_la_LDFLAGS = -no-undefined -module -avoid-version
+ libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la
+ 
+ libartsc_la_SOURCES = artsc.c
+-libartsc_la_LDFLAGS = -no-undefined
++libartsc_la_LDFLAGS = -no-undefined -version-info 2:0:1
+ libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD) $(USE_THREADS)
+ 
+ libartscbackend_la_SOURCES = artscbackend.cc
+-libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH)
++libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH) -avoid-version
+ libartscbackend_la_LIBADD = $(FLOWLIBS) \
+     $(top_builddir)/soundserver/libsoundserver_idl.la
+ 
+--- artsc/artsc-config.in	25 Jun 2002 01:45:58 -0000	1.1.1.1
++++ artsc/artsc-config.in	26 Nov 2002 21:00:47 -0000	1.2
+@@ -27,7 +27,7 @@
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@"
++	  flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @FRAMEWORK_COREAUDIO@"
+ 	  ;;
+     --cflags)
+ 	  flags="$flags -I$includedir/artsc"
+--- flow/Makefile.am	1 Oct 2002 01:48:02 -0000	1.1.1.3
++++ flow/Makefile.am	21 Nov 2002 21:28:34 -0000	1.15
+@@ -1,6 +1,8 @@
++AM_CFLAGS = -DGSL_WANT_GLIB_WRAPPER -DGSL_WANT_ARTS_THREADS
++AM_CXXFLAGS = -DGSL_WANT_GLIB_WRAPPER -DGSL_WANT_ARTS_THREADS
+ 
+ SUBDIRS = mcopclass gsl gslpp
+-INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
++INCLUDES = -I$(top_srcdir)/mcop $(all_includes) $(LIBOSS_CFLAGS)
+ 
+ ####### Files
+ 
+@@ -10,9 +12,9 @@
+ libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0
+ libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
+ 
+-libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) -lm \
+-  $(top_builddir)/flow/gsl/libgsl.la
+-libartsflow_la_LDFLAGS = -no-undefined -version-info 1:0
++libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBOSS_LIBADD) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) -lm \
++ $(top_builddir)/flow/gsl/libgsl.la $(LIB_POLL)
++libartsflow_la_LDFLAGS = -no-undefined -version-info 1:0 $(LIBOSS_LDFLAGS) $(FRAMEWORK_COREAUDIO)
+ libartsflow_la_COMPILE_FIRST = artsflow.h
+ libartsflow_la_SOURCES =  synth_play_impl.cc \
+   synthschedule.cc gslschedule.cc audiosubsys.cc \
+@@ -26,7 +28,7 @@
+   audioionull.cc audioiolibaudioio.cc \
+   audioiosun.cc audioioaix.cc audioionas.cc cpuinfo.cc \
+   audioioossthreaded.cc audiotobytestream_impl.cc audioiosgi.cc \
+-  audioiocsl.cc datahandle_impl.cc
++  audioiocsl.cc audioiocoreaudio.cc datahandle_impl.cc
+ 
+ artsincludedir = $(includedir)/arts
+ artsinclude_HEADERS = artsflow.h audiosubsys.h cache.h \
+RCS file: flow/audioiocoreaudio.cc
+diff -N flow/audioiocoreaudio.cc
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ flow/audioiocoreaudio.cc	17 Dec 2002 04:34:10 -0000	1.10
+@@ -0,0 +1,690 @@
++    /*
++    
++    Copyright (C) 2001 Stefan Westerfeld
++                        stefan@space.twc.de
++    
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Library General Public
++    License as published by the Free Software Foundation; either
++    version 2 of the License, or (at your option) any later version.
++    
++    This library 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
++    Library General Public License for more details.
++    
++    You should have received a copy of the GNU Library General Public License
++    along with this library; see the file COPYING.LIB.  If not, write to
++    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++    Boston, MA 02111-1307, USA.
++    
++    */
++    /*
++        Modifications for ARTS -    
++        Ben Hines <bhines@alumni.ucsd.edu>
++        Ben Reed  <ranger@befunk.com>
++        
++        Some CoreAudio code borrowed from ESD -
++        Shawn Hsiao <phsiao@mac.com>
++        Masanori Sekino <m-sekino@mb.kcom.ne.jp>
++    */
++
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_COREAUDIO
++
++#define DEBUG 1
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <pthread.h>
++#include <sys/socket.h>
++#include <sys/file.h>
++
++/* for useful debugging macros */
++#include <mach/error.h>
++
++#include <CoreAudio/CoreAudio.h>
++
++#include "debug.h"
++#include "audioio.h"
++#include "audiosubsys.h"
++
++#define NAME_LEN 256		/* max length of a device name */
++#define BUF_SIZE (4 * 1024)  /* from ESD */
++
++#define driverVersion "0.01 alpha"
++
++#ifdef BIG_ENDIAN
++#define defaultFormat 17
++#else
++#define defaultFormat 16
++#endif
++  
++bool NotifyOnError (OSStatus inRetVal, const char * inStringDesc);
++
++struct audio_queue {
++    float dataBuf[BUF_SIZE];
++    pthread_mutex_t mutex;
++    pthread_cond_t condition;
++    int numSamples;
++};
++
++static OSStatus PlaybackIOProc(AudioDeviceID inDevice,
++			const AudioTimeStamp *inNow,
++			const AudioBufferList *inInputData,
++			const AudioTimeStamp *inInputTime,
++			AudioBufferList *outOutputData,
++			const AudioTimeStamp *inOutputTime,
++			audio_queue *inClientData);
++
++static OSStatus RecordIOProc(AudioDeviceID inDevice,
++		      const AudioTimeStamp *inNow,
++		      const AudioBufferList *inInputData,
++		      const AudioTimeStamp *inInputTime,
++		      AudioBufferList *outOutputData,
++		      const AudioTimeStamp *inOutputTime,
++		      audio_queue *inClientData);
++                      
++OSStatus PropertyListenerProc(AudioHardwarePropertyID	inPropertyID,
++                      void* inClientData);
++
++namespace Arts {
++
++class AudioIOCoreAudio : public AudioIO {
++
++protected:
++     /* From ESD */
++     AudioDeviceID gOutputDeviceID, gInputDeviceID;
++    
++     audio_queue input;
++     audio_queue output;    
++    
++     int audioPlaybackStarted, audioRecordStarted;
++     int coreaudio_has_output_device;
++     int coreaudio_has_input_device;
++     int coreaudio_init;
++     
++     /* Arts Specific */
++     int audio_fd;
++     int bytesPerSec;
++     timeval start;
++        
++public:
++	AudioIOCoreAudio();
++	bool supportsFormat(AudioDeviceID device, AudioStreamBasicDescription *format);
++	void setParam(AudioParam param, int& value);
++	int getParam(AudioParam param);
++
++	bool open();
++	void close();
++	int read(void *buffer, int size);
++	int write(void *buffer, int size);
++
++};
++
++REGISTER_AUDIO_IO(AudioIOCoreAudio, "coreaudio", "Apple CoreAudio");
++}; // end namespace Arts
++
++using namespace std;
++using namespace Arts;
++             
++AudioIOCoreAudio::AudioIOCoreAudio() {
++        
++        artsdebug("CoreAudio driver version %s", driverVersion);
++        /*
++         * default parameters
++         */
++        param(samplingRate) = 44100;
++        paramStr(deviceName) = "default";
++        param(fragmentSize) = 1024;
++        param(fragmentCount) = 7;
++        param(channels) = 2;
++        param(direction) = 2;
++        param(format) = defaultFormat;
++        
++        input.numSamples = output.numSamples = 0;
++    
++        audioPlaybackStarted = 0, audioRecordStarted = 0;
++        coreaudio_has_output_device = 0;
++        coreaudio_has_input_device = 0;
++        coreaudio_init = 0;
++}
++
++void
++AudioIOCoreAudio::close()
++{   
++    artsdebug("AudioIOCoreAudio::close().. ");
++    /* deactivate both of them */
++    if (coreaudio_has_output_device) {
++        if(audioPlaybackStarted)
++        NotifyOnError(AudioDeviceStop(gOutputDeviceID, 
++                  (AudioDeviceIOProc) PlaybackIOProc),
++                        "AudioDeviceStop (PlaybackIOProc)");
++                        
++        NotifyOnError(AudioDeviceRemoveIOProc(gOutputDeviceID,
++                  (AudioDeviceIOProc) PlaybackIOProc),
++                        "AudioDeviceRemoveIOProc (PlaybackIOProc)");
++                            
++        NotifyOnError(AudioHardwareRemovePropertyListener(
++            kAudioHardwarePropertyDefaultOutputDevice, 
++            PropertyListenerProc),
++                "AudioHardwareRemovePropertyListener (PropertyListenerProc)");
++                        
++        artsdebug(" ... closing output\n");
++        audioPlaybackStarted = 0;
++        coreaudio_has_output_device = 0;
++    }
++    
++    if (coreaudio_has_input_device) {        
++        if(audioRecordStarted)
++        NotifyOnError(AudioDeviceStop(gInputDeviceID, 
++                            (AudioDeviceIOProc) RecordIOProc),
++                        "AudioDeviceStop (RecordIOProc)");
++                        
++        NotifyOnError(AudioDeviceRemoveIOProc(gInputDeviceID,
++                            (AudioDeviceIOProc) RecordIOProc),
++                        "AudioDeviceRemoveIOProc (RecordIOProc)");
++                            
++        NotifyOnError(AudioHardwareRemovePropertyListener(
++            kAudioHardwarePropertyDefaultOutputDevice, 
++            PropertyListenerProc),
++                "AudioHardwareRemovePropertyListener (PropertyListenerProc)");
++                        
++        artsdebug(" ... closing intput\n");
++        audioRecordStarted = 0;
++        coreaudio_has_input_device = 0;
++    }
++}
++
++ 
++int 
++AudioIOCoreAudio::write(void *buffer, int buf_size) {
++
++  float scale = 1.0 / SHRT_MAX;
++  int remain_to_write = buf_size;
++
++  if (!coreaudio_has_output_device)
++  {
++    arts_warning("AudioIOCoreAudio::write with no output device!");
++    return -1;
++  }
++  if (!audioPlaybackStarted) {
++    NotifyOnError(AudioDeviceStart(gOutputDeviceID,(AudioDeviceIOProc)  PlaybackIOProc),
++                    "AudioDeviceStart (PlaybackIOProc)");
++    audioPlaybackStarted = 1;
++  }
++
++  while (remain_to_write)
++  {
++    pthread_mutex_lock(&output.mutex);
++
++    while(output.numSamples == BUF_SIZE)
++      pthread_cond_wait(&output.condition, &output.mutex);
++
++    {
++      short *src_data = (short *)buffer + (buf_size - remain_to_write) / sizeof(short);
++      float *dst_data = output.dataBuf + output.numSamples;
++      int src_samples = remain_to_write / sizeof(short);
++      int dst_samples = BUF_SIZE - output.numSamples;
++      int n = (dst_samples < src_samples) ? dst_samples : src_samples;
++      int i;
++
++      for (i = 0; i < n; i++)
++        dst_data[i] = scale * src_data[i];
++
++      output.numSamples += n;
++      remain_to_write -= n * sizeof(short);
++    }
++
++    pthread_mutex_unlock(&output.mutex);
++  }
++
++  return (buf_size);
++
++}
++
++int AudioIOCoreAudio::read(void *buffer, int buf_size) {
++  float scale = SHRT_MAX;
++  int remain_to_read = buf_size;
++
++  if (!coreaudio_has_input_device)
++  {
++    arts_warning("AudioIOCoreAudio::read with no input device!");
++    return -1;
++  }
++
++  if (!audioRecordStarted) {
++    NotifyOnError(AudioDeviceStart(gInputDeviceID,(AudioDeviceIOProc)  RecordIOProc),
++                    "AudioDeviceStart (RecordIOProc)");
++    audioRecordStarted = 1;
++  }
++
++  while (remain_to_read)
++  {
++    pthread_mutex_lock(&input.mutex);
++
++    while(input.numSamples == BUF_SIZE)
++      pthread_cond_wait(&input.condition, &input.mutex);
++
++    {
++      float *src_data = input.dataBuf + input.numSamples;
++      short *dst_data = (short *)buffer + (buf_size - remain_to_read) / sizeof(short);
++      int src_samples = BUF_SIZE - input.numSamples;
++      int dst_samples = remain_to_read / sizeof(short);
++      int n = (dst_samples < src_samples) ? dst_samples : src_samples;
++      int i;
++
++      for (i = 0; i < n; i++)
++        dst_data[i] = (short)(scale * src_data[i]);
++
++      input.numSamples += n;
++      remain_to_read -= n * sizeof(short);
++    }
++
++    pthread_mutex_unlock(&input.mutex);
++  }
++
++  return (buf_size);
++
++}
++
++
++bool
++AudioIOCoreAudio::open()
++{
++        #define LEN_DEVICE_NAME 128
++        UInt32 propertySize, bufferByteCount;
++        char deviceName[LEN_DEVICE_NAME];
++        char fdName[LEN_DEVICE_NAME + 50];
++        struct AudioStreamBasicDescription streamDesc;
++
++        /***** Arts Specific ***/
++	arts_warning("info: requesting %s, %d channel sound at %d hz\n",
++            (param(direction) & directionWrite) ? "write" : "read", param(channels), param(samplingRate));
++
++        bytesPerSec = param(channels) * 2 * param(samplingRate);
++        gettimeofday(&start,0);
++	if (param(direction) & directionWrite) {
++            if(coreaudio_has_output_device)
++            {
++                arts_warning("yes.. AudioIOCoreAudio::open() called twice for writing!");
++                return true;
++            }
++                
++            /* HACK - create the file descriptor?  */
++            sprintf(fdName, "/tmp/audioiocoreaudio");
++            fopen(fdName, "w+");
++            audio_fd = ::open(fdName,  O_RDWR | O_NDELAY, 0);
++            /* Obtain a file descriptor for our "listening" socket */
++            if(audio_fd == -1)
++            {
++                arts_warning("file descriptor can't be created, %s\n", strerror(errno));
++                return false;
++            }
++            /***** End Arts Specific ***/
++            /*  Stuff from ESD... */
++            /********************** playback section ***************************/
++            /* get default output device */
++            propertySize = sizeof(gOutputDeviceID);
++            NotifyOnError(AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
++                                                &propertySize,
++                                                &gOutputDeviceID),
++                        "AudioHardwareGetProperty (Default Output Device)");
++            
++            arts_assert(gOutputDeviceID != kAudioDeviceUnknown);
++            
++            /* got default output device */
++            coreaudio_has_output_device = 1;
++        
++            /* get output device name */
++            propertySize = sizeof(char)*LEN_DEVICE_NAME;
++            NotifyOnError(AudioDeviceGetProperty(gOutputDeviceID,
++                                            1,
++                                            0,
++                                            kAudioDevicePropertyDeviceName,
++                                            &propertySize,
++                                            deviceName),
++                            "AudioDeviceGetProperty (Output Device Name)");
++        
++            /* get output format */
++            propertySize = sizeof(struct AudioStreamBasicDescription);
++            NotifyOnError(AudioDeviceGetProperty(gOutputDeviceID,
++                                            1,
++                                            0,
++                                            kAudioDevicePropertyStreamFormat,
++                                            &propertySize,
++                                            &streamDesc),
++                        "AudioDeviceGetProperty (Output StreamFormat)");
++                        
++            if ((streamDesc.mSampleRate != 44100.0) ||
++                (streamDesc.mFormatID != kAudioFormatLinearPCM) ||
++               !(streamDesc.mFormatFlags & kLinearPCMFormatFlagIsFloat) ||
++                (streamDesc.mChannelsPerFrame != 2))
++            {
++            	arts_warning("Unsupported output device format!\n");
++                return (-2);
++            }
++        
++            /* set buffer size */
++            bufferByteCount = BUF_SIZE * sizeof(float);
++            propertySize = sizeof(bufferByteCount);
++            NotifyOnError(AudioDeviceSetProperty(gOutputDeviceID,
++                                            0,
++                                            0,
++                                            0,
++                                            kAudioDevicePropertyBufferSize,
++                                            propertySize,
++                                            &bufferByteCount),
++                        "AudioDeviceSetProperty (Output BufferSize)");
++    
++            artsdebug("using device %s for output:\n", deviceName);
++            artsdebug("\twith sample rate %f, %ld channels and %ld-bit sample\n",
++                    streamDesc.mSampleRate,
++                    streamDesc.mChannelsPerFrame,
++                    streamDesc.mBitsPerChannel);
++        
++            arts_return_val_if_fail(pthread_mutex_init(&output.mutex, NULL) == 0, -1);
++            arts_return_val_if_fail(pthread_cond_init(&output.condition, NULL) == 0, -1);
++            
++            /* Registers PlaybackIOProc with the device without activating it. */
++            NotifyOnError(AudioDeviceAddIOProc(gOutputDeviceID, 
++                            (AudioDeviceIOProc) PlaybackIOProc, 
++                                                (void *)&output),
++                            "AudioDeviceAddIOProc (PlaybackIOProc)");
++                            
++            NotifyOnError(AudioHardwareAddPropertyListener(
++                kAudioHardwarePropertyDefaultOutputDevice, 
++                PropertyListenerProc, this),
++                 "AudioHardwareAddPropertyListener (PropertyListenerProc)");
++                
++	} else if (param(direction) & directionRead) {
++            /********************** record section ***************************/
++            if(coreaudio_has_input_device)
++            {
++                arts_warning("AudioIOCoreAudio::open() called twice for reading!");
++                return true;
++            }
++                
++            /* get default input device */
++            propertySize = sizeof(gInputDeviceID);
++            NotifyOnError(AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,
++                                                &propertySize,
++                                                &gInputDeviceID),
++                          "AudioHardwareGetProperty (Default Input Device)");
++
++            arts_assert(gInputDeviceID != kAudioDeviceUnknown);         
++            
++            /* got default input device */
++            coreaudio_has_input_device = 1;
++        
++            /* get input device name */
++            propertySize = sizeof(char)*64;
++            NotifyOnError(AudioDeviceGetProperty(gInputDeviceID,
++                                            1,
++                                            1,
++                                            kAudioDevicePropertyDeviceName,
++                                            &propertySize,
++                                            deviceName),
++                        "AudioDeviceGetProperty (Input Device Name)");
++
++            /* get input format */
++            propertySize = sizeof(struct AudioStreamBasicDescription);
++            NotifyOnError(AudioDeviceGetProperty(gInputDeviceID,
++                                            1,
++                                            1,
++                                            kAudioDevicePropertyStreamFormat,
++                                            &propertySize,
++                                            &streamDesc),
++                        "AudioDeviceGetProperty (Input Stream Size)");
++        
++            if ((streamDesc.mSampleRate != 44100.0) ||
++                (streamDesc.mFormatID != kAudioFormatLinearPCM) ||
++                !(streamDesc.mFormatFlags & kLinearPCMFormatFlagIsFloat) ||
++                (streamDesc.mChannelsPerFrame != 2))
++            {
++                artsdebug("Unsupported Input Device format.\n");
++                return (-2);
++            }
++        
++            /* set buffer size */
++            bufferByteCount = BUF_SIZE * sizeof(float);
++            propertySize = sizeof(bufferByteCount);
++            NotifyOnError(AudioDeviceSetProperty(gInputDeviceID,
++                                            0,
++                                            0,
++                                            1,
++                                            kAudioDevicePropertyBufferSize,
++                                            propertySize,
++                                            &bufferByteCount),
++                        "AudioDeviceSetProperty (input buffersize)");
++
++            artsdebug("using device %s for input:\n", deviceName);
++            artsdebug("\twith sample rate %f, %ld channels and %ld-bit sample\n",
++                    streamDesc.mSampleRate,
++                    streamDesc.mChannelsPerFrame,
++                    streamDesc.mBitsPerChannel);
++
++            arts_return_val_if_fail(pthread_mutex_init(&input.mutex, NULL) == 0, -1);
++            arts_return_val_if_fail(pthread_cond_init(&input.condition, NULL) == 0, -1);
++        
++            /* Registers PlaybackIOProc with the device without activating it. */
++            NotifyOnError(AudioDeviceAddIOProc(gInputDeviceID, 
++                                (AudioDeviceIOProc) RecordIOProc, 
++                                                (void *)&output),
++                            "AudioDeviceAddIOProc (RecordIOProc)");
++                                                                                        
++            NotifyOnError(AudioHardwareAddPropertyListener(
++                kAudioHardwarePropertyDefaultInputDevice, 
++                PropertyListenerProc, this),
++                 "AudioHardwareAddPropertyListener (PropertyListenerProc)");
++
++	} else {
++		arts_warning("something went horribly wrong, we're not reading or writing!!!!");
++		return false;
++	}                
++        
++	return true;
++}
++
++void AudioIOCoreAudio::setParam(AudioParam p, int& value) {
++	switch(p)
++	{
++		default:
++			param(p) = value;
++			break;
++	}
++}
++
++int AudioIOCoreAudio::getParam(AudioParam p) {
++	timeval now;
++	double delta;
++	int bytes;
++
++	switch(p)
++	{
++		case canRead:
++		case canWrite:
++			gettimeofday(&now,0);
++			delta = (double)now.tv_sec + (double)now.tv_usec/1000000.0;
++			delta -= (double)start.tv_sec + (double)start.tv_usec/1000000.0;
++			bytes = (int)( (delta * bytesPerSec) -  ((p == canRead)?input.numSamples:output.numSamples));
++               //         printf("%s %d bytes\n", ((p == canRead)?"canRead":"canWrite"), bytes);
++			return bytes;
++			break;
++
++		case autoDetect:
++			return 12; // so we're higher than liboss
++			break;
++                        
++		case selectReadFD:
++			return (param(direction) & directionRead)?audio_fd:-1;
++			break;
++
++		case selectWriteFD:
++			return (param(direction) & directionWrite)?audio_fd:-1;
++			break;
++                        
++		default:
++			return param(p);
++			break;
++	}
++}
++
++bool 
++AudioIOCoreAudio::supportsFormat(AudioDeviceID device, 
++                                 AudioStreamBasicDescription *format) {
++
++	UInt32 formatSize;
++	OSStatus err;
++
++	formatSize = sizeof(*format);
++	err = AudioDeviceGetProperty(device, 0, false,
++		kAudioDevicePropertyStreamFormatSupported, &formatSize, format);
++	NotifyOnError(err, "supportsFormat");
++
++	if (err == noErr) {
++		return true;
++	} else {
++		return false;
++	}
++
++}
++
++/* Add __attribute__((unused)) to unused parameters when that gcc bug is fixed for OS X (3.4?)*/
++static OSStatus PlaybackIOProc(AudioDeviceID inDevice,
++			const AudioTimeStamp *inNow,
++			const AudioBufferList *inInputData,
++			const AudioTimeStamp *inInputTime,
++			AudioBufferList *outOutputData,
++			const AudioTimeStamp *inOutputTime,
++			audio_queue *inClientData)
++{
++  float *bufPtr = (float *) outOutputData->mBuffers[0].mData;
++  int i;
++
++  pthread_mutex_lock(&inClientData->mutex);
++
++  for (i = 0; i < inClientData->numSamples; i++)
++    bufPtr[i] = inClientData->dataBuf[i];
++  for ( ; i < BUF_SIZE; i++)
++    bufPtr[i] = 0;
++  inClientData->numSamples = 0;
++
++  pthread_mutex_unlock(&inClientData->mutex);
++  pthread_cond_signal(&inClientData->condition);
++
++  return (kAudioHardwareNoError);
++}
++
++/* Add __attribute__((unused)) to unused parameters when that gcc bug is fixed for OS X (3.4?)*/
++static OSStatus RecordIOProc(AudioDeviceID inDevice,
++		      const AudioTimeStamp *inNow,
++		      const AudioBufferList *inInputData,
++		      const AudioTimeStamp *inInputTime,
++		      AudioBufferList *outOutputData,
++		      const AudioTimeStamp *inOutputTime,
++		      audio_queue *inClientData)
++{
++  float *bufPtr = inInputData->mBuffers[0].mData;
++  int i;
++
++  pthread_mutex_lock(&inClientData->mutex);
++
++  for (i = 0; i < BUF_SIZE; i++)
++    inClientData->dataBuf[i] = bufPtr[i];
++  inClientData->numSamples = 0;
++
++  pthread_mutex_unlock(&inClientData->mutex);
++  pthread_cond_signal(&inClientData->condition);
++
++  return (kAudioHardwareNoError);
++}
++
++OSStatus PropertyListenerProc(AudioHardwarePropertyID	inPropertyID, 
++                                void *	inClientData)
++{
++   UInt32 propertySize = sizeof(AudioDeviceID);
++   AudioDeviceID deviceID;
++   
++   arts_warning("PropertyListenerProc called ... ");
++    
++   switch(inPropertyID)
++   {
++        case kAudioHardwarePropertyDefaultOutputDevice:
++            artsdebug("PropertyListenerProc kAudioHardwarePropertyDefaultOutputDevice:\n");
++            ((AudioIOCoreAudio*)inClientData)->close();
++            ((AudioIOCoreAudio*)inClientData)->open();
++            return noErr;
++        case kAudioHardwarePropertyDefaultInputDevice:
++            artsdebug("PropertyListenerProc kAudioHardwarePropertyDefaultOutputDevice:\n");
++            ((AudioIOCoreAudio*)inClientData)->close();
++            ((AudioIOCoreAudio*)inClientData)->open();
++            return noErr;
++            break;
++            
++        default:
++            return noErr;
++            break;    
++    }
++}
++
++/* Utility */
++
++bool NotifyOnError (OSStatus inRetVal, const char * inStringDesc) {
++	if (inRetVal == noErr) {
++		return true;
++	} else {
++		switch(inRetVal) {
++			case kAudioHardwareNoError:
++				break;
++			case kAudioHardwareNotRunningError:
++				arts_warning("error: hardware not running in %s", inStringDesc);
++				break;
++			case kAudioHardwareUnspecifiedError:
++				arts_warning("error: unspecified error in %s", inStringDesc);
++				break;
++			case kAudioHardwareUnknownPropertyError:
++				arts_warning("error: unknown property in %s", inStringDesc);
++				break;
++			case kAudioHardwareBadPropertySizeError:
++				arts_warning("error: bad property size in %s", inStringDesc);
++				break;
++			case kAudioHardwareIllegalOperationError:
++				arts_warning("error: illegal operation in %s", inStringDesc);
++				break;
++			case kAudioHardwareBadDeviceError:
++				arts_warning("error: bad device in %s", inStringDesc);
++				break;
++			case kAudioHardwareBadStreamError:
++				arts_warning("error: bad stream in %s", inStringDesc);
++				break;
++			case kAudioDeviceUnsupportedFormatError:
++				arts_warning("error: unsupported format in %s", inStringDesc);
++				break;
++			case kAudioDevicePermissionsError:
++				arts_warning("error: bad device permissions in %s", inStringDesc);
++				break;
++			default:
++				arts_warning("error: unknown CoreAudio error in %s", inStringDesc);
++				break;
++		}
++			
++		arts_warning("  system: 0x%d", err_get_system(inRetVal));
++		arts_warning("  sub:    0x%d", err_get_sub(inRetVal));
++		arts_warning("  code:   0x%d", err_get_code(inRetVal));
++		return false;
++	}
++}
++
++void ExitOnError (OSStatus inRetVal, const char * inStringDesc) {
++	if ( NotifyOnError (inRetVal, inStringDesc) ) {
++		exit(1);
++	}
++}
++
++#endif // HAVE_COREAUDIO
+--- flow/audioiooss.cc	29 Oct 2002 02:31:12 -0000	1.1.1.3
++++ flow/audioiooss.cc	7 Nov 2002 00:16:37 -0000	1.6
+@@ -28,10 +28,30 @@
+ 
+ #if defined(HAVE_SYS_SOUNDCARD_H)
+ 	#include <sys/soundcard.h>
++	#include <sys/ioctl.h>
+ 	#define COMPILE_AUDIOIO_OSS 1
++	#define OSS_OPEN open
++	#define OSS_CLOSE close
++	#define OSS_IOCTL ioctl
++	#define OSS_WRITE write
+ #elif defined(HAVE_SOUNDCARD_H)
+ 	#include <soundcard.h>
++	#include <sys/ioctl.h>
+ 	#define COMPILE_AUDIOIO_OSS 1
++	#define OSS_OPEN open
++	#define OSS_CLOSE close
++	#define OSS_IOCTL ioctl
++	#define OSS_WRITE write
++#endif
++
++#ifdef HAVE_LIBOSS
++	#define LIBOSS_IOCTL OSS_IOCTL
++	#define LIBOSS_OPEN  OSS_OPEN
++	#define LIBOSS_CLOSE OSS_CLOSE
++	#define LIBOSS_WRITE OSS_WRITE
++	#define COMPILE_AUDIOIO_OSS 1
++	#include <liboss/soundcard.h>
++	#include <sys/ioctl.h>
+ #endif
+ 
+ /**
+@@ -40,7 +60,6 @@
+ #ifdef COMPILE_AUDIOIO_OSS
+ 
+ #include <sys/types.h>
+-#include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ 
+@@ -159,7 +178,7 @@
+ 		return false;
+ 	}
+ 
+-	audio_fd = ::open(_deviceName.c_str(), mode, 0);
++	audio_fd = ::OSS_OPEN(_deviceName.c_str(), mode, 0);
+ 
+ 	if(audio_fd == -1)
+ 	{
+@@ -174,7 +193,7 @@
+ 	 * check device capabilities
+ 	 */
+ 	int device_caps;
+-	if(ioctl(audio_fd,SNDCTL_DSP_GETCAPS,&device_caps) == -1)
++	if(OSS_IOCTL(audio_fd,SNDCTL_DSP_GETCAPS,&device_caps) == -1)
+             device_caps=0;
+ 
+ 	string caps = "";
+@@ -189,7 +208,7 @@
+ 
+ 	int requestedFormat = (_format == 8)?AFMT_U8:AFMT_S16_LE;
+ 	int gotFormat = requestedFormat;
+-	if (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &gotFormat)==-1)  
++	if (OSS_IOCTL(audio_fd, SNDCTL_DSP_SETFMT, &gotFormat)==-1)  
+ 	{
+ 		_error = "SNDCTL_DSP_SETFMT failed - ";
+ 		_error += strerror(errno);
+@@ -252,7 +271,7 @@
+ 
+ 	int requeststereo = stereo;
+ 
+-	if (ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo)==-1)
++	if (OSS_IOCTL(audio_fd, SNDCTL_DSP_STEREO, &stereo)==-1)
+ 	{
+ 		_error = "SNDCTL_DSP_STEREO failed - ";
+ 		_error += strerror(errno);
+@@ -271,7 +290,7 @@
+ 
+ 	int speed = _samplingRate;
+ 
+-	if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &speed)==-1)  
++	if (OSS_IOCTL(audio_fd, SNDCTL_DSP_SPEED, &speed)==-1)  
+ 	{
+ 		_error = "SNDCTL_DSP_SPEED failed - ";
+ 		_error += strerror(errno);
+@@ -322,7 +341,7 @@
+ 	int size = _fragmentSize;
+ 	while(size > 1) { size /= 2; frag_arg++; }
+ 	frag_arg += (_fragmentCount << 16);
+-	if(ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_arg) == -1)
++	if(OSS_IOCTL(audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_arg) == -1)
+ 	{
+ 		char buffer[1024];
+ 		_error = "can't set requested fragments settings";
+@@ -336,7 +355,7 @@
+ 	 * we asked for
+ 	 */
+ 	audio_buf_info info;
+-	if(ioctl(audio_fd,SNDCTL_DSP_GETOSPACE, &info) == -1)
++	if(OSS_IOCTL(audio_fd,SNDCTL_DSP_GETOSPACE, &info) == -1)
+ 	{
+ 		_error = "can't retrieve fragment settings";
+ 		close();
+@@ -393,7 +412,7 @@
+ 		if(param(direction) & 1) enable_bits |= PCM_ENABLE_INPUT;
+ 		if(param(direction) & 2) enable_bits |= PCM_ENABLE_OUTPUT;
+ 
+-		if(ioctl(audio_fd,SNDCTL_DSP_SETTRIGGER, &enable_bits) == -1)
++		if(OSS_IOCTL(audio_fd,SNDCTL_DSP_SETTRIGGER, &enable_bits) == -1)
+ 		{
+ 			_error = "can't start sound i/o";
+ 
+@@ -406,7 +425,7 @@
+ 
+ void AudioIOOSS::close()
+ {
+-	::close(audio_fd);
++	::OSS_CLOSE(audio_fd);
+ }
+ 
+ void AudioIOOSS::setParam(AudioParam p, int& value)
+@@ -431,12 +450,12 @@
+ 	switch(p)
+ 	{
+ 		case canRead:
+-				ioctl(audio_fd, SNDCTL_DSP_GETISPACE, &info);
++				OSS_IOCTL(audio_fd, SNDCTL_DSP_GETISPACE, &info);
+ 				return info.bytes;
+ 			break;
+ 
+ 		case canWrite:
+-				ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info);
++				OSS_IOCTL(audio_fd, SNDCTL_DSP_GETOSPACE, &info);
+ 				return info.bytes;
+ 			break;
+ 
+@@ -477,7 +496,7 @@
+ 
+ 	int result;
+ 	do {
+-		result = ::write(audio_fd,buffer,size);
++		result = ::OSS_WRITE(audio_fd,buffer,size);
+ 	} while(result == -1 && errno == EINTR);
+ 
+ 	return result;
+--- flow/gsl/Makefile.am	29 Oct 2002 02:31:19 -0000	1.1.1.5
++++ flow/gsl/Makefile.am	21 Nov 2002 21:28:34 -0000	1.11
+@@ -1,4 +1,3 @@
+-
+ EXTRA_DIST =
+ CLEANFILES =
+ MAINTAINERCLEANFILES =
+@@ -19,7 +18,7 @@
+ 
+ noinst_PROGRAMS = $(GSL_NOINST_PROGS)
+ 
+-GSL_progs_ldadd = libgsl.la
++GSL_progs_ldadd = libgsl.la $(LIB_POLL)
+ GSL_cc_dummy = dummy.cc
+ $(srcdir)/dummy.cc: gslconfig.h
+ 
+--- flow/gsl/gsldatahandle-mad.c	14 Aug 2002 13:21:15 -0000	1.1.1.2
++++ flow/gsl/gsldatahandle-mad.c	14 Aug 2002 13:24:52 -0000	1.3
+@@ -31,6 +31,10 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++#ifndef EBADFD
++#define EBADFD 77
++#endif
++
+ #if	GSL_HAVE_LIBMAD
+ #include <mad.h>
+ 
+--- flow/gsl/gsldatahandle-vorbis.c	14 Aug 2002 13:21:17 -0000	1.1.1.3
++++ flow/gsl/gsldatahandle-vorbis.c	15 Dec 2002 07:26:39 -0000	1.4
+@@ -225,7 +225,8 @@
+       if (err || vhandle->pcm_pos < 0)  /* urg, we're completely screwed */
+ 	vhandle->pcm_pos = 0;
+       vhandle->pcm_length = 0;
+-    }
++    }  
++if (0) 
+   g_printerr ("OggS-SEEK: at %lu want %lu got %lu (diff-requested %ld)\n",
+ 	      opos, pos, vhandle->pcm_pos, pos - opos);
+ 
+--- libltdl/ltdl.c	10 Jul 2002 02:52:29 -0000	1.1.1.2
++++ libltdl/ltdl.c	26 Nov 2002 21:00:47 -0000	1.5
+@@ -1544,11 +1544,14 @@
+   /* try to open the old library first; if it was dlpreopened,
+      we want the preopened version of it, even if a dlopenable
+      module is available */
++/*	HACKALERT: Why? Mac OS/Darwin can't open static libs, it is
++	a waste to even try. Disabled for kde.	*/
++#if 0
+   if (old_name && tryall_dlopen(handle, old_name) == 0)
+     {
+       return 0;
+     }
+-
++#endif
+   /* try to open the dynamic library */
+   if (dlname)
+     {
+--- libltdl/ltdl.m4	10 Jul 2002 02:52:29 -0000	1.1.1.2
++++ libltdl/ltdl.m4	22 Jan 2003 02:54:19 -0000	1.4
+@@ -103,6 +103,9 @@
+ 	osf*)
+ 	  libltdl_cv_sys_dlopen_deplibs=yes
+ 	  ;;
++	darwin*)
++	  libltdl_cv_sys_dlopen_deplibs=yes
++	  ;;
+ 	esac
+ ])
+ if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
+@@ -442,6 +445,8 @@
+ if test x"$ac_cv_sys_symbol_underscore" = xyes; then
+   if test x"$ac_cv_func_dlopen" = xyes ||
+      test x"$ac_cv_lib_dl_dlopen" = xyes ; then
++        ac_save_LIBS="$LIBS"
++        LIBS="$LIBS $LIBADD_DL"
+ 	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+ 		libltdl_cv_need_uscore, [dnl
+ 		AC_TRY_RUN([
+@@ -495,6 +500,7 @@
+ fi
+ 
+ if test x"$libltdl_cv_need_uscore" = xyes; then
++  LIBS="$ac_save_LIBS"
+   AC_DEFINE(NEED_USCORE, 1,
+     [Define if dlsym() requires a leading underscode in symbol names. ])
+ fi
+--- mcopidl/Makefile.am	14 Aug 2002 13:21:26 -0000	1.1.1.3
++++ mcopidl/Makefile.am	16 Sep 2002 14:31:34 -0000	1.2
+@@ -1,4 +1,3 @@
+-KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) 
+ INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
+ ####### Files
+ 
+--- soundserver/Makefile.am	14 Aug 2002 13:21:26 -0000	1.1.1.4
++++ soundserver/Makefile.am	29 Nov 2002 18:19:36 -0000	1.10
+@@ -38,13 +38,13 @@
+ libartswavplayobject_la_SOURCES = wavplayobject_impl.cc
+ libartswavplayobject_la_LIBADD  = $(top_builddir)/mcop/libmcop.la \
+                                   libsoundserver_idl.la $(FLOWLIBS)
+-libartswavplayobject_la_LDFLAGS = -no-undefined -module
++libartswavplayobject_la_LDFLAGS = -no-undefined -module -avoid-version
+ libartswavplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+ 
+ libartsgslplayobject_la_SOURCES = gslplayobject_impl.cc
+ libartsgslplayobject_la_LIBADD  = $(top_builddir)/mcop/libmcop.la \
+                                   libsoundserver_idl.la $(FLOWLIBS)
+-libartsgslplayobject_la_LDFLAGS = -no-undefined -module
++libartsgslplayobject_la_LDFLAGS = -no-undefined -module -avoid-version
+ libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+ 
+ ###### "real" programs
+--- soundserver/artsd.cc	10 Jul 2002 02:52:33 -0000	1.1.1.2
++++ soundserver/artsd.cc	20 Oct 2002 19:11:01 -0000	1.4
+@@ -35,6 +35,13 @@
+ #include "debug.h"
+ #include "artsversion.h"
+ 
++#ifdef HAVE_MACH_REALTIME_SCHED
++  #include <mach/mach.h>
++  #include <mach/thread_policy.h>
++  #include <sys/param.h>
++  #include <sys/sysctl.h>
++#endif
++
+ using namespace std;
+ using namespace Arts;
+ 
+@@ -232,6 +239,29 @@
+ 	cerr << endl;
+ }
+ 
++#ifdef HAVE_MACH_REALTIME_SCHED
++static void mach_get_realtime_priority()
++{
++	struct thread_time_constraint_policy ttcpolicy;
++	int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
++	size_t len;   
++
++	len = sizeof (bus_speed);
++	sysctl (mib, 2, &bus_speed, &len, NULL, 0);
++
++	/* Is it enough? */
++	ttcpolicy.period = bus_speed / 120;
++	ttcpolicy.computation = bus_speed / 2400;
++	ttcpolicy.constraint = bus_speed / 1200;
++	ttcpolicy.preemptible = 1;
++
++	thread_policy_set (mach_thread_self (),
++			   THREAD_TIME_CONSTRAINT_POLICY,
++			   (int*)&ttcpolicy,
++			   THREAD_TIME_CONSTRAINT_POLICY_COUNT);
++}
++#endif
++
+ int main(int argc, char **argv)
+ {
+ 	handleArgs(argc, argv);
+@@ -244,7 +274,9 @@
+ 
+ 	if(cfgPort)			 TCPServer::setPort(cfgPort);
+ 
++#ifndef ARTS_NO_ALARM
+ 	CPUUsage	cpuUsage;
++#endif
+ 	Dispatcher	dispatcher(0,cfgServers);
+ 
+ 	initSignals();
+@@ -298,6 +330,10 @@
+ 		cleanUnusedReferences();
+ 		if(!publishReferences(server,audioManager,false)) return 1;
+ 	}
++
++#ifdef HAVE_MACH_REALTIME_SCHED
++	mach_get_realtime_priority();
++#endif
+ 
+ 	/* warn if there was a problem with artswrapper */
+ 	char *wrapper = getenv("STARTED_THROUGH_ARTSWRAPPER");
+--- soundserver/soundserverv2_impl.cc	25 Jun 2002 01:45:59 -0000	1.1.1.1
++++ soundserver/soundserverv2_impl.cc	25 Jun 2002 01:46:40 -0000	1.2
+@@ -374,9 +374,12 @@
+ 
+ float SoundServerV2_impl::cpuUsage()
+ {
++#ifndef ARTS_NO_ALARM
+ 	return CPUUsage::the()->usage() * 100.0;
++#else
++	return 5.0;
++#endif
+ }
+-
+ 
+ #ifndef __SUNPRO_CC
+ /* See bottom of simplesoundserver_impl.cc for the reason this is here.  */
Index: trunk/dports/x11/kdeartwork3/Portfile
===================================================================
--- trunk/dports/x11/kdeartwork3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdeartwork3/Portfile	(revision 1900)
@@ -0,0 +1,41 @@
+PortSystem 1.0
+name		kdeartwork3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	extra icons and screensavers for KDE
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdeartwork-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 lib:libpng.3:libpng \
+		lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdeartwork-${version}.tar.bz2 md5 f9ca096f60eb3c4673d2a0d9e9d0d563 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdeartwork3/files/patch-kdeartwork3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdeartwork3/files/patch-kdeartwork3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdeartwork3/files/patch-kdeartwork3-3.1.darwin	(revision 1900)
@@ -0,0 +1,96 @@
+
+RCS file: IconThemes/Crystal/48x48/mimetypes/-font_bitmap.png
+diff -N IconThemes/Crystal/48x48/mimetypes/-font_bitmap.png
+Binary files /dev/null and /tmp/cvstBeBUU differ
+--- kscreensaver/kdesavers/Euphoria.cpp	10 Dec 2002 19:25:01 -0000	1.1.1.4
++++ kscreensaver/kdesavers/Euphoria.cpp	10 Dec 2002 19:44:01 -0000	1.3
+@@ -33,7 +33,6 @@
+ #include "Euphoria.moc"
+ #include "EuphoriaTexture.h"
+ 
+-
+ #define NUMCONSTS 9
+ #define PIx2 6.28318530718f
+ 
+--- kscreensaver/kdesavers/Flux.cpp	10 Dec 2002 19:25:04 -0000	1.1.1.3
++++ kscreensaver/kdesavers/Flux.cpp	10 Dec 2002 19:44:01 -0000	1.5
+@@ -34,12 +34,11 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <math.h>
++#include <cmath>
+ #include <time.h>
+ #include <qtimer.h>
+ #include "Flux.h"
+ #include "Flux.moc"
+-
+ 
+ #define NUMCONSTS   8
+ #define PIx2        6.28318530718f
+--- kscreensaver/kdesavers/Makefile.am	14 Aug 2002 13:46:38 -0000	1.1.1.3
++++ kscreensaver/kdesavers/Makefile.am	15 Aug 2002 22:10:14 -0000	1.4
+@@ -9,8 +9,8 @@
+ LDADD = $(LIB_KDEUI) -lkscreensaver -lm $(GLLIB)
+ 
+ if COMPILE_GL_KSAVERS
+-GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss
+-GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop
++GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss
++GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop
+ endif
+ 
+ bin_PROGRAMS = kbanner.kss kpolygon.kss kslideshow.kss \
+@@ -30,9 +30,6 @@
+ kfountain_kss_SOURCES = fountain.cpp fountaincfg.ui
+ kwave_kss_SOURCES = wave.cpp wavecfg.ui
+ kgravity_kss_SOURCES = gravity.cpp gravitycfg.ui
+-kflux_kss_SOURCES = Flux.cpp
+-keuphoria_kss_SOURCES = Euphoria.cpp
+-ksolarwinds_kss_SOURCES = SolarWinds.cpp
+ 
+ 
+ METASOURCES = AUTO
+--- kscreensaver/kdesavers/SolarWinds.cpp	10 Dec 2002 19:25:11 -0000	1.1.1.3
++++ kscreensaver/kdesavers/SolarWinds.cpp	10 Dec 2002 19:44:01 -0000	1.3
+@@ -32,7 +32,6 @@
+ #include "SolarWinds.h"
+ #include "SolarWinds.moc"
+ 
+-
+ #define NUMCONSTS   9
+ #define PIx2        6.28318530718f
+ #define DEG2RAD     0.0174532925f
+--- kwin-styles/cde/Makefile.am	25 Jun 2002 01:56:42 -0000	1.1.1.1
++++ kwin-styles/cde/Makefile.am	29 Nov 2002 19:01:20 -0000	1.2
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = kwin_cde.la
+ 
+ kwin_cde_la_SOURCES = cdeclient.cpp
+-kwin_cde_la_LIBADD = $(kde_libraries)/kwin.la
++kwin_cde_la_LIBADD = -lkwin_main
+ kwin_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin-styles/glow/Makefile.am	25 Jun 2002 01:56:42 -0000	1.1.1.1
++++ kwin-styles/glow/Makefile.am	29 Nov 2002 19:01:20 -0000	1.2
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = kwin_glow.la
+ 
+ kwin_glow_la_SOURCES = glowclient.cpp glowbutton.cpp
+-kwin_glow_la_LIBADD = $(kde_libraries)/kwin.la
++kwin_glow_la_LIBADD = -lkwin_main
+ kwin_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin-styles/openlook/Makefile.am	25 Jun 2002 01:56:42 -0000	1.1.1.1
++++ kwin-styles/openlook/Makefile.am	29 Nov 2002 19:01:20 -0000	1.2
+@@ -2,7 +2,7 @@
+ kde_module_LTLIBRARIES      = kwin_openlook.la
+ kwin_openlook_la_SOURCES    = OpenLook.cpp
+ noinst_HEADERS              = OpenLook.h
+-kwin_openlook_la_LIBADD     = $(kde_libraries)/kwin.la
++kwin_openlook_la_LIBADD     = -lkwin_main
+ kwin_openlook_la_LDFLAGS    = $(all_libraries) $(KDE_PLUGIN) -module
+ METASOURCES                 = AUTO
+ linkdir                     = $(kde_datadir)/kwin/
Index: trunk/dports/x11/kdebase3/Portfile
===================================================================
--- trunk/dports/x11/kdebase3/Portfile	(revision 1899)
+++ trunk/dports/x11/kdebase3/Portfile	(revision 1900)
@@ -1,29 +1,26 @@
 PortSystem 1.0
 name		kdebase3
-version		3.0.8
+version		3.1
 revision	1
 categories	x11
 maintainers	ranger@befunk.com
-description	Base Programs for the K Desktop Environment
-
-long_description Base Programs for the K Desktop Environment
+description	base KDE programs
 
 platforms	darwin
-master_sites	ftp://ftp.kde.org/pub/kde/unstable/kde-3.1-beta2/src/
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
 extract.sufx	.tar.bz2
 use_bzip2	yes
 distname	kdebase-${version}
-patchfiles	patch-kdebase-${version}-darwin
-#FIXME: needs lame
-#FIXME: no way to depend on cups that gets the cups package for required headers
-depends_lib	lib:libxml2.2:libxml2 lib:libxslt.1:libxslt lib:libtiff.3:tiff \
-		lib:libqt-mt.3:qt3 lib:libartsc.1:arts lib:libdl.1:dlcompat \
-		lib:libjpeg.9:jpeg lib:libpng.2:libpng lib:libpoll.1:poll-emulator \
-		lib:libcups.2:cups bin:grrrnoincludedepends:cups lib:libX11.6:XFree86 \
-		lib:libaudiofile.0:audiofile lib:libesd.0:esound lib:libXm.1:lesstif \
-		lib:libXm.2:lesstif lib:libfreetype.6:XFree86 lib:libpcre.0:pcre \
-		bin:pcre-config:pcre
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libart_lgpl_2:libart_lgpl lib:libartsflow.1:arts \
+		lib:libaudiofile.0:audiofile lib:libdl.1:dlcompat lib:libfreetype.6:XFree86 \
+		lib:libjpeg.62:jpeg lib:libkdecore.4:kdelibs3 lib:libmad:mad lib:libogg:libogg \
+		lib:libpng.3:libpng lib:libpoll.1:poll-emulator lib:libqt-mt.3.1:qt3 \
+		lib:libvorbis.0:libvorbis lib:libxml2.2:libxml2 lib:libX11.6:XFree86 \
+		lib:libXm.2:lesstif
 
-checksums	md5 693c04fe623a72cd993cb80c5cecc122
+checksums	kdebase-${version}.tar.bz2 md5 02f0583c7de93cdc458101a7575455b4 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
 
 patch {
@@ -34,13 +31,20 @@
 }
 post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
 		system "cd '${worksrcpath}' && make -f Makefile.cvs"
 }
 configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
-		LIBS='-L${prefix}/lib'
-configure.args	--prefix='${prefix}' --with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
-		--with-extra-libs='${prefix}/lib' --with-extra-includes='${prefix}/include' --enable-mt \
-		--with-pic --enable-rpath --enable-shared=yes --enable-static=no --with-xinerama \
-		--without-nfs --disable-final --disable-dependency-tracking --with-ldap=/usr
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking --without-nfs --with-ldap
 build.env	${configure.env}
-
-include         contents
+post-install	{
+		system "install -d -m 755 ${destroot}/etc/pam.d"
+		system "cd '${worksrcpath}' && install -c -m 444 /etc/pam.d/login  ${destroot}/etc/pam.d/kde"
+		system "cd '${worksrcpath}' && install -c -m 444 /etc/pam.d/login  ${destroot}/etc/pam.d/kcheckpass"
+		system "cd '${worksrcpath}' && install -c -m 444 /etc/pam.d/login  ${destroot}/etc/pam.d/kscreensaver"
+}
Index: trunk/dports/x11/kdebase3/contents
===================================================================
--- trunk/dports/x11/kdebase3/contents	(revision 1899)
+++ 	(revision )
@@ -1,2773 +1,0 @@
-contents \
-	bin/appletproxy \
-	bin/chooser \
-	bin/drkonqi \
-	bin/extensionproxy \
-	bin/filesharelist \
-	bin/fileshareset \
-	bin/kaccess \
-	bin/kappfinder \
-	bin/kate \
-	bin/kcheckpass \
-	bin/kcminit \
-	bin/kcmshell \
-	bin/kcontrol \
-	bin/kdcop \
-	bin/kdebugdialog \
-	bin/kdeeject \
-	bin/kdeprintfax \
-	bin/kdesktop \
-	bin/kdesktop_lock \
-	bin/kdesu \
-	bin/kdesud \
-	bin/kdialog \
-	bin/kdm \
-	bin/kdm_config \
-	bin/kdm_greet \
-	bin/keditbookmarks \
-	bin/keditfiletype \
-	bin/kfind \
-	bin/kfmclient \
-	bin/kfmexec \
-	bin/khelpcenter \
-	bin/khotkeys \
-	bin/kicker \
-	bin/kinfocenter \
-	bin/kjobviewer \
-	bin/klipper \
-	bin/klocaldomainurifilterhelper \
-	bin/kmenuedit \
-	bin/konqueror \
-	bin/konsole \
-	bin/konsole_grantpty \
-	bin/kpager \
-	bin/kpersonalizer \
-	bin/kpm \
-	bin/kprinter \
-	bin/krdb \
-	bin/kreadconfig \
-	bin/krootimage \
-	bin/ksmserver \
-	bin/ksplash \
-	bin/kstart \
-	bin/ksysguard \
-	bin/ksystraycmd \
-	bin/ktip \
-	bin/kwebdesktop \
-	bin/kwin \
-	bin/kwmtheme \
-	bin/kwrite \
-	bin/kwrited \
-	bin/kxkb \
-	bin/nspluginscan \
-	bin/nspluginviewer \
-	bin/startkde \
-	etc/ksysguarddrc \
-	include/ccont.h \
-	include/kate/application.h \
-	include/kate/documentmanager.h \
-	include/kate/mainwindow.h \
-	include/kate/plugin.h \
-	include/kate/pluginconfiginterface.h \
-	include/kate/pluginconfiginterfaceextension.h \
-	include/kate/pluginmanager.h \
-	include/kate/toolviewmanager.h \
-	include/kate/viewmanager.h \
-	include/KBackgroundIface.h \
-	include/kbookmarkimporter_crash.h \
-	include/kbookmarkimporter_ie.h \
-	include/kbookmarkimporter_opera.h \
-	include/KDesktopIface.h \
-	include/kfileivi.h \
-	include/kivdirectoryoverlay.h \
-	include/knewmenu.h \
-	include/konq_bgnddlg.h \
-	include/konq_defaults.h \
-	include/konq_dirpart.h \
-	include/konq_drag.h \
-	include/konq_events.h \
-	include/konq_faviconmgr.h \
-	include/konq_historycomm.h \
-	include/konq_historymgr.h \
-	include/konq_iconviewwidget.h \
-	include/konq_operations.h \
-	include/konq_pixmapprovider.h \
-	include/konq_popupmenu.h \
-	include/konq_propsview.h \
-	include/konq_settings.h \
-	include/konq_undo.h \
-	include/konq_xmlguiclient.h \
-	include/konqbookmarkmanager.h \
-	include/konqsidebarplugin.h \
-	include/KonquerorIface.h \
-	include/KScreensaverIface.h \
-	include/ksgrd/ColorPicker.h \
-	include/ksgrd/HostConnector.h \
-	include/ksgrd/SensorAgent.h \
-	include/ksgrd/SensorClient.h \
-	include/ksgrd/SensorManager.h \
-	include/ksgrd/SensorShellAgent.h \
-	include/ksgrd/SensorSocketAgent.h \
-	include/ksgrd/StyleEngine.h \
-	include/ksgrd/StyleSettings.h \
-	include/ksgrd/TimerSettings.h \
-	include/kwin/client.h \
-	include/kwin/kwinbutton.h \
-	include/kwin/options.h \
-	include/kwin/workspace.h \
-	include/KWinInterface.h \
-	lib/appletproxy.la \
-	lib/extensionproxy.la \
-	lib/kaccess.la \
-	lib/kate.la \
-	lib/kcminit.la \
-	lib/kcmshell.la \
-	lib/kcontrol.la \
-	lib/kde3/childpanel_panelextension.la \
-	lib/kde3/clock_panelapplet.la \
-	lib/kde3/dockbar_panelextension.la \
-	lib/kde3/gsthumbnail.la \
-	lib/kde3/htmlthumbnail.la \
-	lib/kde3/imagethumbnail.la \
-	lib/kde3/kasbar_panelextension.la \
-	lib/kde3/kcm_access.la \
-	lib/kde3/kcm_arts.la \
-	lib/kde3/kcm_background.la \
-	lib/kde3/kcm_bell.la \
-	lib/kde3/kcm_cgi.la \
-	lib/kde3/kcm_clock.la \
-	lib/kde3/kcm_colors.la \
-	lib/kde3/kcm_componentchooser.la \
-	lib/kde3/kcm_crypto.la \
-	lib/kde3/kcm_css.la \
-	lib/kde3/kcm_email.la \
-	lib/kde3/kcm_energy.la \
-	lib/kde3/kcm_fileshare.la \
-	lib/kde3/kcm_filetypes.la \
-	lib/kde3/kcm_fonts.la \
-	lib/kde3/kcm_helpcenter.la \
-	lib/kde3/kcm_history.la \
-	lib/kde3/kcm_icons.la \
-	lib/kde3/kcm_info.la \
-	lib/kde3/kcm_input.la \
-	lib/kde3/kcm_ioslaveinfo.la \
-	lib/kde3/kcm_kded.la \
-	lib/kde3/kcm_kdm.la \
-	lib/kde3/kcm_keyboard.la \
-	lib/kde3/kcm_keys.la \
-	lib/kde3/kcm_khotkeys.la \
-	lib/kde3/kcm_kicker.la \
-	lib/kde3/kcm_kio.la \
-	lib/kde3/kcm_knotify.la \
-	lib/kde3/kcm_konq.la \
-	lib/kde3/kcm_konqhtml.la \
-	lib/kde3/kcm_konsole.la \
-	lib/kde3/kcm_kurifilt.la \
-	lib/kde3/kcm_kwindecoration.la \
-	lib/kde3/kcm_kwinoptions.la \
-	lib/kde3/kcm_launch.la \
-	lib/kde3/kcm_locale.la \
-	lib/kde3/kcm_nic.la \
-	lib/kde3/kcm_passwords.la \
-	lib/kde3/kcm_printmgr.la \
-	lib/kde3/kcm_samba.la \
-	lib/kde3/kcm_screensaver.la \
-	lib/kde3/kcm_smserver.la \
-	lib/kde3/kcm_spellchecking.la \
-	lib/kde3/kcm_style.la \
-	lib/kde3/kcm_taskbar.la \
-	lib/kde3/kcm_themes.la \
-	lib/kde3/kcm_usb.la \
-	lib/kde3/kded_favicons.la \
-	lib/kde3/khelpcenter.la \
-	lib/kde3/kickermenu_kdeprint.la \
-	lib/kde3/kickermenu_konsole.la \
-	lib/kde3/kickermenu_prefmenu.la \
-	lib/kde3/kickermenu_recentdocs.la \
-	lib/kde3/kio_cgi.la \
-	lib/kde3/kio_filter.la \
-	lib/kde3/kio_finger.la \
-	lib/kde3/kio_fish.la \
-	lib/kde3/kio_floppy.la \
-	lib/kde3/kio_imap4.la \
-	lib/kde3/kio_info.la \
-	lib/kde3/kio_mac.la \
-	lib/kde3/kio_man.la \
-	lib/kde3/kio_nntp.la \
-	lib/kde3/kio_pop3.la \
-	lib/kde3/kio_print.la \
-	lib/kde3/kio_sftp.la \
-	lib/kde3/kio_smb.la \
-	lib/kde3/kio_smtp.la \
-	lib/kde3/kio_tar.la \
-	lib/kde3/kio_thumbnail.la \
-	lib/kde3/kio_zip.la \
-	lib/kde3/klipper_panelapplet.la \
-	lib/kde3/konq_aboutpage.la \
-	lib/kde3/konq_iconview.la \
-	lib/kde3/konq_listview.la \
-	lib/kde3/konq_shellcmdplugin.la \
-	lib/kde3/konq_sidebar.la \
-	lib/kde3/konq_sidebartree_bookmarks.la \
-	lib/kde3/konq_sidebartree_dirtree.la \
-	lib/kde3/konq_sidebartree_history.la \
-	lib/kde3/konq_sound.la \
-	lib/kde3/konqsidebar_tree.la \
-	lib/kde3/kwin_b2.la \
-	lib/kde3/kwin_b2_config.la \
-	lib/kde3/kwin_default.la \
-	lib/kde3/kwin_default_config.la \
-	lib/kde3/kwin_icewm.la \
-	lib/kde3/kwin_icewm_config.la \
-	lib/kde3/kwin_kde1.la \
-	lib/kde3/kwin_keramik.la \
-	lib/kde3/kwin_keramik_config.la \
-	lib/kde3/kwin_kstep.la \
-	lib/kde3/kwin_kwmtheme.la \
-	lib/kde3/kwin_laptop.la \
-	lib/kde3/kwin_modernsys.la \
-	lib/kde3/kwin_modernsys_config.la \
-	lib/kde3/kwin_quartz.la \
-	lib/kde3/kwin_quartz_config.la \
-	lib/kde3/kwin_redmond.la \
-	lib/kde3/kwin_riscos.la \
-	lib/kde3/kwin_system.la \
-	lib/kde3/kwin_web.la \
-	lib/kde3/launcher_panelapplet.la \
-	lib/kde3/libchildpanel_panelextension.1.0.0.so \
-	lib/kde3/libchildpanel_panelextension.1.so \
-	lib/kde3/libchildpanel_panelextension.so \
-	lib/kde3/libclock_panelapplet.1.0.0.so \
-	lib/kde3/libclock_panelapplet.1.so \
-	lib/kde3/libclock_panelapplet.so \
-	lib/kde3/libdockbar_panelextension.1.0.0.so \
-	lib/kde3/libdockbar_panelextension.1.so \
-	lib/kde3/libdockbar_panelextension.so \
-	lib/kde3/libgsthumbnail.so \
-	lib/kde3/libhtmlthumbnail.so \
-	lib/kde3/libimagethumbnail.so \
-	lib/kde3/libkasbar_panelextension.1.0.0.so \
-	lib/kde3/libkasbar_panelextension.1.so \
-	lib/kde3/libkasbar_panelextension.so \
-	lib/kde3/libkcm_access.so \
-	lib/kde3/libkcm_arts.so \
-	lib/kde3/libkcm_background.so \
-	lib/kde3/libkcm_bell.so \
-	lib/kde3/libkcm_cgi.so \
-	lib/kde3/libkcm_clock.so \
-	lib/kde3/libkcm_colors.so \
-	lib/kde3/libkcm_componentchooser.so \
-	lib/kde3/libkcm_crypto.so \
-	lib/kde3/libkcm_css.so \
-	lib/kde3/libkcm_email.so \
-	lib/kde3/libkcm_energy.so \
-	lib/kde3/libkcm_fileshare.so \
-	lib/kde3/libkcm_filetypes.so \
-	lib/kde3/libkcm_fonts.so \
-	lib/kde3/libkcm_helpcenter.so \
-	lib/kde3/libkcm_history.so \
-	lib/kde3/libkcm_icons.so \
-	lib/kde3/libkcm_info.so \
-	lib/kde3/libkcm_input.so \
-	lib/kde3/libkcm_ioslaveinfo.so \
-	lib/kde3/libkcm_kded.so \
-	lib/kde3/libkcm_kdm.so \
-	lib/kde3/libkcm_keyboard.so \
-	lib/kde3/libkcm_keys.so \
-	lib/kde3/libkcm_khotkeys.so \
-	lib/kde3/libkcm_kicker.so \
-	lib/kde3/libkcm_kio.so \
-	lib/kde3/libkcm_knotify.so \
-	lib/kde3/libkcm_konq.so \
-	lib/kde3/libkcm_konqhtml.so \
-	lib/kde3/libkcm_konsole.so \
-	lib/kde3/libkcm_kurifilt.so \
-	lib/kde3/libkcm_kwindecoration.so \
-	lib/kde3/libkcm_kwinoptions.so \
-	lib/kde3/libkcm_launch.so \
-	lib/kde3/libkcm_locale.so \
-	lib/kde3/libkcm_nic.so \
-	lib/kde3/libkcm_passwords.so \
-	lib/kde3/libkcm_printmgr.so \
-	lib/kde3/libkcm_samba.so \
-	lib/kde3/libkcm_screensaver.so \
-	lib/kde3/libkcm_smserver.so \
-	lib/kde3/libkcm_spellchecking.so \
-	lib/kde3/libkcm_style.so \
-	lib/kde3/libkcm_taskbar.so \
-	lib/kde3/libkcm_themes.so \
-	lib/kde3/libkcm_usb.so \
-	lib/kde3/libkded_favicons.so \
-	lib/kde3/libkdeprint_part.la \
-	lib/kde3/libkdeprint_part.so \
-	lib/kde3/libkhelpcenter.so \
-	lib/kde3/libkickermenu_kdeprint.so \
-	lib/kde3/libkickermenu_konsole.so \
-	lib/kde3/libkickermenu_prefmenu.so \
-	lib/kde3/libkickermenu_recentdocs.so \
-	lib/kde3/libkio_cgi.so \
-	lib/kde3/libkio_filter.so \
-	lib/kde3/libkio_finger.so \
-	lib/kde3/libkio_fish.so \
-	lib/kde3/libkio_floppy.so \
-	lib/kde3/libkio_imap4.so \
-	lib/kde3/libkio_info.so \
-	lib/kde3/libkio_mac.so \
-	lib/kde3/libkio_man.so \
-	lib/kde3/libkio_nntp.so \
-	lib/kde3/libkio_pop3.so \
-	lib/kde3/libkio_print.so \
-	lib/kde3/libkio_sftp.so \
-	lib/kde3/libkio_smb.so \
-	lib/kde3/libkio_smtp.so \
-	lib/kde3/libkio_tar.so \
-	lib/kde3/libkio_thumbnail.so \
-	lib/kde3/libkio_zip.so \
-	lib/kde3/libklipper_panelapplet.so \
-	lib/kde3/libkmanpart.la \
-	lib/kde3/libkmanpart.so \
-	lib/kde3/libkonq_aboutpage.so \
-	lib/kde3/libkonq_iconview.so \
-	lib/kde3/libkonq_listview.so \
-	lib/kde3/libkonq_shellcmdplugin.so \
-	lib/kde3/libkonq_sidebar.so \
-	lib/kde3/libkonq_sidebartree_bookmarks.so \
-	lib/kde3/libkonq_sidebartree_dirtree.so \
-	lib/kde3/libkonq_sidebartree_history.so \
-	lib/kde3/libkonq_sound.so \
-	lib/kde3/libkonqsidebar_tree.so \
-	lib/kde3/libkshorturifilter.la \
-	lib/kde3/libkshorturifilter.so \
-	lib/kde3/libkuriikwsfilter.la \
-	lib/kde3/libkuriikwsfilter.so \
-	lib/kde3/libkurisearchfilter.la \
-	lib/kde3/libkurisearchfilter.so \
-	lib/kde3/libkwin_b2.so \
-	lib/kde3/libkwin_b2_config.so \
-	lib/kde3/libkwin_default.so \
-	lib/kde3/libkwin_default_config.so \
-	lib/kde3/libkwin_icewm.so \
-	lib/kde3/libkwin_icewm_config.so \
-	lib/kde3/libkwin_kde1.so \
-	lib/kde3/libkwin_keramik.so \
-	lib/kde3/libkwin_keramik_config.so \
-	lib/kde3/libkwin_kstep.so \
-	lib/kde3/libkwin_kwmtheme.so \
-	lib/kde3/libkwin_laptop.so \
-	lib/kde3/libkwin_modernsys.so \
-	lib/kde3/libkwin_modernsys_config.so \
-	lib/kde3/libkwin_quartz.so \
-	lib/kde3/libkwin_quartz_config.so \
-	lib/kde3/libkwin_redmond.so \
-	lib/kde3/libkwin_riscos.so \
-	lib/kde3/libkwin_system.so \
-	lib/kde3/libkwin_web.so \
-	lib/kde3/liblauncher_panelapplet.1.0.0.so \
-	lib/kde3/liblauncher_panelapplet.1.so \
-	lib/kde3/liblauncher_panelapplet.so \
-	lib/kde3/liblocaldomainurifilter.la \
-	lib/kde3/liblocaldomainurifilter.so \
-	lib/kde3/liblockout_panelapplet.0.0.0.so \
-	lib/kde3/liblockout_panelapplet.0.so \
-	lib/kde3/liblockout_panelapplet.so \
-	lib/kde3/libminipager_panelapplet.1.0.0.so \
-	lib/kde3/libminipager_panelapplet.1.so \
-	lib/kde3/libminipager_panelapplet.so \
-	lib/kde3/libnaughty_panelapplet.1.0.0.so \
-	lib/kde3/libnaughty_panelapplet.1.so \
-	lib/kde3/libnaughty_panelapplet.so \
-	lib/kde3/libpicturethumbnail.so \
-	lib/kde3/librun_panelapplet.1.0.0.so \
-	lib/kde3/librun_panelapplet.1.so \
-	lib/kde3/librun_panelapplet.so \
-	lib/kde3/libsysguard_panelapplet.1.0.0.so \
-	lib/kde3/libsysguard_panelapplet.1.so \
-	lib/kde3/libsysguard_panelapplet.so \
-	lib/kde3/libsystemtray_panelapplet.1.0.0.so \
-	lib/kde3/libsystemtray_panelapplet.1.so \
-	lib/kde3/libsystemtray_panelapplet.so \
-	lib/kde3/libtaskbar_panelapplet.1.0.0.so \
-	lib/kde3/libtaskbar_panelapplet.1.so \
-	lib/kde3/libtaskbar_panelapplet.so \
-	lib/kde3/libtaskbar_panelextension.1.0.0.so \
-	lib/kde3/libtaskbar_panelextension.1.so \
-	lib/kde3/libtaskbar_panelextension.so \
-	lib/kde3/libtextthumbnail.so \
-	lib/kde3/lockout_panelapplet.la \
-	lib/kde3/minipager_panelapplet.la \
-	lib/kde3/naughty_panelapplet.la \
-	lib/kde3/picturethumbnail.la \
-	lib/kde3/run_panelapplet.la \
-	lib/kde3/sysguard_panelapplet.la \
-	lib/kde3/systemtray_panelapplet.la \
-	lib/kde3/taskbar_panelapplet.la \
-	lib/kde3/taskbar_panelextension.la \
-	lib/kde3/textthumbnail.la \
-	lib/kdesktop.la \
-	lib/keditbookmarks.la \
-	lib/kfmclient.la \
-	lib/khotkeys.la \
-	lib/kicker.la \
-	lib/kjobviewer.la \
-	lib/klipper.la \
-	lib/kmenuedit.la \
-	lib/konqueror.la \
-	lib/konsole.la \
-	lib/kprinter.la \
-	lib/ksmserver.la \
-	lib/kwin.la \
-	lib/kwrite.la \
-	lib/kwrited.la \
-	lib/kxkb.la \
-	lib/libappletproxy.so \
-	lib/libccont.a \
-	lib/libextensionproxy.so \
-	lib/libkaccess.so \
-	lib/libkate.so \
-	lib/libkateinterfaces.la \
-	lib/libkateinterfaces.so \
-	lib/libkcminit.so \
-	lib/libkcmshell.so \
-	lib/libkcontrol.so \
-	lib/libkdesktop.so \
-	lib/libkeditbookmarks.so \
-	lib/libkfindpart.la \
-	lib/libkfindpart.so \
-	lib/libkfmclient.so \
-	lib/libkhotkeys.so \
-	lib/libkicker.so \
-	lib/libkickermain.1.0.0.so \
-	lib/libkickermain.1.so \
-	lib/libkickermain.la \
-	lib/libkickermain.so \
-	lib/libkjobviewer.so \
-	lib/libklipper.so \
-	lib/libkmenuedit.so \
-	lib/libkmultitabbar.0.0.0.dylib \
-	lib/libkmultitabbar.0.dylib \
-	lib/libkmultitabbar.dylib \
-	lib/libkmultitabbar.la \
-	lib/libkonq.4.1.0.dylib \
-	lib/libkonq.4.dylib \
-	lib/libkonq.dylib \
-	lib/libkonq.la \
-	lib/libkonq_sidebar_tree.la \
-	lib/libkonq_sidebar_tree.so \
-	lib/libkonqsidebarplugin.0.0.0.dylib \
-	lib/libkonqsidebarplugin.0.dylib \
-	lib/libkonqsidebarplugin.dylib \
-	lib/libkonqsidebarplugin.la \
-	lib/libkonqueror.so \
-	lib/libkonsole.so \
-	lib/libkonsolepart.la \
-	lib/libkonsolepart.so \
-	lib/libkprinter.so \
-	lib/libksgrd.0.0.0.dylib \
-	lib/libksgrd.0.dylib \
-	lib/libksgrd.dylib \
-	lib/libksgrd.la \
-	lib/libksmserver.so \
-	lib/libkwin.so \
-	lib/libkwrite.so \
-	lib/libkwrited.so \
-	lib/libkxkb.so \
-	lib/libnsplugin.1.0.1.so \
-	lib/libnsplugin.1.so \
-	lib/libnsplugin.la \
-	lib/libnsplugin.so \
-	lib/libsensordisplays.0.0.0.dylib \
-	lib/libsensordisplays.0.dylib \
-	lib/libsensordisplays.dylib \
-	lib/libsensordisplays.la \
-	lib/libtaskbar.1.0.0.so \
-	lib/libtaskbar.1.so \
-	lib/libtaskbar.la \
-	lib/libtaskbar.so \
-	lib/libtaskmanager.1.0.0.so \
-	lib/libtaskmanager.1.so \
-	lib/libtaskmanager.la \
-	lib/libtaskmanager.so \
-	share/applnk/.directory \
-	share/applnk/.hidden/fileappearance.desktop \
-	share/applnk/.hidden/filebehavior.desktop \
-	share/applnk/.hidden/filepreviews.desktop \
-	share/applnk/.hidden/kcmkonsole.desktop \
-	share/applnk/.hidden/kicker_config.desktop \
-	share/applnk/.hidden/kicker_config_appearance.desktop \
-	share/applnk/.hidden/konqfilemgr.desktop \
-	share/applnk/.hidden/kwinactions.desktop \
-	share/applnk/.hidden/kwinadvanced.desktop \
-	share/applnk/.hidden/kwinfocus.desktop \
-	share/applnk/.hidden/kwinmoving.desktop \
-	share/applnk/.hidden/midi.desktop \
-	share/applnk/.hidden/smb.desktop \
-	share/applnk/Applications/.directory \
-	share/applnk/Development/.directory \
-	share/applnk/Editors/.directory \
-	share/applnk/Editors/kate.desktop \
-	share/applnk/Editors/kwrite.desktop \
-	share/applnk/Edutainment/.directory \
-	share/applnk/Games/.directory \
-	share/applnk/Games/Arcade/.directory \
-	share/applnk/Games/Board/.directory \
-	share/applnk/Games/Card/.directory \
-	share/applnk/Games/Kidsgames/.directory \
-	share/applnk/Games/Roguelikes/.directory \
-	share/applnk/Games/TacticStrategy/.directory \
-	share/applnk/Graphics/.directory \
-	share/applnk/Graphics/More/.directory \
-	share/applnk/Help.desktop \
-	share/applnk/Home.desktop \
-	share/applnk/Internet/.directory \
-	share/applnk/Internet/keditbookmarks.desktop \
-	share/applnk/Internet/konqbrowser.desktop \
-	share/applnk/Internet/More/.directory \
-	share/applnk/Internet/Terminal/.directory \
-	share/applnk/KControl.desktop \
-	share/applnk/Kfind.desktop \
-	share/applnk/Multimedia/.directory \
-	share/applnk/Multimedia/More/.directory \
-	share/applnk/Office/.directory \
-	share/applnk/Settings/.directory \
-	share/applnk/Settings/Accessibility/.directory \
-	share/applnk/Settings/Accessibility/kcmaccess.desktop \
-	share/applnk/Settings/Accessibility/keys.desktop \
-	share/applnk/Settings/Accessibility/language.desktop \
-	share/applnk/Settings/Components/.directory \
-	share/applnk/Settings/Components/componentchooser.desktop \
-	share/applnk/Settings/Components/filebrowser.desktop \
-	share/applnk/Settings/Components/filetypes.desktop \
-	share/applnk/Settings/Components/kcmcgi.desktop \
-	share/applnk/Settings/Components/kcmkded.desktop \
-	share/applnk/Settings/Components/kcmsmserver.desktop \
-	share/applnk/Settings/Components/spellchecking.desktop \
-	share/applnk/Settings/Desktop/.directory \
-	share/applnk/Settings/Desktop/desktop.desktop \
-	share/applnk/Settings/Desktop/desktopappearance.desktop \
-	share/applnk/Settings/Desktop/desktopbehavior.desktop \
-	share/applnk/Settings/Desktop/filetrash.desktop \
-	share/applnk/Settings/Desktop/kcmtaskbar.desktop \
-	share/applnk/Settings/Desktop/kwinoptions.desktop \
-	share/applnk/Settings/Desktop/panel.desktop \
-	share/applnk/Settings/email.desktop \
-	share/applnk/Settings/Information/.directory \
-	share/applnk/Settings/Information/devices.desktop \
-	share/applnk/Settings/Information/dma.desktop \
-	share/applnk/Settings/Information/interrupts.desktop \
-	share/applnk/Settings/Information/ioports.desktop \
-	share/applnk/Settings/Information/ioslaveinfo.desktop \
-	share/applnk/Settings/Information/kcmusb.desktop \
-	share/applnk/Settings/Information/memory.desktop \
-	share/applnk/Settings/Information/nic.desktop \
-	share/applnk/Settings/Information/partitions.desktop \
-	share/applnk/Settings/Information/pci.desktop \
-	share/applnk/Settings/Information/processor.desktop \
-	share/applnk/Settings/Information/scsi.desktop \
-	share/applnk/Settings/Information/smbstatus.desktop \
-	share/applnk/Settings/Information/sound.desktop \
-	share/applnk/Settings/Information/xserver.desktop \
-	share/applnk/Settings/LookNFeel/.directory \
-	share/applnk/Settings/LookNFeel/background.desktop \
-	share/applnk/Settings/LookNFeel/borders.desktop \
-	share/applnk/Settings/LookNFeel/colors.desktop \
-	share/applnk/Settings/LookNFeel/desktop.desktop \
-	share/applnk/Settings/LookNFeel/fonts.desktop \
-	share/applnk/Settings/LookNFeel/icons.desktop \
-	share/applnk/Settings/LookNFeel/kcmlaunch.desktop \
-	share/applnk/Settings/LookNFeel/kcmtaskbar.desktop \
-	share/applnk/Settings/LookNFeel/kthememgr.desktop \
-	share/applnk/Settings/LookNFeel/kwindecoration.desktop \
-	share/applnk/Settings/LookNFeel/panel.desktop \
-	share/applnk/Settings/LookNFeel/panel_appearance.desktop \
-	share/applnk/Settings/LookNFeel/screensaver.desktop \
-	share/applnk/Settings/LookNFeel/style.desktop \
-	share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop \
-	share/applnk/Settings/LookNFeel/virtualdesktops.desktop \
-	share/applnk/Settings/LookNFeel/Windows/actions.desktop \
-	share/applnk/Settings/LookNFeel/Windows/kwinmouse.desktop \
-	share/applnk/Settings/LookNFeel/Windows/mouse.desktop \
-	share/applnk/Settings/Network/.directory \
-	share/applnk/Settings/Network/email.desktop \
-	share/applnk/Settings/Network/fileshare.desktop \
-	share/applnk/Settings/Network/lanbrowser.desktop \
-	share/applnk/Settings/Network/netpref.desktop \
-	share/applnk/Settings/Network/proxy.desktop \
-	share/applnk/Settings/Network/WebBrowsing/.directory \
-	share/applnk/Settings/Network/WebBrowsing/cache.desktop \
-	share/applnk/Settings/Network/WebBrowsing/cookies.desktop \
-	share/applnk/Settings/Network/WebBrowsing/ebrowsing.desktop \
-	share/applnk/Settings/Network/WebBrowsing/kcmcss.desktop \
-	share/applnk/Settings/Network/WebBrowsing/kcmhistory.desktop \
-	share/applnk/Settings/Network/WebBrowsing/khtml_behavior.desktop \
-	share/applnk/Settings/Network/WebBrowsing/khtml_fonts.desktop \
-	share/applnk/Settings/Network/WebBrowsing/khtml_java_js.desktop \
-	share/applnk/Settings/Network/WebBrowsing/khtml_plugins.desktop \
-	share/applnk/Settings/Network/WebBrowsing/useragent.desktop \
-	share/applnk/Settings/Peripherals/.directory \
-	share/applnk/Settings/Peripherals/keyboard.desktop \
-	share/applnk/Settings/Peripherals/mouse.desktop \
-	share/applnk/Settings/Peripherals/printers.desktop \
-	share/applnk/Settings/Personalization/kcmlayout.desktop \
-	share/applnk/Settings/PowerControl/.directory \
-	share/applnk/Settings/PowerControl/energy.desktop \
-	share/applnk/Settings/Security/.directory \
-	share/applnk/Settings/Security/crypto.desktop \
-	share/applnk/Settings/Security/passwords.desktop \
-	share/applnk/Settings/Sound/.directory \
-	share/applnk/Settings/Sound/arts.desktop \
-	share/applnk/Settings/Sound/bell.desktop \
-	share/applnk/Settings/Sound/kcmnotify.desktop \
-	share/applnk/Settings/System/.directory \
-	share/applnk/Settings/System/clock.desktop \
-	share/applnk/Settings/System/desktoppath.desktop \
-	share/applnk/Settings/System/kcmhelpcenter.desktop \
-	share/applnk/Settings/System/kdm.desktop \
-	share/applnk/Settings/WebBrowsing/khtml_appearance.desktop \
-	share/applnk/Settings/WebBrowsing/nsplugin.desktop \
-	share/applnk/Settings/WebBrowsing/smb.desktop \
-	share/applnk/Settingsmenu/.directory \
-	share/applnk/Settingsmenu/kappfinder.desktop \
-	share/applnk/Settingsmenu/kcmkicker.desktop \
-	share/applnk/Settingsmenu/KControl.desktop \
-	share/applnk/Settingsmenu/kmenuedit.desktop \
-	share/applnk/Settingsmenu/kpersonalizer.desktop \
-	share/applnk/Settingsmenu/printmgr.desktop \
-	share/applnk/System/.directory \
-	share/applnk/System/kappfinder.desktop \
-	share/applnk/System/kfmclient.desktop \
-	share/applnk/System/kfmclient_dir.desktop \
-	share/applnk/System/kfmclient_html.desktop \
-	share/applnk/System/kinfocenter.desktop \
-	share/applnk/System/kmenuedit.desktop \
-	share/applnk/System/konquerorsu.desktop \
-	share/applnk/System/konsole.desktop \
-	share/applnk/System/konsolesu.desktop \
-	share/applnk/System/kpersonalizer.desktop \
-	share/applnk/System/ksysguard.desktop \
-	share/applnk/System/More/.directory \
-	share/applnk/System/More/konquerorsu.desktop \
-	share/applnk/System/More/konsolesu.desktop \
-	share/applnk/System/ScreenSavers/.directory \
-	share/applnk/System/Terminal/.directory \
-	share/applnk/Toys/.directory \
-	share/applnk/Toys/ktip.desktop \
-	share/applnk/Utilities/.directory \
-	share/applnk/Utilities/kdeprintfax.desktop \
-	share/applnk/Utilities/kjobviewer.desktop \
-	share/applnk/Utilities/klipper.desktop \
-	share/applnk/Utilities/kpager.desktop \
-	share/applnk/Utilities/ktip.desktop \
-	share/applnk/Utilities/More/.directory \
-	share/applnk/Utilities/More/kpager.desktop \
-	share/applnk/Utilities/XUtilities/.directory \
-	share/apps/clockapplet/pics/lcd.png \
-	share/apps/drkonqi/debuggers/gdbrc \
-	share/apps/drkonqi/pics/konqi.png \
-	share/apps/drkonqi/presets/developerrc \
-	share/apps/drkonqi/presets/enduserrc \
-	share/apps/kappfinder/apps/Development/assistant.desktop \
-	share/apps/kappfinder/apps/Development/converter.desktop \
-	share/apps/kappfinder/apps/Development/ddd.desktop \
-	share/apps/kappfinder/apps/Development/designer.desktop \
-	share/apps/kappfinder/apps/Development/dlgedit.desktop \
-	share/apps/kappfinder/apps/Development/Forte.desktop \
-	share/apps/kappfinder/apps/Development/j2mewtk.desktop \
-	share/apps/kappfinder/apps/Development/linguist.desktop \
-	share/apps/kappfinder/apps/Development/pose.desktop \
-	share/apps/kappfinder/apps/Editors/emacs.desktop \
-	share/apps/kappfinder/apps/Editors/gedit.desktop \
-	share/apps/kappfinder/apps/Editors/gvim.desktop \
-	share/apps/kappfinder/apps/Editors/lemacs.desktop \
-	share/apps/kappfinder/apps/Editors/nano.desktop \
-	share/apps/kappfinder/apps/Editors/nedit.desktop \
-	share/apps/kappfinder/apps/Editors/pico.desktop \
-	share/apps/kappfinder/apps/Editors/xedit.desktop \
-	share/apps/kappfinder/apps/Editors/xemacs.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/alephone.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/Mures.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/Trophy.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop \
-	share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gataxx.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gchess.desktop \
-	share/apps/kappfinder/apps/Games/Board/Glines.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gmahjongg.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gmines.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gnotravex.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gnotski.desktop \
-	share/apps/kappfinder/apps/Games/Board/Gstones.desktop \
-	share/apps/kappfinder/apps/Games/Board/Iagno.desktop \
-	share/apps/kappfinder/apps/Games/Board/SameGnome.desktop \
-	share/apps/kappfinder/apps/Games/Board/xboard.desktop \
-	share/apps/kappfinder/apps/Games/Board/Xgammon.desktop \
-	share/apps/kappfinder/apps/Games/Card/AisleRiot.desktop \
-	share/apps/kappfinder/apps/Games/Card/FreeCell.desktop \
-	share/apps/kappfinder/apps/Games/Card/PySol.desktop \
-	share/apps/kappfinder/apps/Games/Card/XPat2.desktop \
-	share/apps/kappfinder/apps/Games/Clanbomber.desktop \
-	share/apps/kappfinder/apps/Games/defendguin.desktop \
-	share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop \
-	share/apps/kappfinder/apps/Games/GTali.desktop \
-	share/apps/kappfinder/apps/Games/penguin-command.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/pernband.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop \
-	share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop \
-	share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop \
-	share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop \
-	share/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop \
-	share/apps/kappfinder/apps/Games/xshipwars.desktop \
-	share/apps/kappfinder/apps/Graphics/bitmap.desktop \
-	share/apps/kappfinder/apps/Graphics/ElectricEyes.desktop \
-	share/apps/kappfinder/apps/Graphics/ghostview.desktop \
-	share/apps/kappfinder/apps/Graphics/gimp.desktop \
-	share/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop \
-	share/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop \
-	share/apps/kappfinder/apps/Graphics/GPhoto.desktop \
-	share/apps/kappfinder/apps/Graphics/Gqview.desktop \
-	share/apps/kappfinder/apps/Graphics/gv.desktop \
-	share/apps/kappfinder/apps/Graphics/Sketch.desktop \
-	share/apps/kappfinder/apps/Graphics/sodipodi.desktop \
-	share/apps/kappfinder/apps/Graphics/tgif.desktop \
-	share/apps/kappfinder/apps/Graphics/xdvi.desktop \
-	share/apps/kappfinder/apps/Graphics/xfig.desktop \
-	share/apps/kappfinder/apps/Graphics/xpaint.desktop \
-	share/apps/kappfinder/apps/Graphics/Xpcd.desktop \
-	share/apps/kappfinder/apps/Graphics/xv.desktop \
-	share/apps/kappfinder/apps/Graphics/Xwpick.desktop \
-	share/apps/kappfinder/apps/Internet/arena.desktop \
-	share/apps/kappfinder/apps/Internet/balsa.desktop \
-	share/apps/kappfinder/apps/Internet/BlueFish.desktop \
-	share/apps/kappfinder/apps/Internet/coolmail.desktop \
-	share/apps/kappfinder/apps/Internet/Dpsftp.desktop \
-	share/apps/kappfinder/apps/Internet/DrakSync.desktop \
-	share/apps/kappfinder/apps/Internet/ethereal.desktop \
-	share/apps/kappfinder/apps/Internet/Evolution.desktop \
-	share/apps/kappfinder/apps/Internet/Faces.desktop \
-	share/apps/kappfinder/apps/Internet/Fetchmailconf.desktop \
-	share/apps/kappfinder/apps/Internet/Gabber.desktop \
-	share/apps/kappfinder/apps/Internet/Galeon.desktop \
-	share/apps/kappfinder/apps/Internet/gFTP.desktop \
-	share/apps/kappfinder/apps/Internet/GnomeICU.desktop \
-	share/apps/kappfinder/apps/Internet/gnomemeeting.desktop \
-	share/apps/kappfinder/apps/Internet/gnometalk.desktop \
-	share/apps/kappfinder/apps/Internet/gtelnet.desktop \
-	share/apps/kappfinder/apps/Internet/knews.desktop \
-	share/apps/kappfinder/apps/Internet/licq.desktop \
-	share/apps/kappfinder/apps/Internet/mozilla.desktop \
-	share/apps/kappfinder/apps/Internet/netscape.desktop \
-	share/apps/kappfinder/apps/Internet/netscape6.desktop \
-	share/apps/kappfinder/apps/Internet/Netscapemessenger.desktop \
-	share/apps/kappfinder/apps/Internet/Nmapfe.desktop \
-	share/apps/kappfinder/apps/Internet/opera.desktop \
-	share/apps/kappfinder/apps/Internet/Pan.desktop \
-	share/apps/kappfinder/apps/Internet/Sylpheed.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/Links.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/pine.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop \
-	share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop \
-	share/apps/kappfinder/apps/Internet/xbiff.desktop \
-	share/apps/kappfinder/apps/Internet/xchat.desktop \
-	share/apps/kappfinder/apps/Internet/xfmail.desktop \
-	share/apps/kappfinder/apps/Internet/xftp.desktop \
-	share/apps/kappfinder/apps/Multimedia/alevt.desktop \
-	share/apps/kappfinder/apps/Multimedia/Aumix.desktop \
-	share/apps/kappfinder/apps/Multimedia/aviplay.desktop \
-	share/apps/kappfinder/apps/Multimedia/bcast2000.desktop \
-	share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop \
-	share/apps/kappfinder/apps/Multimedia/Grip.desktop \
-	share/apps/kappfinder/apps/Multimedia/gtv.desktop \
-	share/apps/kappfinder/apps/Multimedia/jazz.desktop \
-	share/apps/kappfinder/apps/Multimedia/MP3info.desktop \
-	share/apps/kappfinder/apps/Multimedia/mplayer.desktop \
-	share/apps/kappfinder/apps/Multimedia/mtv.desktop \
-	share/apps/kappfinder/apps/Multimedia/ogle.desktop \
-	share/apps/kappfinder/apps/Multimedia/realplayer.desktop \
-	share/apps/kappfinder/apps/Multimedia/slab.desktop \
-	share/apps/kappfinder/apps/Multimedia/xawtv.desktop \
-	share/apps/kappfinder/apps/Multimedia/xcam.desktop \
-	share/apps/kappfinder/apps/Multimedia/xine.desktop \
-	share/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop \
-	share/apps/kappfinder/apps/Multimedia/xmms.desktop \
-	share/apps/kappfinder/apps/Multimedia/XMovie.desktop \
-	share/apps/kappfinder/apps/Multimedia/Xpcd.desktop \
-	share/apps/kappfinder/apps/Office/abiword.desktop \
-	share/apps/kappfinder/apps/Office/acroread.desktop \
-	share/apps/kappfinder/apps/Office/Applix.desktop \
-	share/apps/kappfinder/apps/Office/Dia.desktop \
-	share/apps/kappfinder/apps/Office/Gnome-Cal.desktop \
-	share/apps/kappfinder/apps/Office/Gnome-Card.desktop \
-	share/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop \
-	share/apps/kappfinder/apps/Office/gnucash.desktop \
-	share/apps/kappfinder/apps/Office/Gnumeric.desktop \
-	share/apps/kappfinder/apps/Office/Guppi.desktop \
-	share/apps/kappfinder/apps/Office/Ical.desktop \
-	share/apps/kappfinder/apps/Office/lyx.desktop \
-	share/apps/kappfinder/apps/Office/mrproject.desktop \
-	share/apps/kappfinder/apps/Office/netscapeaddressbook.desktop \
-	share/apps/kappfinder/apps/Office/plan.desktop \
-	share/apps/kappfinder/apps/Office/pybliographic.desktop \
-	share/apps/kappfinder/apps/Office/scribus.desktop \
-	share/apps/kappfinder/apps/Office/WordPerfect.desktop \
-	share/apps/kappfinder/apps/Office/WordPerfect2000.desktop \
-	share/apps/kappfinder/apps/Office/XAcc.desktop \
-	share/apps/kappfinder/apps/Office/xpdf.desktop \
-	share/apps/kappfinder/apps/Office/XsLite.desktop \
-	share/apps/kappfinder/apps/System/citrix_ica.desktop \
-	share/apps/kappfinder/apps/System/editres.desktop \
-	share/apps/kappfinder/apps/System/sam.desktop \
-	share/apps/kappfinder/apps/System/Terminal/aterm.desktop \
-	share/apps/kappfinder/apps/System/Terminal/procinfo.desktop \
-	share/apps/kappfinder/apps/System/Terminal/vmstat.desktop \
-	share/apps/kappfinder/apps/System/wine.desktop \
-	share/apps/kappfinder/apps/System/xosview.desktop \
-	share/apps/kappfinder/apps/Toys/xeyes.desktop \
-	share/apps/kappfinder/apps/Toys/xpinguin.desktop \
-	share/apps/kappfinder/apps/Utilities/calctool.desktop \
-	share/apps/kappfinder/apps/Utilities/e-notes.desktop \
-	share/apps/kappfinder/apps/Utilities/GnomeWho.desktop \
-	share/apps/kappfinder/apps/Utilities/oclock.desktop \
-	share/apps/kappfinder/apps/Utilities/SystemInfo.desktop \
-	share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop \
-	share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop \
-	share/apps/kate/icons/hicolor/16x16/actions/curfiledir.png \
-	share/apps/kate/icons/hicolor/16x16/actions/highlighting.png \
-	share/apps/kate/icons/hicolor/16x16/actions/modified.png \
-	share/apps/kate/icons/hicolor/16x16/actions/null.png \
-	share/apps/kate/icons/hicolor/16x16/actions/save_all.png \
-	share/apps/kate/icons/hicolor/22x22/actions/save_all.png \
-	share/apps/kate/icons/hicolor/32x32/actions/highlighting.png \
-	share/apps/kate/icons/locolor/16x16/actions/curfiledir.png \
-	share/apps/kate/icons/locolor/16x16/actions/indent.png \
-	share/apps/kate/icons/locolor/16x16/actions/modified.png \
-	share/apps/kate/icons/locolor/16x16/actions/null.png \
-	share/apps/kate/icons/locolor/16x16/actions/save_all.png \
-	share/apps/kate/icons/locolor/16x16/actions/unindent.png \
-	share/apps/kate/icons/locolor/22x22/actions/indent.png \
-	share/apps/kate/icons/locolor/22x22/actions/save_all.png \
-	share/apps/kate/icons/locolor/22x22/actions/unindent.png \
-	share/apps/kate/kateui.rc \
-	share/apps/kate/pics/fileselector.png \
-	share/apps/kate/pics/indicator_empty.png \
-	share/apps/kate/pics/indicator_viewactive.png \
-	share/apps/kate/pics/openfiles.png \
-	share/apps/kate/scripts/sample.desktop \
-	share/apps/kate/scripts/sample.sh \
-	share/apps/kate/scripts/tolower.desktop \
-	share/apps/kate/scripts/tolower.sh \
-	share/apps/kate/tips \
-	share/apps/kbookmark/directory_bookmarkbar.desktop \
-	share/apps/kcm_componentchooser/kcm_kemail.desktop \
-	share/apps/kcm_componentchooser/kcm_terminal.desktop \
-	share/apps/kcmcss/template.css \
-	share/apps/kcminput/cursor_large_black.pcf.gz \
-	share/apps/kcminput/cursor_large_white.pcf.gz \
-	share/apps/kcminput/cursor_small_white.pcf.gz \
-	share/apps/kcminput/pics/mouse_lh.png \
-	share/apps/kcminput/pics/mouse_rh.png \
-	share/apps/kcmkeys/kde3.kksrc \
-	share/apps/kcmkeys/kde4.kksrc \
-	share/apps/kcmkeys/mac4.kksrc \
-	share/apps/kcmkeys/unix3.kksrc \
-	share/apps/kcmkeys/win3.kksrc \
-	share/apps/kcmkeys/win4.kksrc \
-	share/apps/kcmlocale/pics/background.png \
-	share/apps/kcmusb/usb.ids \
-	share/apps/kconf_update/convertShortcuts.pl \
-	share/apps/kconf_update/favicons.upd \
-	share/apps/kconf_update/kaccel.upd \
-	share/apps/kconf_update/kcmdisplayrc.upd \
-	share/apps/kconf_update/kicker-3.1-properSizeSetting.pl \
-	share/apps/kconf_update/kickerrc.upd \
-	share/apps/kconf_update/klipper-1-2.pl \
-	share/apps/kconf_update/klipper-kde31.sh \
-	share/apps/kconf_update/klipperrc.upd \
-	share/apps/kconf_update/konsole.upd \
-	share/apps/kconf_update/ksmserver.upd \
-	share/apps/kconf_update/kwin.upd \
-	share/apps/kconf_update/move_favicons.sh \
-	share/apps/kconf_update/move_session_config.sh \
-	share/apps/kconf_update/pluginlibFix.pl \
-	share/apps/kconf_update/schemaStrip.pl \
-	share/apps/kconf_update/socks.upd \
-	share/apps/kcontrol/kcontrolui.rc \
-	share/apps/kcontrol/pics/energybig.png \
-	share/apps/kcontrol/pics/lo-energy.png \
-	share/apps/kcontrol/pics/logo.png \
-	share/apps/kcontrol/pics/mini-world.png \
-	share/apps/kcontrol/pics/monitor.png \
-	share/apps/kcontrol/pics/onlyone.png \
-	share/apps/kcontrol/pics/overlapping.png \
-	share/apps/kcontrol/pics/part1.png \
-	share/apps/kcontrol/pics/part2.png \
-	share/apps/kcontrol/pics/part3.png \
-	share/apps/kcontrol/pics/play.png \
-	share/apps/kdcop/kdcopui.rc \
-	share/apps/kdeprint/template/background.png \
-	share/apps/kdeprint/template/class.template \
-	share/apps/kdeprint/template/driver.template \
-	share/apps/kdeprint/template/htmlstyles.css \
-	share/apps/kdeprint/template/jobs.template \
-	share/apps/kdeprint/template/kdelogo2.png \
-	share/apps/kdeprint/template/kdeprint.png \
-	share/apps/kdeprint/template/lines.png \
-	share/apps/kdeprint/template/lines2.png \
-	share/apps/kdeprint/template/pointers.png \
-	share/apps/kdeprint/template/printer.template \
-	share/apps/kdeprint/template/pseudo.template \
-	share/apps/kdeprint/template/shadow1.png \
-	share/apps/kdeprint_part/kdeprint_part.rc \
-	share/apps/kdeprintfax/anytops \
-	share/apps/kdeprintfax/faxfilters \
-	share/apps/kdeprintfax/icons/hicolor/16x16/actions/abentry.png \
-	share/apps/kdeprintfax/kdeprintfaxui.rc \
-	share/apps/kdesktop/DesktopLinks/Home.desktop \
-	share/apps/kdesktop/directory.autostart \
-	share/apps/kdesktop/directory.desktop \
-	share/apps/kdesktop/directory.templates \
-	share/apps/kdesktop/directory.trash \
-	share/apps/kdesktop/patterns/fish.desktop \
-	share/apps/kdesktop/patterns/fish.png \
-	share/apps/kdesktop/patterns/flowers.desktop \
-	share/apps/kdesktop/patterns/flowers.png \
-	share/apps/kdesktop/patterns/night-rock.desktop \
-	share/apps/kdesktop/patterns/night-rock.jpg \
-	share/apps/kdesktop/patterns/pavement.desktop \
-	share/apps/kdesktop/patterns/pavement.png \
-	share/apps/kdesktop/patterns/rattan.desktop \
-	share/apps/kdesktop/patterns/rattan.png \
-	share/apps/kdesktop/patterns/stonewall2.desktop \
-	share/apps/kdesktop/patterns/stonewall2.png \
-	share/apps/kdesktop/patterns/triangles.desktop \
-	share/apps/kdesktop/patterns/triangles.png \
-	share/apps/kdesktop/pics/kde2.xbm \
-	share/apps/kdesktop/pics/ksslogo.png \
-	share/apps/kdesktop/pics/splash.png \
-	share/apps/kdesktop/pics/splash2.png \
-	share/apps/kdesktop/programs/kwebdesktop.desktop \
-	share/apps/kdesktop/programs/xearth.desktop \
-	share/apps/kdesktop/programs/xglobe.desktop \
-	share/apps/kdesktop/programs/xplanet.desktop \
-	share/apps/kdewizard/pics/wizard_small.png \
-	share/apps/kdewizard/tips \
-	share/apps/kdisplay/app-defaults/AAAAAAGeneral.ad \
-	share/apps/kdisplay/app-defaults/AAAMotif.ad \
-	share/apps/kdisplay/app-defaults/AAATk.ad \
-	share/apps/kdisplay/app-defaults/AAAXaw.ad \
-	share/apps/kdisplay/app-defaults/AcroRead.ad \
-	share/apps/kdisplay/app-defaults/Editres.ad \
-	share/apps/kdisplay/app-defaults/Emacs.ad \
-	share/apps/kdisplay/app-defaults/GV.ad \
-	share/apps/kdisplay/app-defaults/ML.ad \
-	share/apps/kdisplay/app-defaults/Nedit.ad \
-	share/apps/kdisplay/app-defaults/Netscape.ad \
-	share/apps/kdisplay/app-defaults/RVPlayer.ad \
-	share/apps/kdisplay/app-defaults/WPerfect.ad \
-	share/apps/kdisplay/app-defaults/Xawtv.ad \
-	share/apps/kdisplay/app-defaults/XCalc.ad \
-	share/apps/kdisplay/app-defaults/Xdvi.ad \
-	share/apps/kdisplay/app-defaults/XOsview.ad \
-	share/apps/kdisplay/app-defaults/Xpdf.ad \
-	share/apps/kdisplay/app-defaults/XTerm.ad \
-	share/apps/kdisplay/app-defaults/XV.ad \
-	share/apps/kdisplay/color-schemes/AtlasGreen.kcsrc \
-	share/apps/kdisplay/color-schemes/BeOS.kcsrc \
-	share/apps/kdisplay/color-schemes/BlueSlate.kcsrc \
-	share/apps/kdisplay/color-schemes/CDE.kcsrc \
-	share/apps/kdisplay/color-schemes/DarkBlue.kcsrc \
-	share/apps/kdisplay/color-schemes/DesertRed.kcsrc \
-	share/apps/kdisplay/color-schemes/DigitalCDE.kcsrc \
-	share/apps/kdisplay/color-schemes/EveX.kcsrc \
-	share/apps/kdisplay/color-schemes/KDEOne.kcsrc \
-	share/apps/kdisplay/color-schemes/Keramik.kcsrc \
-	share/apps/kdisplay/color-schemes/KeramikEmerald.kcsrc \
-	share/apps/kdisplay/color-schemes/KeramikWhite.kcsrc \
-	share/apps/kdisplay/color-schemes/MediaPeach.kcsrc \
-	share/apps/kdisplay/color-schemes/Next.kcsrc \
-	share/apps/kdisplay/color-schemes/PaleGray.kcsrc \
-	share/apps/kdisplay/color-schemes/PointReyesGreen.kcsrc \
-	share/apps/kdisplay/color-schemes/Pumpkin.kcsrc \
-	share/apps/kdisplay/color-schemes/SolarisCDE.kcsrc \
-	share/apps/kdisplay/color-schemes/Storm.kcsrc \
-	share/apps/kdisplay/color-schemes/System.kcsrc \
-	share/apps/kdisplay/color-schemes/Windows2000.kcsrc \
-	share/apps/kdisplay/color-schemes/Windows95.kcsrc \
-	share/apps/kdisplay/color-schemes/WindowsXP.kcsrc \
-	share/apps/kdm/pics/kdeflower.png \
-	share/apps/kdm/pics/kdelogo.png \
-	share/apps/kdm/pics/users/default.png \
-	share/apps/kdm/pics/users/default2.png \
-	share/apps/kdm/pics/users/root.png \
-	share/apps/kdm/pics/users/root2.png \
-	share/apps/keditbookmarks/keditbookmarksui.rc \
-	share/apps/kfindpart/icons/locolor/22x22/actions/archive.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/delete.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/idea.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/info.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/save.png \
-	share/apps/kfindpart/icons/locolor/22x22/actions/search.png \
-	share/apps/khelpcenter/glossary.html.in \
-	share/apps/khelpcenter/glossary.xslt \
-	share/apps/khelpcenter/intro.html.in \
-	share/apps/khelpcenter/khelpcenterui.rc \
-	share/apps/khelpcenter/plugins/applets.desktop \
-	share/apps/khelpcenter/plugins/Applications/.directory \
-	share/apps/khelpcenter/plugins/contact.desktop \
-	share/apps/khelpcenter/plugins/faq.desktop \
-	share/apps/khelpcenter/plugins/info.desktop \
-	share/apps/khelpcenter/plugins/kcontrolmodules.desktop \
-	share/apps/khelpcenter/plugins/kicmodules.desktop \
-	share/apps/khelpcenter/plugins/konqplugins.desktop \
-	share/apps/khelpcenter/plugins/links.desktop \
-	share/apps/khelpcenter/plugins/Manpages/.directory \
-	share/apps/khelpcenter/plugins/Manpages/man1.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man2.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man3.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man4.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man5.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man6.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man7.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man8.desktop \
-	share/apps/khelpcenter/plugins/Manpages/man9.desktop \
-	share/apps/khelpcenter/plugins/Manpages/mann.desktop \
-	share/apps/khelpcenter/plugins/support.desktop \
-	share/apps/khelpcenter/plugins/Tutorials/.directory \
-	share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop \
-	share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop \
-	share/apps/khelpcenter/plugins/userguide.desktop \
-	share/apps/khelpcenter/plugins/welcome.desktop \
-	share/apps/khelpcenter/table-of-contents.xslt \
-	share/apps/kicker/applets/clockapplet.desktop \
-	share/apps/kicker/applets/klipper.desktop \
-	share/apps/kicker/applets/ksysguardapplet.desktop \
-	share/apps/kicker/applets/lockout.desktop \
-	share/apps/kicker/applets/minipagerapplet.desktop \
-	share/apps/kicker/applets/naughtyapplet.desktop \
-	share/apps/kicker/applets/quicklauncher.desktop \
-	share/apps/kicker/applets/runapplet.desktop \
-	share/apps/kicker/applets/systemtrayapplet.desktop \
-	share/apps/kicker/applets/taskbarapplet.desktop \
-	share/apps/kicker/default-apps \
-	share/apps/kicker/extensions/childpanelextension.desktop \
-	share/apps/kicker/extensions/dockbarextension.desktop \
-	share/apps/kicker/extensions/kasbarextension.desktop \
-	share/apps/kicker/extensions/taskbarextension.desktop \
-	share/apps/kicker/icons/hicolor/16x16/actions/modified.png \
-	share/apps/kicker/icons/locolor/16x16/actions/modified.png \
-	share/apps/kicker/menuext/konsolemenu.desktop \
-	share/apps/kicker/menuext/prefmenu.desktop \
-	share/apps/kicker/menuext/printmenu.desktop \
-	share/apps/kicker/menuext/recentdocs.desktop \
-	share/apps/kicker/pics/disk1.png \
-	share/apps/kicker/pics/disk10.png \
-	share/apps/kicker/pics/disk2.png \
-	share/apps/kicker/pics/disk3.png \
-	share/apps/kicker/pics/disk4.png \
-	share/apps/kicker/pics/disk5.png \
-	share/apps/kicker/pics/disk6.png \
-	share/apps/kicker/pics/disk7.png \
-	share/apps/kicker/pics/disk8.png \
-	share/apps/kicker/pics/disk9.png \
-	share/apps/kicker/pics/kside.png \
-	share/apps/kicker/pics/kside_tile.png \
-	share/apps/kicker/tiles/blue_wood_large_down.png \
-	share/apps/kicker/tiles/blue_wood_large_up.png \
-	share/apps/kicker/tiles/blue_wood_normal_down.png \
-	share/apps/kicker/tiles/blue_wood_normal_up.png \
-	share/apps/kicker/tiles/blue_wood_tiny_down.png \
-	share/apps/kicker/tiles/blue_wood_tiny_up.png \
-	share/apps/kicker/tiles/green_wood_large_down.png \
-	share/apps/kicker/tiles/green_wood_large_up.png \
-	share/apps/kicker/tiles/green_wood_normal_down.png \
-	share/apps/kicker/tiles/green_wood_normal_up.png \
-	share/apps/kicker/tiles/green_wood_tiny_down.png \
-	share/apps/kicker/tiles/green_wood_tiny_up.png \
-	share/apps/kicker/tiles/KDE_button_large_down.png \
-	share/apps/kicker/tiles/KDE_button_large_up.png \
-	share/apps/kicker/tiles/KDE_button_normal_down.png \
-	share/apps/kicker/tiles/KDE_button_normal_up.png \
-	share/apps/kicker/tiles/KDE_button_tiny_down.png \
-	share/apps/kicker/tiles/KDE_button_tiny_up.png \
-	share/apps/kicker/tiles/light_gray_large_down.png \
-	share/apps/kicker/tiles/light_gray_large_up.png \
-	share/apps/kicker/tiles/light_gray_normal_up.png \
-	share/apps/kicker/tiles/light_gray_tiny_down.png \
-	share/apps/kicker/tiles/light_gray_tiny_up.png \
-	share/apps/kicker/tiles/light_green_large_down.png \
-	share/apps/kicker/tiles/light_green_large_up.png \
-	share/apps/kicker/tiles/light_green_normal_down.png \
-	share/apps/kicker/tiles/light_green_normal_up.png \
-	share/apps/kicker/tiles/light_green_tiny_down.png \
-	share/apps/kicker/tiles/light_green_tiny_up.png \
-	share/apps/kicker/tiles/light_pastel_large_down.png \
-	share/apps/kicker/tiles/light_pastel_large_up.png \
-	share/apps/kicker/tiles/light_pastel_normal_up.png \
-	share/apps/kicker/tiles/light_pastel_tiny_down.png \
-	share/apps/kicker/tiles/light_pastel_tiny_up.png \
-	share/apps/kicker/tiles/light_purple_large_down.png \
-	share/apps/kicker/tiles/light_purple_large_up.png \
-	share/apps/kicker/tiles/light_purple_normal_down.png \
-	share/apps/kicker/tiles/light_purple_normal_up.png \
-	share/apps/kicker/tiles/light_purple_tiny_down.png \
-	share/apps/kicker/tiles/light_purple_tiny_up.png \
-	share/apps/kicker/tiles/nuts_and_bolts_large_down.png \
-	share/apps/kicker/tiles/nuts_and_bolts_large_up.png \
-	share/apps/kicker/tiles/nuts_and_bolts_normal_down.png \
-	share/apps/kicker/tiles/nuts_and_bolts_normal_up.png \
-	share/apps/kicker/tiles/nuts_and_bolts_tiny_down.png \
-	share/apps/kicker/tiles/nuts_and_bolts_tiny_up.png \
-	share/apps/kicker/tiles/red_wood_large_down.png \
-	share/apps/kicker/tiles/red_wood_large_up.png \
-	share/apps/kicker/tiles/red_wood_normal_down.png \
-	share/apps/kicker/tiles/red_wood_normal_up.png \
-	share/apps/kicker/tiles/red_wood_tiny_down.png \
-	share/apps/kicker/tiles/red_wood_tiny_up.png \
-	share/apps/kicker/tiles/solid_blue_large_down.png \
-	share/apps/kicker/tiles/solid_blue_large_up.png \
-	share/apps/kicker/tiles/solid_blue_normal_down.png \
-	share/apps/kicker/tiles/solid_blue_normal_up.png \
-	share/apps/kicker/tiles/solid_blue_tiny_down.png \
-	share/apps/kicker/tiles/solid_blue_tiny_up.png \
-	share/apps/kicker/tiles/solid_gray_large_down.png \
-	share/apps/kicker/tiles/solid_gray_large_up.png \
-	share/apps/kicker/tiles/solid_gray_normal_down.png \
-	share/apps/kicker/tiles/solid_gray_normal_up.png \
-	share/apps/kicker/tiles/solid_gray_tiny_down.png \
-	share/apps/kicker/tiles/solid_gray_tiny_up.png \
-	share/apps/kicker/tiles/solid_green_large_down.png \
-	share/apps/kicker/tiles/solid_green_large_up.png \
-	share/apps/kicker/tiles/solid_green_normal_down.png \
-	share/apps/kicker/tiles/solid_green_normal_up.png \
-	share/apps/kicker/tiles/solid_green_tiny_down.png \
-	share/apps/kicker/tiles/solid_green_tiny_up.png \
-	share/apps/kicker/tiles/solid_orange_large_down.png \
-	share/apps/kicker/tiles/solid_orange_large_up.png \
-	share/apps/kicker/tiles/solid_orange_normal_down.png \
-	share/apps/kicker/tiles/solid_orange_normal_up.png \
-	share/apps/kicker/tiles/solid_orange_tiny_down.png \
-	share/apps/kicker/tiles/solid_orange_tiny_up.png \
-	share/apps/kicker/tiles/solid_pastel_large_down.png \
-	share/apps/kicker/tiles/solid_pastel_large_up.png \
-	share/apps/kicker/tiles/solid_pastel_normal_down.png \
-	share/apps/kicker/tiles/solid_pastel_normal_up.png \
-	share/apps/kicker/tiles/solid_pastel_tiny_down.png \
-	share/apps/kicker/tiles/solid_pastel_tiny_up.png \
-	share/apps/kicker/tiles/solid_purple_large_down.png \
-	share/apps/kicker/tiles/solid_purple_large_up.png \
-	share/apps/kicker/tiles/solid_purple_normal_down.png \
-	share/apps/kicker/tiles/solid_purple_normal_up.png \
-	share/apps/kicker/tiles/solid_purple_tiny_down.png \
-	share/apps/kicker/tiles/solid_purple_tiny_up.png \
-	share/apps/kicker/tiles/solid_red_large_down.png \
-	share/apps/kicker/tiles/solid_red_large_up.png \
-	share/apps/kicker/tiles/solid_red_normal_down.png \
-	share/apps/kicker/tiles/solid_red_normal_up.png \
-	share/apps/kicker/tiles/solid_red_tiny_down.png \
-	share/apps/kicker/tiles/solid_red_tiny_up.png \
-	share/apps/kicker/tiles/solid_tigereye_large_down.png \
-	share/apps/kicker/tiles/solid_tigereye_large_up.png \
-	share/apps/kicker/tiles/solid_tigereye_normal_down.png \
-	share/apps/kicker/tiles/solid_tigereye_normal_up.png \
-	share/apps/kicker/tiles/solid_tigereye_tiny_down.png \
-	share/apps/kicker/tiles/solid_tigereye_tiny_up.png \
-	share/apps/kicker/wallpapers/deck_plate.png \
-	share/apps/kicker/wallpapers/green_line.png \
-	share/apps/kicker/wallpapers/rail.png \
-	share/apps/kinfocenter/kinfocenterui.rc \
-	share/apps/kio_finger/kio_finger.css \
-	share/apps/kio_finger/kio_finger.pl \
-	share/apps/kio_info/kde-info2html \
-	share/apps/kio_info/kde-info2html.conf \
-	share/apps/kjobviewer/kjobviewerui.rc \
-	share/apps/klipper/pics/klipper_dock.png \
-	share/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png \
-	share/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png \
-	share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png \
-	share/apps/kmenuedit/kmenueditui.rc \
-	share/apps/konqiconview/konq_iconview.rc \
-	share/apps/konqiconview/konq_multicolumnview.rc \
-	share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc \
-	share/apps/konqlistview/konq_detailedlistview.rc \
-	share/apps/konqlistview/konq_infolistview.rc \
-	share/apps/konqlistview/konq_textview.rc \
-	share/apps/konqlistview/konq_treeview.rc \
-	share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc \
-	share/apps/konqsidebartng/add/virtualfolderadd.desktop \
-	share/apps/konqsidebartng/dirtree/bookmarks_module.desktop \
-	share/apps/konqsidebartng/dirtree/dirtree_module.desktop \
-	share/apps/konqsidebartng/dirtree/history_module.desktop \
-	share/apps/konqsidebartng/entries/.version \
-	share/apps/konqsidebartng/entries/bookmarks.desktop \
-	share/apps/konqsidebartng/entries/history.desktop \
-	share/apps/konqsidebartng/entries/home.desktop \
-	share/apps/konqsidebartng/entries/remote.desktop \
-	share/apps/konqsidebartng/entries/root.desktop \
-	share/apps/konqsidebartng/entries/services.desktop \
-	share/apps/konqsidebartng/virtual_folders/remote/.directory \
-	share/apps/konqsidebartng/virtual_folders/remote/ftp/.directory \
-	share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop \
-	share/apps/konqsidebartng/virtual_folders/remote/web/.directory \
-	share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop \
-	share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop \
-	share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop \
-	share/apps/konqsidebartng/virtual_folders/services/.directory \
-	share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop \
-	share/apps/konqsidebartng/virtual_folders/services/devices.desktop \
-	share/apps/konqsidebartng/virtual_folders/services/lisa.desktop \
-	share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop \
-	share/apps/konqueror/about/back.png \
-	share/apps/konqueror/about/background.png \
-	share/apps/konqueror/about/background_rtl.png \
-	share/apps/konqueror/about/bgtable.png \
-	share/apps/konqueror/about/bgtable_rtl.png \
-	share/apps/konqueror/about/gohome.png \
-	share/apps/konqueror/about/history.png \
-	share/apps/konqueror/about/intro.html \
-	share/apps/konqueror/about/intro_rtl.html \
-	share/apps/konqueror/about/kdelogo2.png \
-	share/apps/konqueror/about/konq.css \
-	share/apps/konqueror/about/konq_rtl.css \
-	share/apps/konqueror/about/konqueror.png \
-	share/apps/konqueror/about/konqueror_rtl.png \
-	share/apps/konqueror/about/lightning.png \
-	share/apps/konqueror/about/lines.png \
-	share/apps/konqueror/about/lines2.png \
-	share/apps/konqueror/about/locationbar_erase.png \
-	share/apps/konqueror/about/locationbar_erase_rtl.png \
-	share/apps/konqueror/about/more.png \
-	share/apps/konqueror/about/openterm.png \
-	share/apps/konqueror/about/pointers.gif \
-	share/apps/konqueror/about/shadow1.png \
-	share/apps/konqueror/about/specs.html \
-	share/apps/konqueror/about/specs_rtl.html \
-	share/apps/konqueror/about/tips.html \
-	share/apps/konqueror/about/tips_rtl.html \
-	share/apps/konqueror/about/view_left_right.png \
-	share/apps/konqueror/about/viewmag.png \
-	share/apps/konqueror/about/window_fullscreen.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde1.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde2.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde3.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde4.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde5.png \
-	share/apps/konqueror/icons/hicolor/16x16/actions/kde6.png \
-	share/apps/konqueror/konqueror.rc \
-	share/apps/konqueror/pics/arrow_bottomleft.png \
-	share/apps/konqueror/pics/arrow_bottomright.png \
-	share/apps/konqueror/pics/arrow_topleft.png \
-	share/apps/konqueror/pics/arrow_topright.png \
-	share/apps/konqueror/pics/indicator_anchor.png \
-	share/apps/konqueror/pics/indicator_connect.png \
-	share/apps/konqueror/pics/indicator_empty.png \
-	share/apps/konqueror/pics/indicator_noconnect.png \
-	share/apps/konqueror/pics/indicator_viewactive.png \
-	share/apps/konqueror/pics/thumbnailfont_7x4.png \
-	share/apps/konqueror/profiles/filemanagement \
-	share/apps/konqueror/profiles/filepreview \
-	share/apps/konqueror/profiles/midnightcommander \
-	share/apps/konqueror/profiles/webbrowsing \
-	share/apps/konqueror/servicemenus/konsolehere.desktop \
-	share/apps/konqueror/tiles/bluemorning.png \
-	share/apps/konqueror/tiles/canvas.png \
-	share/apps/konqueror/tiles/checker.png \
-	share/apps/konqueror/tiles/cubic.png \
-	share/apps/konqueror/tiles/kde4ever.png \
-	share/apps/konqueror/tiles/kenwimer.png \
-	share/apps/konqueror/tiles/noise.png \
-	share/apps/konqueror/tiles/paper_flieder.png \
-	share/apps/konqueror/tiles/punika_attack.png \
-	share/apps/konqueror/tiles/redfiber.png \
-	share/apps/konsole/BlackOnLightColor.schema \
-	share/apps/konsole/BlackOnLightYellow.schema \
-	share/apps/konsole/BlackOnWhite.schema \
-	share/apps/konsole/DarkPicture.schema \
-	share/apps/konsole/default.Keytab \
-	share/apps/konsole/default.Schema \
-	share/apps/konsole/Example.Schema \
-	share/apps/konsole/GreenOnBlack.schema \
-	share/apps/konsole/GreenTint.schema \
-	share/apps/konsole/GreenTint_MC.schema \
-	share/apps/konsole/LightPicture.schema \
-	share/apps/konsole/linux.desktop \
-	share/apps/konsole/linux.keytab \
-	share/apps/konsole/Linux.schema \
-	share/apps/konsole/mc.desktop \
-	share/apps/konsole/profiles/2shells \
-	share/apps/konsole/profiles/3shells \
-	share/apps/konsole/profiles/4shells \
-	share/apps/konsole/profiles/5shells \
-	share/apps/konsole/README.KeyTab \
-	share/apps/konsole/README.Schema \
-	share/apps/konsole/screen.desktop \
-	share/apps/konsole/shell.desktop \
-	share/apps/konsole/su.desktop \
-	share/apps/konsole/sumc.desktop \
-	share/apps/konsole/syscolor.schema \
-	share/apps/konsole/tips \
-	share/apps/konsole/Transparent.schema \
-	share/apps/konsole/Transparent_darkbg.schema \
-	share/apps/konsole/Transparent_lightbg.schema \
-	share/apps/konsole/Transparent_MC.schema \
-	share/apps/konsole/vim.schema \
-	share/apps/konsole/vt100.keytab \
-	share/apps/konsole/vt420pc.keytab \
-	share/apps/konsole/WhiteOnBlack.schema \
-	share/apps/konsole/x11r5.keytab \
-	share/apps/konsole/XTerm.schema \
-	share/apps/kpersonalizer/pics/step1.png \
-	share/apps/kpersonalizer/pics/step2.png \
-	share/apps/kpersonalizer/pics/step3.png \
-	share/apps/kpersonalizer/pics/step4.png \
-	share/apps/kpersonalizer/pics/step5.png \
-	share/apps/ksmserver/pics/shutdownkonq.png \
-	share/apps/ksplash/pics/locolor/splash_active_bar.png \
-	share/apps/ksplash/pics/locolor/splash_bottom.png \
-	share/apps/ksplash/pics/locolor/splash_inactive_bar.png \
-	share/apps/ksplash/pics/locolor/splash_top.png \
-	share/apps/ksplash/pics/splash_active_bar.png \
-	share/apps/ksplash/pics/splash_bottom.png \
-	share/apps/ksplash/pics/splash_inactive_bar.png \
-	share/apps/ksplash/pics/splash_top.png \
-	share/apps/ksysguard/eventsrc \
-	share/apps/ksysguard/KSysGuardApplet.xml \
-	share/apps/ksysguard/ksysguardui.rc \
-	share/apps/ksysguard/pics/computer.png \
-	share/apps/ksysguard/pics/daemon.png \
-	share/apps/ksysguard/pics/kdeapp.png \
-	share/apps/ksysguard/pics/kernel.png \
-	share/apps/ksysguard/pics/ksysguardd.png \
-	share/apps/ksysguard/pics/running.png \
-	share/apps/ksysguard/pics/shell.png \
-	share/apps/ksysguard/pics/tools.png \
-	share/apps/ksysguard/pics/unknownapp.png \
-	share/apps/ksysguard/pics/waiting.png \
-	share/apps/ksysguard/pics/X.png \
-	share/apps/ksysguard/ProcessTable.sgrd \
-	share/apps/ksysguard/SystemLoad.sgrd \
-	share/apps/kthememgr/theme.mappings \
-	share/apps/kthememgr/Themes/Default.ktheme \
-	share/apps/kthememgr/Themes/MGBreizh.ktheme \
-	share/apps/kthememgr/Themes/Nostalgy.ktheme \
-	share/apps/kthememgr/Themes/Template.themerc \
-	share/apps/kthememgr/Themes/Wood.ktheme \
-	share/apps/kwin/b2.desktop \
-	share/apps/kwin/eventsrc \
-	share/apps/kwin/icewm-themes/closeA.xpm \
-	share/apps/kwin/icewm-themes/closeI.xpm \
-	share/apps/kwin/icewm-themes/default.theme \
-	share/apps/kwin/icewm-themes/depthA.xpm \
-	share/apps/kwin/icewm-themes/depthI.xpm \
-	share/apps/kwin/icewm-themes/maximizeA.xpm \
-	share/apps/kwin/icewm-themes/maximizeI.xpm \
-	share/apps/kwin/icewm-themes/menuButtonA.xpm \
-	share/apps/kwin/icewm-themes/menuButtonI.xpm \
-	share/apps/kwin/icewm-themes/minimizeA.xpm \
-	share/apps/kwin/icewm-themes/minimizeI.xpm \
-	share/apps/kwin/icewm-themes/restoreA.xpm \
-	share/apps/kwin/icewm-themes/restoreI.xpm \
-	share/apps/kwin/icewm-themes/rolldownA.xpm \
-	share/apps/kwin/icewm-themes/rolldownI.xpm \
-	share/apps/kwin/icewm-themes/rollupA.xpm \
-	share/apps/kwin/icewm-themes/rollupI.xpm \
-	share/apps/kwin/icewm-themes/titleAB.xpm \
-	share/apps/kwin/icewm-themes/titleAJ.xpm \
-	share/apps/kwin/icewm-themes/titleAM.xpm \
-	share/apps/kwin/icewm-themes/titleAP.xpm \
-	share/apps/kwin/icewm-themes/titleAQ.xpm \
-	share/apps/kwin/icewm-themes/titleAR.xpm \
-	share/apps/kwin/icewm-themes/titleAS.xpm \
-	share/apps/kwin/icewm-themes/titleAT.xpm \
-	share/apps/kwin/icewm-themes/titleIB.xpm \
-	share/apps/kwin/icewm-themes/titleIJ.xpm \
-	share/apps/kwin/icewm-themes/titleIM.xpm \
-	share/apps/kwin/icewm-themes/titleIP.xpm \
-	share/apps/kwin/icewm-themes/titleIQ.xpm \
-	share/apps/kwin/icewm-themes/titleIR.xpm \
-	share/apps/kwin/icewm-themes/titleIS.xpm \
-	share/apps/kwin/icewm-themes/titleIT.xpm \
-	share/apps/kwin/icewm.desktop \
-	share/apps/kwin/kde1.desktop \
-	share/apps/kwin/keramik.desktop \
-	share/apps/kwin/kstep.desktop \
-	share/apps/kwin/laptop.desktop \
-	share/apps/kwin/modernsystem.desktop \
-	share/apps/kwin/pics/bluesun.png \
-	share/apps/kwin/pics/close.png \
-	share/apps/kwin/pics/fog-grey.png \
-	share/apps/kwin/pics/fog.png \
-	share/apps/kwin/pics/greenie.dim.png \
-	share/apps/kwin/pics/greenie.light.png \
-	share/apps/kwin/pics/iconify.png \
-	share/apps/kwin/pics/maximize.png \
-	share/apps/kwin/pics/maximizedown.png \
-	share/apps/kwin/pics/menu.png \
-	share/apps/kwin/pics/pindown.png \
-	share/apps/kwin/pics/pinup.png \
-	share/apps/kwin/pics/unknown.png \
-	share/apps/kwin/quartz.desktop \
-	share/apps/kwin/redmond.desktop \
-	share/apps/kwin/riscos.desktop \
-	share/apps/kwin/system.desktop \
-	share/apps/kwin/web.desktop \
-	share/apps/kwrite/kwriteui.rc \
-	share/apps/naughtyapplet/pics/naughty-happy.png \
-	share/apps/naughtyapplet/pics/naughty-sad.png \
-	share/autostart/kdesktop.desktop \
-	share/autostart/khotkeys.desktop \
-	share/autostart/klipper.desktop \
-	share/autostart/ktip.desktop \
-	share/autostart/kwrited.desktop \
-	share/autostart/panel.desktop \
-	share/config/kdesktop_custom_menu1 \
-	share/config/kdesktop_custom_menu2 \
-	share/config/kdm/backgroundrc \
-	share/config/kdm/kdmrc \
-	share/config/kdm/README \
-	share/config/kdm/Xaccess \
-	share/config/kdm/Xreset \
-	share/config/kdm/Xresources \
-	share/config/kdm/Xservers \
-	share/config/kdm/Xsession \
-	share/config/kdm/Xsetup \
-	share/config/kdm/Xstartup \
-	share/config/kdm/Xwilling \
-	share/config/klipperrc \
-	share/config/konqsidebartng.rc \
-	share/config/konsolerc \
-	share/config/kshorturifilterrc \
-	share/config/kuriikwsfilterrc \
-	share/config/kwritedrc \
-	share/doc/HTML/en/kate/advanced.docbook \
-	share/doc/HTML/en/kate/common \
-	share/doc/HTML/en/kate/configdialog01.png \
-	share/doc/HTML/en/kate/configdialog02.png \
-	share/doc/HTML/en/kate/configuring.docbook \
-	share/doc/HTML/en/kate/fundamentals.docbook \
-	share/doc/HTML/en/kate/highlighted.png \
-	share/doc/HTML/en/kate/highlighting.docbook \
-	share/doc/HTML/en/kate/index.cache.bz2 \
-	share/doc/HTML/en/kate/index.docbook \
-	share/doc/HTML/en/kate/kate.png \
-	share/doc/HTML/en/kate/mdi.docbook \
-	share/doc/HTML/en/kate/menus.docbook \
-	share/doc/HTML/en/kate/mimetypechooser.png \
-	share/doc/HTML/en/kate/part.docbook \
-	share/doc/HTML/en/kate/plugins.docbook \
-	share/doc/HTML/en/kate/regular-expressions.docbook \
-	share/doc/HTML/en/kate/TODO \
-	share/doc/HTML/en/kate/unhighlighted.png \
-	share/doc/HTML/en/kcontrol/arts/common \
-	share/doc/HTML/en/kcontrol/arts/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/arts/index.docbook \
-	share/doc/HTML/en/kcontrol/background/common \
-	share/doc/HTML/en/kcontrol/background/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/background/index.docbook \
-	share/doc/HTML/en/kcontrol/bell/common \
-	share/doc/HTML/en/kcontrol/bell/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/bell/index.docbook \
-	share/doc/HTML/en/kcontrol/cache/common \
-	share/doc/HTML/en/kcontrol/cache/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/cache/index.docbook \
-	share/doc/HTML/en/kcontrol/clock/common \
-	share/doc/HTML/en/kcontrol/clock/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/clock/index.docbook \
-	share/doc/HTML/en/kcontrol/colors/common \
-	share/doc/HTML/en/kcontrol/colors/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/colors/index.docbook \
-	share/doc/HTML/en/kcontrol/common \
-	share/doc/HTML/en/kcontrol/cookies/common \
-	share/doc/HTML/en/kcontrol/cookies/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/cookies/index.docbook \
-	share/doc/HTML/en/kcontrol/crypto/common \
-	share/doc/HTML/en/kcontrol/crypto/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/crypto/index.docbook \
-	share/doc/HTML/en/kcontrol/desktop/common \
-	share/doc/HTML/en/kcontrol/desktop/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/desktop/index.docbook \
-	share/doc/HTML/en/kcontrol/ebrowsing/common \
-	share/doc/HTML/en/kcontrol/ebrowsing/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/ebrowsing/index.docbook \
-	share/doc/HTML/en/kcontrol/email/common \
-	share/doc/HTML/en/kcontrol/email/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/email/index.docbook \
-	share/doc/HTML/en/kcontrol/energy/common \
-	share/doc/HTML/en/kcontrol/energy/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/energy/index.docbook \
-	share/doc/HTML/en/kcontrol/filemanager/common \
-	share/doc/HTML/en/kcontrol/filemanager/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/filemanager/index.docbook \
-	share/doc/HTML/en/kcontrol/filemanager/kfileman1.png \
-	share/doc/HTML/en/kcontrol/filemanager/kfileman2.png \
-	share/doc/HTML/en/kcontrol/filetypes/common \
-	share/doc/HTML/en/kcontrol/filetypes/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/filetypes/index.docbook \
-	share/doc/HTML/en/kcontrol/fonts/common \
-	share/doc/HTML/en/kcontrol/fonts/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/fonts/index.docbook \
-	share/doc/HTML/en/kcontrol/icons/common \
-	share/doc/HTML/en/kcontrol/icons/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/icons/index.docbook \
-	share/doc/HTML/en/kcontrol/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmaccess/common \
-	share/doc/HTML/en/kcontrol/kcmaccess/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmaccess/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmcss/common \
-	share/doc/HTML/en/kcontrol/kcmcss/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmcss/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmfontinst/common \
-	share/doc/HTML/en/kcontrol/kcmfontinst/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmfontinst/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmkonsole/common \
-	share/doc/HTML/en/kcontrol/kcmkonsole/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmkonsole/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmlaunch/common \
-	share/doc/HTML/en/kcontrol/kcmlaunch/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmlaunch/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmnotify/common \
-	share/doc/HTML/en/kcontrol/kcmnotify/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmnotify/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmsmserver/common \
-	share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmsmserver/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmstyle/common \
-	share/doc/HTML/en/kcontrol/kcmstyle/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmstyle/index.docbook \
-	share/doc/HTML/en/kcontrol/kcmtaskbar/common \
-	share/doc/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kcmtaskbar/index.docbook \
-	share/doc/HTML/en/kcontrol/kdm/common \
-	share/doc/HTML/en/kcontrol/kdm/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kdm/index.docbook \
-	share/doc/HTML/en/kcontrol/keyboard/common \
-	share/doc/HTML/en/kcontrol/keyboard/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/keyboard/index.docbook \
-	share/doc/HTML/en/kcontrol/keys/common \
-	share/doc/HTML/en/kcontrol/keys/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/keys/index.docbook \
-	share/doc/HTML/en/kcontrol/khtml/common \
-	share/doc/HTML/en/kcontrol/khtml/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/khtml/index.docbook \
-	share/doc/HTML/en/kcontrol/kthememgr/common \
-	share/doc/HTML/en/kcontrol/kthememgr/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kthememgr/index.docbook \
-	share/doc/HTML/en/kcontrol/kwindecoration/common \
-	share/doc/HTML/en/kcontrol/kwindecoration/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/kwindecoration/index.docbook \
-	share/doc/HTML/en/kcontrol/language/common \
-	share/doc/HTML/en/kcontrol/language/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/language/index.docbook \
-	share/doc/HTML/en/kcontrol/midi/common \
-	share/doc/HTML/en/kcontrol/midi/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/midi/index.docbook \
-	share/doc/HTML/en/kcontrol/mouse/common \
-	share/doc/HTML/en/kcontrol/mouse/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/mouse/index.docbook \
-	share/doc/HTML/en/kcontrol/netpref/common \
-	share/doc/HTML/en/kcontrol/netpref/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/netpref/index.docbook \
-	share/doc/HTML/en/kcontrol/nsplugin/common \
-	share/doc/HTML/en/kcontrol/nsplugin/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/nsplugin/index.docbook \
-	share/doc/HTML/en/kcontrol/panel/common \
-	share/doc/HTML/en/kcontrol/panel/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/panel/index.docbook \
-	share/doc/HTML/en/kcontrol/passwords/common \
-	share/doc/HTML/en/kcontrol/passwords/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/passwords/index.docbook \
-	share/doc/HTML/en/kcontrol/proxy/common \
-	share/doc/HTML/en/kcontrol/proxy/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/proxy/index.docbook \
-	share/doc/HTML/en/kcontrol/screensaver/common \
-	share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/screensaver/index.docbook \
-	share/doc/HTML/en/kcontrol/screenshot.png \
-	share/doc/HTML/en/kcontrol/smb/common \
-	share/doc/HTML/en/kcontrol/smb/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/smb/index.docbook \
-	share/doc/HTML/en/kcontrol/socks/common \
-	share/doc/HTML/en/kcontrol/socks/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/socks/index.docbook \
-	share/doc/HTML/en/kcontrol/spellchecking/common \
-	share/doc/HTML/en/kcontrol/spellchecking/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/spellchecking/index.docbook \
-	share/doc/HTML/en/kcontrol/useragent/common \
-	share/doc/HTML/en/kcontrol/useragent/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/useragent/index.docbook \
-	share/doc/HTML/en/kcontrol/windowmanagement/common \
-	share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2 \
-	share/doc/HTML/en/kcontrol/windowmanagement/index.docbook \
-	share/doc/HTML/en/kdebase-apidocs/common \
-	share/doc/HTML/en/kdebugdialog/common \
-	share/doc/HTML/en/kdebugdialog/index.cache.bz2 \
-	share/doc/HTML/en/kdebugdialog/index.docbook \
-	share/doc/HTML/en/kdeprint/add-printer-wiz.docbook \
-	share/doc/HTML/en/kdeprint/common \
-	share/doc/HTML/en/kdeprint/cups-config.docbook \
-	share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png \
-	share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png \
-	share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png \
-	share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png \
-	share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png \
-	share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png \
-	share/doc/HTML/en/kdeprint/cupsoptions.docbook \
-	share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png \
-	share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png \
-	share/doc/HTML/en/kdeprint/extensions.docbook \
-	share/doc/HTML/en/kdeprint/external-command.docbook \
-	share/doc/HTML/en/kdeprint/final-word.docbook \
-	share/doc/HTML/en/kdeprint/getting-started.docbook \
-	share/doc/HTML/en/kdeprint/hi32-action-wizard.png \
-	share/doc/HTML/en/kdeprint/highlights.docbook \
-	share/doc/HTML/en/kdeprint/index.cache.bz2 \
-	share/doc/HTML/en/kdeprint/index.docbook \
-	share/doc/HTML/en/kdeprint/kcontrol-icon.png \
-	share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png \
-	share/doc/HTML/en/kdeprint/kcron_to_be_printed.png \
-	share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png \
-	share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png \
-	share/doc/HTML/en/kdeprint/kprinter-kivio.png \
-	share/doc/HTML/en/kdeprint/kprinter.png \
-	share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png \
-	share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png \
-	share/doc/HTML/en/kdeprint/lpd.docbook \
-	share/doc/HTML/en/kdeprint/lpr-bsd.docbook \
-	share/doc/HTML/en/kdeprint/lprng.docbook \
-	share/doc/HTML/en/kdeprint/ps-boxes.png \
-	share/doc/HTML/en/kdeprint/rlpr.docbook \
-	share/doc/HTML/en/kdeprint/steinbruch_scaled.png \
-	share/doc/HTML/en/kdeprint/tech-overview.docbook \
-	share/doc/HTML/en/kdeprint/theory.docbook \
-	share/doc/HTML/en/kdesu/common \
-	share/doc/HTML/en/kdesu/index.cache.bz2 \
-	share/doc/HTML/en/kdesu/index.docbook \
-	share/doc/HTML/en/kdm/common \
-	share/doc/HTML/en/kdm/index.cache.bz2 \
-	share/doc/HTML/en/kdm/index.docbook \
-	share/doc/HTML/en/kfind/common \
-	share/doc/HTML/en/kfind/index.cache.bz2 \
-	share/doc/HTML/en/kfind/index.docbook \
-	share/doc/HTML/en/khelpcenter/background.png \
-	share/doc/HTML/en/khelpcenter/bgtable.png \
-	share/doc/HTML/en/khelpcenter/common \
-	share/doc/HTML/en/khelpcenter/contact.docbook \
-	share/doc/HTML/en/khelpcenter/faq/about.docbook \
-	share/doc/HTML/en/khelpcenter/faq/common \
-	share/doc/HTML/en/khelpcenter/faq/configkde.docbook \
-	share/doc/HTML/en/khelpcenter/faq/contrib.docbook \
-	share/doc/HTML/en/khelpcenter/faq/desktop.docbook \
-	share/doc/HTML/en/khelpcenter/faq/filemng.docbook \
-	share/doc/HTML/en/khelpcenter/faq/getkde.docbook \
-	share/doc/HTML/en/khelpcenter/faq/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/faq/index.docbook \
-	share/doc/HTML/en/khelpcenter/faq/install.docbook \
-	share/doc/HTML/en/khelpcenter/faq/intro.docbook \
-	share/doc/HTML/en/khelpcenter/faq/kdeapps.docbook \
-	share/doc/HTML/en/khelpcenter/faq/misc.docbook \
-	share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook \
-	share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook \
-	share/doc/HTML/en/khelpcenter/faq/notrelated.docbook \
-	share/doc/HTML/en/khelpcenter/faq/panel.docbook \
-	share/doc/HTML/en/khelpcenter/faq/tips.docbook \
-	share/doc/HTML/en/khelpcenter/faq/TODO \
-	share/doc/HTML/en/khelpcenter/faq/winmng.docbook \
-	share/doc/HTML/en/khelpcenter/glossary/checkxrefs \
-	share/doc/HTML/en/khelpcenter/glossary/common \
-	share/doc/HTML/en/khelpcenter/glossary/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/glossary/index.docbook \
-	share/doc/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook \
-	share/doc/HTML/en/khelpcenter/help.docbook \
-	share/doc/HTML/en/khelpcenter/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/index.docbook \
-	share/doc/HTML/en/khelpcenter/kdelogo2.png \
-	share/doc/HTML/en/khelpcenter/khelpcenter.png \
-	share/doc/HTML/en/khelpcenter/konq.css \
-	share/doc/HTML/en/khelpcenter/lines.png \
-	share/doc/HTML/en/khelpcenter/lines2.png \
-	share/doc/HTML/en/khelpcenter/links.docbook \
-	share/doc/HTML/en/khelpcenter/pointers.png \
-	share/doc/HTML/en/khelpcenter/quickstart/common \
-	share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/quickstart/index.docbook \
-	share/doc/HTML/en/khelpcenter/shadow1.png \
-	share/doc/HTML/en/khelpcenter/support.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/common \
-	share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/history.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/userguide/index.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/installation.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/intro.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdeadmin-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdebase-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdeedu-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdegames-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdegraphics-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdemultimedia-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdenetwork-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdepim-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdetoys-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/kdeutils-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/koffice-apps.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/more-help.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/staff.docbook \
-	share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook \
-	share/doc/HTML/en/khelpcenter/visualdict/common \
-	share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 \
-	share/doc/HTML/en/khelpcenter/visualdict/index.docbook \
-	share/doc/HTML/en/khelpcenter/visualdict/pict1.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict10.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict11.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict12.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict13.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict14.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict15.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict16.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict17.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict18.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict19.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict2.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict20.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict3.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict4.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict5.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict6.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict7.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict8.png \
-	share/doc/HTML/en/khelpcenter/visualdict/pict9.png \
-	share/doc/HTML/en/khelpcenter/welcome.docbook \
-	share/doc/HTML/en/khelpcenter/whatiskde.docbook \
-	share/doc/HTML/en/kicker/bookmarks_icon.png \
-	share/doc/HTML/en/kicker/common \
-	share/doc/HTML/en/kicker/desktop_icon.png \
-	share/doc/HTML/en/kicker/index.cache.bz2 \
-	share/doc/HTML/en/kicker/index.docbook \
-	share/doc/HTML/en/kicker/k_menu_icon.png \
-	share/doc/HTML/en/kicker/printsys_icon.png \
-	share/doc/HTML/en/kicker/quickbrowser_icon.png \
-	share/doc/HTML/en/kicker/recent_docs_icon.png \
-	share/doc/HTML/en/kicker/screenshot_left.png \
-	share/doc/HTML/en/kicker/screenshot_right.png \
-	share/doc/HTML/en/kicker/taskbar_group.png \
-	share/doc/HTML/en/kicker/terminals_icon.png \
-	share/doc/HTML/en/kicker/windowlist_icon.png \
-	share/doc/HTML/en/kinfocenter/common \
-	share/doc/HTML/en/kinfocenter/devices/common \
-	share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/devices/index.docbook \
-	share/doc/HTML/en/kinfocenter/dma/common \
-	share/doc/HTML/en/kinfocenter/dma/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/dma/index.docbook \
-	share/doc/HTML/en/kinfocenter/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/index.docbook \
-	share/doc/HTML/en/kinfocenter/interrupts/common \
-	share/doc/HTML/en/kinfocenter/interrupts/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/interrupts/index.docbook \
-	share/doc/HTML/en/kinfocenter/ioports/common \
-	share/doc/HTML/en/kinfocenter/ioports/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/ioports/index.docbook \
-	share/doc/HTML/en/kinfocenter/memory/common \
-	share/doc/HTML/en/kinfocenter/memory/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/memory/index.docbook \
-	share/doc/HTML/en/kinfocenter/nics/common \
-	share/doc/HTML/en/kinfocenter/nics/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/nics/index.docbook \
-	share/doc/HTML/en/kinfocenter/partitions/common \
-	share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/partitions/index.docbook \
-	share/doc/HTML/en/kinfocenter/pci/common \
-	share/doc/HTML/en/kinfocenter/pci/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/pci/index.docbook \
-	share/doc/HTML/en/kinfocenter/pcmcia/common \
-	share/doc/HTML/en/kinfocenter/pcmcia/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/pcmcia/index.docbook \
-	share/doc/HTML/en/kinfocenter/processor/common \
-	share/doc/HTML/en/kinfocenter/processor/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/processor/index.docbook \
-	share/doc/HTML/en/kinfocenter/protocols/common \
-	share/doc/HTML/en/kinfocenter/protocols/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/protocols/index.docbook \
-	share/doc/HTML/en/kinfocenter/samba/common \
-	share/doc/HTML/en/kinfocenter/samba/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/samba/index.docbook \
-	share/doc/HTML/en/kinfocenter/scsi/common \
-	share/doc/HTML/en/kinfocenter/scsi/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/scsi/index.docbook \
-	share/doc/HTML/en/kinfocenter/sound/common \
-	share/doc/HTML/en/kinfocenter/sound/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/sound/index.docbook \
-	share/doc/HTML/en/kinfocenter/usb/common \
-	share/doc/HTML/en/kinfocenter/usb/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/usb/index.docbook \
-	share/doc/HTML/en/kinfocenter/xserver/common \
-	share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2 \
-	share/doc/HTML/en/kinfocenter/xserver/index.docbook \
-	share/doc/HTML/en/kioslave/audiocd.docbook \
-	share/doc/HTML/en/kioslave/bzip.docbook \
-	share/doc/HTML/en/kioslave/bzip2.docbook \
-	share/doc/HTML/en/kioslave/cgi.docbook \
-	share/doc/HTML/en/kioslave/common \
-	share/doc/HTML/en/kioslave/file.docbook \
-	share/doc/HTML/en/kioslave/finger.docbook \
-	share/doc/HTML/en/kioslave/fish.docbook \
-	share/doc/HTML/en/kioslave/floppy.docbook \
-	share/doc/HTML/en/kioslave/ftp.docbook \
-	share/doc/HTML/en/kioslave/gopher.docbook \
-	share/doc/HTML/en/kioslave/gzip.docbook \
-	share/doc/HTML/en/kioslave/help.docbook \
-	share/doc/HTML/en/kioslave/http.docbook \
-	share/doc/HTML/en/kioslave/https.docbook \
-	share/doc/HTML/en/kioslave/imap.docbook \
-	share/doc/HTML/en/kioslave/imaps.docbook \
-	share/doc/HTML/en/kioslave/index.cache.bz2 \
-	share/doc/HTML/en/kioslave/index.docbook \
-	share/doc/HTML/en/kioslave/info.docbook \
-	share/doc/HTML/en/kioslave/lan.docbook \
-	share/doc/HTML/en/kioslave/ldap.docbook \
-	share/doc/HTML/en/kioslave/mac.docbook \
-	share/doc/HTML/en/kioslave/mailto.docbook \
-	share/doc/HTML/en/kioslave/man.docbook \
-	share/doc/HTML/en/kioslave/news.docbook \
-	share/doc/HTML/en/kioslave/nfs.docbook \
-	share/doc/HTML/en/kioslave/nntp.docbook \
-	share/doc/HTML/en/kioslave/pop3.docbook \
-	share/doc/HTML/en/kioslave/pop3s.docbook \
-	share/doc/HTML/en/kioslave/print.docbook \
-	share/doc/HTML/en/kioslave/rdate.docbook \
-	share/doc/HTML/en/kioslave/rlan.docbook \
-	share/doc/HTML/en/kioslave/rlogin.docbook \
-	share/doc/HTML/en/kioslave/sftp.docbook \
-	share/doc/HTML/en/kioslave/smb.docbook \
-	share/doc/HTML/en/kioslave/smtp.docbook \
-	share/doc/HTML/en/kioslave/tar.docbook \
-	share/doc/HTML/en/kioslave/telnet.docbook \
-	share/doc/HTML/en/kioslave/thumbnail.docbook \
-	share/doc/HTML/en/kioslave/webdav.docbook \
-	share/doc/HTML/en/kioslave/webdavs.docbook \
-	share/doc/HTML/en/klipper/common \
-	share/doc/HTML/en/klipper/index.cache.bz2 \
-	share/doc/HTML/en/klipper/index.docbook \
-	share/doc/HTML/en/klipper/screenshot.png \
-	share/doc/HTML/en/kmenuedit/common \
-	share/doc/HTML/en/kmenuedit/i_copy.png \
-	share/doc/HTML/en/kmenuedit/i_cut.png \
-	share/doc/HTML/en/kmenuedit/i_delete.png \
-	share/doc/HTML/en/kmenuedit/i_k_button.png \
-	share/doc/HTML/en/kmenuedit/i_new_item.png \
-	share/doc/HTML/en/kmenuedit/i_new_submenu.png \
-	share/doc/HTML/en/kmenuedit/i_paste.png \
-	share/doc/HTML/en/kmenuedit/icon_sets.png \
-	share/doc/HTML/en/kmenuedit/index.cache.bz2 \
-	share/doc/HTML/en/kmenuedit/index.docbook \
-	share/doc/HTML/en/konqueror/cmndline.png \
-	share/doc/HTML/en/konqueror/common \
-	share/doc/HTML/en/konqueror/dirtree.png \
-	share/doc/HTML/en/konqueror/dragdrop.png \
-	share/doc/HTML/en/konqueror/filetype1.png \
-	share/doc/HTML/en/konqueror/filetype3.png \
-	share/doc/HTML/en/konqueror/filetype4.png \
-	share/doc/HTML/en/konqueror/index.cache.bz2 \
-	share/doc/HTML/en/konqueror/index.docbook \
-	share/doc/HTML/en/konqueror/konqorg.png \
-	share/doc/HTML/en/konqueror/parts.png \
-	share/doc/HTML/en/konqueror/shortcut1.png \
-	share/doc/HTML/en/konqueror/shortcut2.png \
-	share/doc/HTML/en/konsole/common \
-	share/doc/HTML/en/konsole/index.cache.bz2 \
-	share/doc/HTML/en/konsole/index.docbook \
-	share/doc/HTML/en/konsole/konsole.png \
-	share/doc/HTML/en/kpager/common \
-	share/doc/HTML/en/kpager/index.cache.bz2 \
-	share/doc/HTML/en/kpager/index.docbook \
-	share/doc/HTML/en/kpager/screenshot.png \
-	share/doc/HTML/en/kpager/settings.png \
-	share/doc/HTML/en/ksysguard/common \
-	share/doc/HTML/en/ksysguard/index.cache.bz2 \
-	share/doc/HTML/en/ksysguard/index.docbook \
-	share/doc/HTML/en/kwrite/common \
-	share/doc/HTML/en/kwrite/index.cache.bz2 \
-	share/doc/HTML/en/kwrite/index.docbook \
-	share/fonts/9x15.pcf.gz \
-	share/fonts/console8x16.pcf.gz \
-	share/fonts/console8x8.pcf.gz \
-	share/fonts/fonts.dir \
-	share/fonts/override/fonts.dir \
-	share/icons/hicolor/16x16/actions/view_choose.png \
-	share/icons/hicolor/16x16/actions/view_detailed.png \
-	share/icons/hicolor/16x16/actions/view_icon.png \
-	share/icons/hicolor/16x16/actions/view_multicolumn.png \
-	share/icons/hicolor/16x16/actions/view_text.png \
-	share/icons/hicolor/16x16/actions/view_tree.png \
-	share/icons/hicolor/16x16/apps/access.png \
-	share/icons/hicolor/16x16/apps/acroread.png \
-	share/icons/hicolor/16x16/apps/agent.png \
-	share/icons/hicolor/16x16/apps/alevt.png \
-	share/icons/hicolor/16x16/apps/applixware.png \
-	share/icons/hicolor/16x16/apps/arts.png \
-	share/icons/hicolor/16x16/apps/background.png \
-	share/icons/hicolor/16x16/apps/bell.png \
-	share/icons/hicolor/16x16/apps/blender.png \
-	share/icons/hicolor/16x16/apps/cache.png \
-	share/icons/hicolor/16x16/apps/clock.png \
-	share/icons/hicolor/16x16/apps/colors.png \
-	share/icons/hicolor/16x16/apps/cookie.png \
-	share/icons/hicolor/16x16/apps/date.png \
-	share/icons/hicolor/16x16/apps/designer.png \
-	share/icons/hicolor/16x16/apps/dlgedit.png \
-	share/icons/hicolor/16x16/apps/emacs.png \
-	share/icons/hicolor/16x16/apps/email.png \
-	share/icons/hicolor/16x16/apps/energy.png \
-	share/icons/hicolor/16x16/apps/energy_star.png \
-	share/icons/hicolor/16x16/apps/enhanced_browsing.png \
-	share/icons/hicolor/16x16/apps/filetypes.png \
-	share/icons/hicolor/16x16/apps/fonts.png \
-	share/icons/hicolor/16x16/apps/gimp.png \
-	share/icons/hicolor/16x16/apps/go.png \
-	share/icons/hicolor/16x16/apps/gv.png \
-	share/icons/hicolor/16x16/apps/gvim.png \
-	share/icons/hicolor/16x16/apps/help_index.png \
-	share/icons/hicolor/16x16/apps/hwinfo.png \
-	share/icons/hicolor/16x16/apps/icons.png \
-	share/icons/hicolor/16x16/apps/iconthemes.png \
-	share/icons/hicolor/16x16/apps/input_devices_settings.png \
-	share/icons/hicolor/16x16/apps/kappfinder.png \
-	share/icons/hicolor/16x16/apps/kate.png \
-	share/icons/hicolor/16x16/apps/kcmdevices.png \
-	share/icons/hicolor/16x16/apps/kcmkicker.png \
-	share/icons/hicolor/16x16/apps/kcmkwm.png \
-	share/icons/hicolor/16x16/apps/kcmmemory.png \
-	share/icons/hicolor/16x16/apps/kcmmidi.png \
-	share/icons/hicolor/16x16/apps/kcmpartitions.png \
-	share/icons/hicolor/16x16/apps/kcmpci.png \
-	share/icons/hicolor/16x16/apps/kcmprocessor.png \
-	share/icons/hicolor/16x16/apps/kcmscsi.png \
-	share/icons/hicolor/16x16/apps/kcmsound.png \
-	share/icons/hicolor/16x16/apps/kcmsystem.png \
-	share/icons/hicolor/16x16/apps/kcmx.png \
-	share/icons/hicolor/16x16/apps/kcontrol.png \
-	share/icons/hicolor/16x16/apps/kdeprintfax.png \
-	share/icons/hicolor/16x16/apps/kdisknav.png \
-	share/icons/hicolor/16x16/apps/kdmconfig.png \
-	share/icons/hicolor/16x16/apps/keditbookmarks.png \
-	share/icons/hicolor/16x16/apps/key_bindings.png \
-	share/icons/hicolor/16x16/apps/keyboard.png \
-	share/icons/hicolor/16x16/apps/keyboard_layout.png \
-	share/icons/hicolor/16x16/apps/kfind.png \
-	share/icons/hicolor/16x16/apps/kfm.png \
-	share/icons/hicolor/16x16/apps/kfm_home.png \
-	share/icons/hicolor/16x16/apps/khelpcenter.png \
-	share/icons/hicolor/16x16/apps/kicker.png \
-	share/icons/hicolor/16x16/apps/kjobviewer.png \
-	share/icons/hicolor/16x16/apps/klipper.png \
-	share/icons/hicolor/16x16/apps/kmenu.png \
-	share/icons/hicolor/16x16/apps/kmenuedit.png \
-	share/icons/hicolor/16x16/apps/knotify.png \
-	share/icons/hicolor/16x16/apps/konqueror.png \
-	share/icons/hicolor/16x16/apps/konsole.png \
-	share/icons/hicolor/16x16/apps/kpager.png \
-	share/icons/hicolor/16x16/apps/kpersonalizer.png \
-	share/icons/hicolor/16x16/apps/kscreensaver.png \
-	share/icons/hicolor/16x16/apps/ksysguard.png \
-	share/icons/hicolor/16x16/apps/kthememgr.png \
-	share/icons/hicolor/16x16/apps/ktip.png \
-	share/icons/hicolor/16x16/apps/kwin.png \
-	share/icons/hicolor/16x16/apps/kwrite.png \
-	share/icons/hicolor/16x16/apps/kxkb.png \
-	share/icons/hicolor/16x16/apps/licq.png \
-	share/icons/hicolor/16x16/apps/locale.png \
-	share/icons/hicolor/16x16/apps/looknfeel.png \
-	share/icons/hicolor/16x16/apps/lyx.png \
-	share/icons/hicolor/16x16/apps/mac.png \
-	share/icons/hicolor/16x16/apps/mathematica.png \
-	share/icons/hicolor/16x16/apps/mouse.png \
-	share/icons/hicolor/16x16/apps/mozilla.png \
-	share/icons/hicolor/16x16/apps/multimedia.png \
-	share/icons/hicolor/16x16/apps/nedit.png \
-	share/icons/hicolor/16x16/apps/netscape.png \
-	share/icons/hicolor/16x16/apps/opera.png \
-	share/icons/hicolor/16x16/apps/package_applications.png \
-	share/icons/hicolor/16x16/apps/package_development.png \
-	share/icons/hicolor/16x16/apps/package_editors.png \
-	share/icons/hicolor/16x16/apps/package_edutainment.png \
-	share/icons/hicolor/16x16/apps/package_favourite.png \
-	share/icons/hicolor/16x16/apps/package_games.png \
-	share/icons/hicolor/16x16/apps/package_games_arcade.png \
-	share/icons/hicolor/16x16/apps/package_games_board.png \
-	share/icons/hicolor/16x16/apps/package_games_card.png \
-	share/icons/hicolor/16x16/apps/package_games_strategy.png \
-	share/icons/hicolor/16x16/apps/package_graphics.png \
-	share/icons/hicolor/16x16/apps/package_multimedia.png \
-	share/icons/hicolor/16x16/apps/package_network.png \
-	share/icons/hicolor/16x16/apps/package_settings.png \
-	share/icons/hicolor/16x16/apps/package_system.png \
-	share/icons/hicolor/16x16/apps/package_toys.png \
-	share/icons/hicolor/16x16/apps/package_utilities.png \
-	share/icons/hicolor/16x16/apps/package_wordprocessing.png \
-	share/icons/hicolor/16x16/apps/panel.png \
-	share/icons/hicolor/16x16/apps/panel_settings.png \
-	share/icons/hicolor/16x16/apps/password.png \
-	share/icons/hicolor/16x16/apps/penguin.png \
-	share/icons/hicolor/16x16/apps/personal.png \
-	share/icons/hicolor/16x16/apps/plan.png \
-	share/icons/hicolor/16x16/apps/printmgr.png \
-	share/icons/hicolor/16x16/apps/proxy.png \
-	share/icons/hicolor/16x16/apps/pybliographic.png \
-	share/icons/hicolor/16x16/apps/realplayer.png \
-	share/icons/hicolor/16x16/apps/remote.png \
-	share/icons/hicolor/16x16/apps/samba.png \
-	share/icons/hicolor/16x16/apps/style.png \
-	share/icons/hicolor/16x16/apps/stylesheet.png \
-	share/icons/hicolor/16x16/apps/terminal.png \
-	share/icons/hicolor/16x16/apps/usb.png \
-	share/icons/hicolor/16x16/apps/wabi.png \
-	share/icons/hicolor/16x16/apps/window_list.png \
-	share/icons/hicolor/16x16/apps/winprops.png \
-	share/icons/hicolor/16x16/apps/wp.png \
-	share/icons/hicolor/16x16/apps/xcalc.png \
-	share/icons/hicolor/16x16/apps/xclipboard.png \
-	share/icons/hicolor/16x16/apps/xclock.png \
-	share/icons/hicolor/16x16/apps/xconsole.png \
-	share/icons/hicolor/16x16/apps/xedit.png \
-	share/icons/hicolor/16x16/apps/xemacs.png \
-	share/icons/hicolor/16x16/apps/xeyes.png \
-	share/icons/hicolor/16x16/apps/xfig.png \
-	share/icons/hicolor/16x16/apps/xfmail.png \
-	share/icons/hicolor/16x16/apps/xload.png \
-	share/icons/hicolor/16x16/apps/xmag.png \
-	share/icons/hicolor/16x16/apps/xmms.png \
-	share/icons/hicolor/16x16/apps/xosview.png \
-	share/icons/hicolor/16x16/apps/xpaint.png \
-	share/icons/hicolor/16x16/apps/xv.png \
-	share/icons/hicolor/16x16/devices/print_class.png \
-	share/icons/hicolor/16x16/devices/print_printer.png \
-	share/icons/hicolor/16x16/filesystems/file_important.png \
-	share/icons/hicolor/16x16/filesystems/folder_important.png \
-	share/icons/hicolor/16x16/filesystems/folder_print2.png \
-	share/icons/hicolor/22x22/actions/view_choose.png \
-	share/icons/hicolor/22x22/actions/view_detailed.png \
-	share/icons/hicolor/22x22/actions/view_icon.png \
-	share/icons/hicolor/22x22/actions/view_multicolumn.png \
-	share/icons/hicolor/22x22/actions/view_text.png \
-	share/icons/hicolor/22x22/actions/view_tree.png \
-	share/icons/hicolor/32x32/actions/view_choose.png \
-	share/icons/hicolor/32x32/actions/view_detailed.png \
-	share/icons/hicolor/32x32/actions/view_icon.png \
-	share/icons/hicolor/32x32/actions/view_multicolumn.png \
-	share/icons/hicolor/32x32/actions/view_text.png \
-	share/icons/hicolor/32x32/actions/view_tree.png \
-	share/icons/hicolor/32x32/apps/access.png \
-	share/icons/hicolor/32x32/apps/acroread.png \
-	share/icons/hicolor/32x32/apps/agent.png \
-	share/icons/hicolor/32x32/apps/alevt.png \
-	share/icons/hicolor/32x32/apps/applixware.png \
-	share/icons/hicolor/32x32/apps/background.png \
-	share/icons/hicolor/32x32/apps/bell.png \
-	share/icons/hicolor/32x32/apps/blender.png \
-	share/icons/hicolor/32x32/apps/cache.png \
-	share/icons/hicolor/32x32/apps/clanbomber.png \
-	share/icons/hicolor/32x32/apps/clock.png \
-	share/icons/hicolor/32x32/apps/colors.png \
-	share/icons/hicolor/32x32/apps/cookie.png \
-	share/icons/hicolor/32x32/apps/date.png \
-	share/icons/hicolor/32x32/apps/designer.png \
-	share/icons/hicolor/32x32/apps/dlgedit.png \
-	share/icons/hicolor/32x32/apps/emacs.png \
-	share/icons/hicolor/32x32/apps/email.png \
-	share/icons/hicolor/32x32/apps/energy.png \
-	share/icons/hicolor/32x32/apps/energy_star.png \
-	share/icons/hicolor/32x32/apps/enhanced_browsing.png \
-	share/icons/hicolor/32x32/apps/error.png \
-	share/icons/hicolor/32x32/apps/filetypes.png \
-	share/icons/hicolor/32x32/apps/fonts.png \
-	share/icons/hicolor/32x32/apps/gimp.png \
-	share/icons/hicolor/32x32/apps/go.png \
-	share/icons/hicolor/32x32/apps/gv.png \
-	share/icons/hicolor/32x32/apps/gvim.png \
-	share/icons/hicolor/32x32/apps/help_index.png \
-	share/icons/hicolor/32x32/apps/hwinfo.png \
-	share/icons/hicolor/32x32/apps/icons.png \
-	share/icons/hicolor/32x32/apps/iconthemes.png \
-	share/icons/hicolor/32x32/apps/input_devices_settings.png \
-	share/icons/hicolor/32x32/apps/kappfinder.png \
-	share/icons/hicolor/32x32/apps/kate.png \
-	share/icons/hicolor/32x32/apps/kcmdevices.png \
-	share/icons/hicolor/32x32/apps/kcmdrkonqi.png \
-	share/icons/hicolor/32x32/apps/kcmkicker.png \
-	share/icons/hicolor/32x32/apps/kcmkwm.png \
-	share/icons/hicolor/32x32/apps/kcmmemory.png \
-	share/icons/hicolor/32x32/apps/kcmmidi.png \
-	share/icons/hicolor/32x32/apps/kcmpartitions.png \
-	share/icons/hicolor/32x32/apps/kcmpci.png \
-	share/icons/hicolor/32x32/apps/kcmprocessor.png \
-	share/icons/hicolor/32x32/apps/kcmscsi.png \
-	share/icons/hicolor/32x32/apps/kcmsound.png \
-	share/icons/hicolor/32x32/apps/kcmsystem.png \
-	share/icons/hicolor/32x32/apps/kcmx.png \
-	share/icons/hicolor/32x32/apps/kcontrol.png \
-	share/icons/hicolor/32x32/apps/kdeprintfax.png \
-	share/icons/hicolor/32x32/apps/kdisknav.png \
-	share/icons/hicolor/32x32/apps/kdmconfig.png \
-	share/icons/hicolor/32x32/apps/keditbookmarks.png \
-	share/icons/hicolor/32x32/apps/key_bindings.png \
-	share/icons/hicolor/32x32/apps/keyboard.png \
-	share/icons/hicolor/32x32/apps/keyboard_layout.png \
-	share/icons/hicolor/32x32/apps/kfind.png \
-	share/icons/hicolor/32x32/apps/kfm.png \
-	share/icons/hicolor/32x32/apps/kfm_home.png \
-	share/icons/hicolor/32x32/apps/khelpcenter.png \
-	share/icons/hicolor/32x32/apps/kjobviewer.png \
-	share/icons/hicolor/32x32/apps/klipper.png \
-	share/icons/hicolor/32x32/apps/kmenu.png \
-	share/icons/hicolor/32x32/apps/kmenuedit.png \
-	share/icons/hicolor/32x32/apps/knotify.png \
-	share/icons/hicolor/32x32/apps/konqueror.png \
-	share/icons/hicolor/32x32/apps/konsole.png \
-	share/icons/hicolor/32x32/apps/kpager.png \
-	share/icons/hicolor/32x32/apps/kpersonalizer.png \
-	share/icons/hicolor/32x32/apps/kscreensaver.png \
-	share/icons/hicolor/32x32/apps/ksysguard.png \
-	share/icons/hicolor/32x32/apps/kthememgr.png \
-	share/icons/hicolor/32x32/apps/ktip.png \
-	share/icons/hicolor/32x32/apps/kwin.png \
-	share/icons/hicolor/32x32/apps/kwrite.png \
-	share/icons/hicolor/32x32/apps/kxkb.png \
-	share/icons/hicolor/32x32/apps/licq.png \
-	share/icons/hicolor/32x32/apps/locale.png \
-	share/icons/hicolor/32x32/apps/looknfeel.png \
-	share/icons/hicolor/32x32/apps/lyx.png \
-	share/icons/hicolor/32x32/apps/mac.png \
-	share/icons/hicolor/32x32/apps/mathematica.png \
-	share/icons/hicolor/32x32/apps/mouse.png \
-	share/icons/hicolor/32x32/apps/multimedia.png \
-	share/icons/hicolor/32x32/apps/nedit.png \
-	share/icons/hicolor/32x32/apps/netscape.png \
-	share/icons/hicolor/32x32/apps/opera.png \
-	share/icons/hicolor/32x32/apps/package.png \
-	share/icons/hicolor/32x32/apps/package_applications.png \
-	share/icons/hicolor/32x32/apps/package_editors.png \
-	share/icons/hicolor/32x32/apps/package_edutainment.png \
-	share/icons/hicolor/32x32/apps/package_favourite.png \
-	share/icons/hicolor/32x32/apps/package_games.png \
-	share/icons/hicolor/32x32/apps/package_games_arcade.png \
-	share/icons/hicolor/32x32/apps/package_games_board.png \
-	share/icons/hicolor/32x32/apps/package_games_card.png \
-	share/icons/hicolor/32x32/apps/package_games_strategy.png \
-	share/icons/hicolor/32x32/apps/package_graphics.png \
-	share/icons/hicolor/32x32/apps/package_multimedia.png \
-	share/icons/hicolor/32x32/apps/package_network.png \
-	share/icons/hicolor/32x32/apps/package_settings.png \
-	share/icons/hicolor/32x32/apps/package_system.png \
-	share/icons/hicolor/32x32/apps/package_toys.png \
-	share/icons/hicolor/32x32/apps/package_utilities.png \
-	share/icons/hicolor/32x32/apps/package_wordprocessing.png \
-	share/icons/hicolor/32x32/apps/password.png \
-	share/icons/hicolor/32x32/apps/penguin.png \
-	share/icons/hicolor/32x32/apps/personal.png \
-	share/icons/hicolor/32x32/apps/plan.png \
-	share/icons/hicolor/32x32/apps/printmgr.png \
-	share/icons/hicolor/32x32/apps/proxy.png \
-	share/icons/hicolor/32x32/apps/pybliographic.png \
-	share/icons/hicolor/32x32/apps/pysol.png \
-	share/icons/hicolor/32x32/apps/realplayer.png \
-	share/icons/hicolor/32x32/apps/samba.png \
-	share/icons/hicolor/32x32/apps/style.png \
-	share/icons/hicolor/32x32/apps/stylesheet.png \
-	share/icons/hicolor/32x32/apps/terminal.png \
-	share/icons/hicolor/32x32/apps/usb.png \
-	share/icons/hicolor/32x32/apps/wabi.png \
-	share/icons/hicolor/32x32/apps/window_list.png \
-	share/icons/hicolor/32x32/apps/winprops.png \
-	share/icons/hicolor/32x32/apps/wp.png \
-	share/icons/hicolor/32x32/apps/x.png \
-	share/icons/hicolor/32x32/apps/xapp.png \
-	share/icons/hicolor/32x32/apps/xawtv.png \
-	share/icons/hicolor/32x32/apps/xcalc.png \
-	share/icons/hicolor/32x32/apps/xclipboard.png \
-	share/icons/hicolor/32x32/apps/xclock.png \
-	share/icons/hicolor/32x32/apps/xconsole.png \
-	share/icons/hicolor/32x32/apps/xedit.png \
-	share/icons/hicolor/32x32/apps/xemacs.png \
-	share/icons/hicolor/32x32/apps/xeyes.png \
-	share/icons/hicolor/32x32/apps/xfig.png \
-	share/icons/hicolor/32x32/apps/xfmail.png \
-	share/icons/hicolor/32x32/apps/xload.png \
-	share/icons/hicolor/32x32/apps/xmag.png \
-	share/icons/hicolor/32x32/apps/xmms.png \
-	share/icons/hicolor/32x32/apps/xosview.png \
-	share/icons/hicolor/32x32/apps/xpaint.png \
-	share/icons/hicolor/32x32/apps/xv.png \
-	share/icons/hicolor/32x32/devices/print_class.png \
-	share/icons/hicolor/32x32/devices/print_printer.png \
-	share/icons/hicolor/32x32/filesystems/file_important.png \
-	share/icons/hicolor/32x32/filesystems/folder_important.png \
-	share/icons/hicolor/32x32/filesystems/folder_print2.png \
-	share/icons/hicolor/48x48/apps/access.png \
-	share/icons/hicolor/48x48/apps/agent.png \
-	share/icons/hicolor/48x48/apps/bell.png \
-	share/icons/hicolor/48x48/apps/blender.png \
-	share/icons/hicolor/48x48/apps/clock.png \
-	share/icons/hicolor/48x48/apps/colors.png \
-	share/icons/hicolor/48x48/apps/cookie.png \
-	share/icons/hicolor/48x48/apps/date.png \
-	share/icons/hicolor/48x48/apps/designer.png \
-	share/icons/hicolor/48x48/apps/emacs.png \
-	share/icons/hicolor/48x48/apps/email.png \
-	share/icons/hicolor/48x48/apps/energy.png \
-	share/icons/hicolor/48x48/apps/energy_star.png \
-	share/icons/hicolor/48x48/apps/enhanced_browsing.png \
-	share/icons/hicolor/48x48/apps/filetypes.png \
-	share/icons/hicolor/48x48/apps/fonts.png \
-	share/icons/hicolor/48x48/apps/gimp.png \
-	share/icons/hicolor/48x48/apps/go.png \
-	share/icons/hicolor/48x48/apps/gvim.png \
-	share/icons/hicolor/48x48/apps/help_index.png \
-	share/icons/hicolor/48x48/apps/hwinfo.png \
-	share/icons/hicolor/48x48/apps/icons.png \
-	share/icons/hicolor/48x48/apps/iconthemes.png \
-	share/icons/hicolor/48x48/apps/input_devices_settings.png \
-	share/icons/hicolor/48x48/apps/kappfinder.png \
-	share/icons/hicolor/48x48/apps/kate.png \
-	share/icons/hicolor/48x48/apps/kcmdevices.png \
-	share/icons/hicolor/48x48/apps/kcmdrkonqi.png \
-	share/icons/hicolor/48x48/apps/kcmkwm.png \
-	share/icons/hicolor/48x48/apps/kcmmemory.png \
-	share/icons/hicolor/48x48/apps/kcmmidi.png \
-	share/icons/hicolor/48x48/apps/kcmpartitions.png \
-	share/icons/hicolor/48x48/apps/kcmpci.png \
-	share/icons/hicolor/48x48/apps/kcmprocessor.png \
-	share/icons/hicolor/48x48/apps/kcmscsi.png \
-	share/icons/hicolor/48x48/apps/kcmsystem.png \
-	share/icons/hicolor/48x48/apps/kcontrol.png \
-	share/icons/hicolor/48x48/apps/kdisknav.png \
-	share/icons/hicolor/48x48/apps/kdmconfig.png \
-	share/icons/hicolor/48x48/apps/key_bindings.png \
-	share/icons/hicolor/48x48/apps/keyboard.png \
-	share/icons/hicolor/48x48/apps/keyboard_layout.png \
-	share/icons/hicolor/48x48/apps/kfind.png \
-	share/icons/hicolor/48x48/apps/kfm.png \
-	share/icons/hicolor/48x48/apps/kfm_home.png \
-	share/icons/hicolor/48x48/apps/khelpcenter.png \
-	share/icons/hicolor/48x48/apps/klipper.png \
-	share/icons/hicolor/48x48/apps/kmenu.png \
-	share/icons/hicolor/48x48/apps/kmenuedit.png \
-	share/icons/hicolor/48x48/apps/knotify.png \
-	share/icons/hicolor/48x48/apps/konqueror.png \
-	share/icons/hicolor/48x48/apps/konsole.png \
-	share/icons/hicolor/48x48/apps/kpager.png \
-	share/icons/hicolor/48x48/apps/kscreensaver.png \
-	share/icons/hicolor/48x48/apps/ksysguard.png \
-	share/icons/hicolor/48x48/apps/kthememgr.png \
-	share/icons/hicolor/48x48/apps/ktip.png \
-	share/icons/hicolor/48x48/apps/kwin.png \
-	share/icons/hicolor/48x48/apps/kwrite.png \
-	share/icons/hicolor/48x48/apps/kxkb.png \
-	share/icons/hicolor/48x48/apps/licq.png \
-	share/icons/hicolor/48x48/apps/locale.png \
-	share/icons/hicolor/48x48/apps/looknfeel.png \
-	share/icons/hicolor/48x48/apps/mouse.png \
-	share/icons/hicolor/48x48/apps/mozilla.png \
-	share/icons/hicolor/48x48/apps/multimedia.png \
-	share/icons/hicolor/48x48/apps/netscape.png \
-	share/icons/hicolor/48x48/apps/opera.png \
-	share/icons/hicolor/48x48/apps/package.png \
-	share/icons/hicolor/48x48/apps/package_applications.png \
-	share/icons/hicolor/48x48/apps/package_editors.png \
-	share/icons/hicolor/48x48/apps/package_edutainment.png \
-	share/icons/hicolor/48x48/apps/package_favourite.png \
-	share/icons/hicolor/48x48/apps/package_games.png \
-	share/icons/hicolor/48x48/apps/package_games_arcade.png \
-	share/icons/hicolor/48x48/apps/package_games_board.png \
-	share/icons/hicolor/48x48/apps/package_games_card.png \
-	share/icons/hicolor/48x48/apps/package_games_strategy.png \
-	share/icons/hicolor/48x48/apps/package_graphics.png \
-	share/icons/hicolor/48x48/apps/package_multimedia.png \
-	share/icons/hicolor/48x48/apps/package_network.png \
-	share/icons/hicolor/48x48/apps/package_settings.png \
-	share/icons/hicolor/48x48/apps/package_system.png \
-	share/icons/hicolor/48x48/apps/package_toys.png \
-	share/icons/hicolor/48x48/apps/package_utilities.png \
-	share/icons/hicolor/48x48/apps/package_wordprocessing.png \
-	share/icons/hicolor/48x48/apps/password.png \
-	share/icons/hicolor/48x48/apps/personal.png \
-	share/icons/hicolor/48x48/apps/proxy.png \
-	share/icons/hicolor/48x48/apps/remote.png \
-	share/icons/hicolor/48x48/apps/samba.png \
-	share/icons/hicolor/48x48/apps/style.png \
-	share/icons/hicolor/48x48/apps/stylesheet.png \
-	share/icons/hicolor/48x48/apps/terminal.png \
-	share/icons/hicolor/48x48/apps/usb.png \
-	share/icons/hicolor/48x48/apps/window_list.png \
-	share/icons/hicolor/48x48/apps/winprops.png \
-	share/icons/hicolor/48x48/apps/xedit.png \
-	share/icons/hicolor/48x48/apps/xemacs.png \
-	share/icons/hicolor/48x48/apps/xmag.png \
-	share/icons/hicolor/48x48/apps/xv.png \
-	share/icons/hicolor/48x48/filesystems/file_important.png \
-	share/icons/hicolor/48x48/filesystems/folder_important.png \
-	share/icons/locolor/16x16/apps/bell.png \
-	share/icons/locolor/32x32/apps/bell.png \
-	share/locale/en_US/entry.desktop \
-	share/locale/l10n/ae/entry.desktop \
-	share/locale/l10n/ae/flag.png \
-	share/locale/l10n/africa.desktop \
-	share/locale/l10n/ag/entry.desktop \
-	share/locale/l10n/ag/flag.png \
-	share/locale/l10n/ar/entry.desktop \
-	share/locale/l10n/ar/flag.png \
-	share/locale/l10n/asia.desktop \
-	share/locale/l10n/at/entry.desktop \
-	share/locale/l10n/at/flag.png \
-	share/locale/l10n/au/entry.desktop \
-	share/locale/l10n/au/flag.png \
-	share/locale/l10n/az/entry.desktop \
-	share/locale/l10n/az/flag.png \
-	share/locale/l10n/ba/entry.desktop \
-	share/locale/l10n/ba/flag.png \
-	share/locale/l10n/bb/entry.desktop \
-	share/locale/l10n/bb/flag.png \
-	share/locale/l10n/bd/entry.desktop \
-	share/locale/l10n/bd/flag.png \
-	share/locale/l10n/be/entry.desktop \
-	share/locale/l10n/be/flag.png \
-	share/locale/l10n/bg/entry.desktop \
-	share/locale/l10n/bg/flag.png \
-	share/locale/l10n/bh/entry.desktop \
-	share/locale/l10n/bh/flag.png \
-	share/locale/l10n/bo/entry.desktop \
-	share/locale/l10n/bo/flag.png \
-	share/locale/l10n/br/entry.desktop \
-	share/locale/l10n/br/flag.png \
-	share/locale/l10n/by/entry.desktop \
-	share/locale/l10n/by/flag.png \
-	share/locale/l10n/C/entry.desktop \
-	share/locale/l10n/C/flag.png \
-	share/locale/l10n/ca/entry.desktop \
-	share/locale/l10n/ca/flag.png \
-	share/locale/l10n/centralamerica.desktop \
-	share/locale/l10n/centraleurope.desktop \
-	share/locale/l10n/ch/entry.desktop \
-	share/locale/l10n/ch/flag.png \
-	share/locale/l10n/cl/entry.desktop \
-	share/locale/l10n/cl/flag.png \
-	share/locale/l10n/cn/entry.desktop \
-	share/locale/l10n/cn/flag.png \
-	share/locale/l10n/co/entry.desktop \
-	share/locale/l10n/co/flag.png \
-	share/locale/l10n/cr/entry.desktop \
-	share/locale/l10n/cr/flag.png \
-	share/locale/l10n/cu/entry.desktop \
-	share/locale/l10n/cu/flag.png \
-	share/locale/l10n/cz/entry.desktop \
-	share/locale/l10n/cz/flag.png \
-	share/locale/l10n/de/entry.desktop \
-	share/locale/l10n/de/flag.png \
-	share/locale/l10n/dj/entry.desktop \
-	share/locale/l10n/dj/flag.png \
-	share/locale/l10n/dk/entry.desktop \
-	share/locale/l10n/dk/flag.png \
-	share/locale/l10n/do/entry.desktop \
-	share/locale/l10n/do/flag.png \
-	share/locale/l10n/dz/entry.desktop \
-	share/locale/l10n/dz/flag.png \
-	share/locale/l10n/easteurope.desktop \
-	share/locale/l10n/ec/entry.desktop \
-	share/locale/l10n/ec/flag.png \
-	share/locale/l10n/ee/entry.desktop \
-	share/locale/l10n/ee/flag.png \
-	share/locale/l10n/eg/entry.desktop \
-	share/locale/l10n/eg/flag.png \
-	share/locale/l10n/es/entry.desktop \
-	share/locale/l10n/es/flag.png \
-	share/locale/l10n/fi/entry.desktop \
-	share/locale/l10n/fi/flag.png \
-	share/locale/l10n/fr/entry.desktop \
-	share/locale/l10n/fr/flag.png \
-	share/locale/l10n/gb/entry.desktop \
-	share/locale/l10n/gb/flag.png \
-	share/locale/l10n/gd/entry.desktop \
-	share/locale/l10n/gd/flag.png \
-	share/locale/l10n/gr/entry.desktop \
-	share/locale/l10n/gr/flag.png \
-	share/locale/l10n/gt/entry.desktop \
-	share/locale/l10n/gt/flag.png \
-	share/locale/l10n/hn/entry.desktop \
-	share/locale/l10n/hn/flag.png \
-	share/locale/l10n/hr/entry.desktop \
-	share/locale/l10n/hr/flag.png \
-	share/locale/l10n/hu/entry.desktop \
-	share/locale/l10n/hu/flag.png \
-	share/locale/l10n/id/entry.desktop \
-	share/locale/l10n/id/flag.png \
-	share/locale/l10n/ie/entry.desktop \
-	share/locale/l10n/ie/flag.png \
-	share/locale/l10n/il/entry.desktop \
-	share/locale/l10n/il/flag.png \
-	share/locale/l10n/in/entry.desktop \
-	share/locale/l10n/in/flag.png \
-	share/locale/l10n/iq/entry.desktop \
-	share/locale/l10n/iq/flag.png \
-	share/locale/l10n/ir/entry.desktop \
-	share/locale/l10n/ir/flag.png \
-	share/locale/l10n/is/entry.desktop \
-	share/locale/l10n/is/flag.png \
-	share/locale/l10n/it/entry.desktop \
-	share/locale/l10n/it/flag.png \
-	share/locale/l10n/jm/entry.desktop \
-	share/locale/l10n/jm/flag.png \
-	share/locale/l10n/jo/entry.desktop \
-	share/locale/l10n/jo/flag.png \
-	share/locale/l10n/jp/entry.desktop \
-	share/locale/l10n/jp/flag.png \
-	share/locale/l10n/kn/entry.desktop \
-	share/locale/l10n/kn/flag.png \
-	share/locale/l10n/kp/entry.desktop \
-	share/locale/l10n/kp/flag.png \
-	share/locale/l10n/kr/entry.desktop \
-	share/locale/l10n/kr/flag.png \
-	share/locale/l10n/kw/entry.desktop \
-	share/locale/l10n/kw/flag.png \
-	share/locale/l10n/lb/entry.desktop \
-	share/locale/l10n/lb/flag.png \
-	share/locale/l10n/lc/entry.desktop \
-	share/locale/l10n/lc/flag.png \
-	share/locale/l10n/lt/entry.desktop \
-	share/locale/l10n/lt/flag.png \
-	share/locale/l10n/lu/entry.desktop \
-	share/locale/l10n/lu/flag.png \
-	share/locale/l10n/lv/entry.desktop \
-	share/locale/l10n/lv/flag.png \
-	share/locale/l10n/ly/entry.desktop \
-	share/locale/l10n/ly/flag.png \
-	share/locale/l10n/ma/entry.desktop \
-	share/locale/l10n/ma/flag.png \
-	share/locale/l10n/mk/entry.desktop \
-	share/locale/l10n/mk/flag.png \
-	share/locale/l10n/mt/entry.desktop \
-	share/locale/l10n/mt/flag.png \
-	share/locale/l10n/mx/entry.desktop \
-	share/locale/l10n/mx/flag.png \
-	share/locale/l10n/ni/entry.desktop \
-	share/locale/l10n/ni/flag.png \
-	share/locale/l10n/nl/entry.desktop \
-	share/locale/l10n/nl/flag.png \
-	share/locale/l10n/no/entry.desktop \
-	share/locale/l10n/no/flag.png \
-	share/locale/l10n/northamerica.desktop \
-	share/locale/l10n/northeurope.desktop \
-	share/locale/l10n/nz/entry.desktop \
-	share/locale/l10n/nz/flag.png \
-	share/locale/l10n/om/entry.desktop \
-	share/locale/l10n/om/flag.png \
-	share/locale/l10n/pa/entry.desktop \
-	share/locale/l10n/pa/flag.png \
-	share/locale/l10n/pe/entry.desktop \
-	share/locale/l10n/pe/flag.png \
-	share/locale/l10n/pl/entry.desktop \
-	share/locale/l10n/pl/flag.png \
-	share/locale/l10n/ps/entry.desktop \
-	share/locale/l10n/ps/flag.png \
-	share/locale/l10n/pt/entry.desktop \
-	share/locale/l10n/pt/flag.png \
-	share/locale/l10n/py/entry.desktop \
-	share/locale/l10n/py/flag.png \
-	share/locale/l10n/qa/entry.desktop \
-	share/locale/l10n/qa/flag.png \
-	share/locale/l10n/ro/entry.desktop \
-	share/locale/l10n/ro/flag.png \
-	share/locale/l10n/ru/entry.desktop \
-	share/locale/l10n/ru/flag.png \
-	share/locale/l10n/sa/entry.desktop \
-	share/locale/l10n/sa/flag.png \
-	share/locale/l10n/sd/entry.desktop \
-	share/locale/l10n/sd/flag.png \
-	share/locale/l10n/se/entry.desktop \
-	share/locale/l10n/se/flag.png \
-	share/locale/l10n/si/entry.desktop \
-	share/locale/l10n/si/flag.png \
-	share/locale/l10n/sk/entry.desktop \
-	share/locale/l10n/sk/flag.png \
-	share/locale/l10n/so/entry.desktop \
-	share/locale/l10n/so/flag.png \
-	share/locale/l10n/southamerica.desktop \
-	share/locale/l10n/southeurope.desktop \
-	share/locale/l10n/sr/entry.desktop \
-	share/locale/l10n/sr/flag.png \
-	share/locale/l10n/sv/entry.desktop \
-	share/locale/l10n/sv/flag.png \
-	share/locale/l10n/sy/entry.desktop \
-	share/locale/l10n/sy/flag.png \
-	share/locale/l10n/th/entry.desktop \
-	share/locale/l10n/th/flag.png \
-	share/locale/l10n/tn/entry.desktop \
-	share/locale/l10n/tn/flag.png \
-	share/locale/l10n/tr/entry.desktop \
-	share/locale/l10n/tr/flag.png \
-	share/locale/l10n/tt/entry.desktop \
-	share/locale/l10n/tt/flag.png \
-	share/locale/l10n/tw/entry.desktop \
-	share/locale/l10n/tw/flag.png \
-	share/locale/l10n/ua/entry.desktop \
-	share/locale/l10n/ua/flag.png \
-	share/locale/l10n/us/entry.desktop \
-	share/locale/l10n/us/flag.png \
-	share/locale/l10n/uy/entry.desktop \
-	share/locale/l10n/uy/flag.png \
-	share/locale/l10n/vc/entry.desktop \
-	share/locale/l10n/vc/flag.png \
-	share/locale/l10n/ve/entry.desktop \
-	share/locale/l10n/ve/flag.png \
-	share/locale/l10n/vn/entry.desktop \
-	share/locale/l10n/vn/flag.png \
-	share/locale/l10n/westeurope.desktop \
-	share/locale/l10n/ye/entry.desktop \
-	share/locale/l10n/ye/flag.png \
-	share/locale/l10n/za/entry.desktop \
-	share/locale/l10n/za/flag.png \
-	share/mimelnk/application/x-konsole.desktop \
-	share/mimelnk/application/x-ksysguard.desktop \
-	share/mimelnk/application/x-ktheme.desktop \
-	share/mimelnk/print/class.desktop \
-	share/mimelnk/print/folder.desktop \
-	share/mimelnk/print/jobs.desktop \
-	share/mimelnk/print/manager.desktop \
-	share/mimelnk/print/printer.desktop \
-	share/services/cgi.protocol \
-	share/services/finger.protocol \
-	share/services/fish.protocol \
-	share/services/floppy.protocol \
-	share/services/gsthumbnail.desktop \
-	share/services/gzip.protocol \
-	share/services/htmlthumbnail.desktop \
-	share/services/imagethumbnail.desktop \
-	share/services/imap4.protocol \
-	share/services/imaps.protocol \
-	share/services/info.protocol \
-	share/services/kaccess.desktop \
-	share/services/kded/favicons.desktop \
-	share/services/kdeprint_part.desktop \
-	share/services/kfindpart.desktop \
-	share/services/khelpcenter.desktop \
-	share/services/kmanpart.desktop \
-	share/services/konq_aboutpage.desktop \
-	share/services/konq_detailedlistview.desktop \
-	share/services/konq_iconview.desktop \
-	share/services/konq_infolistview.desktop \
-	share/services/konq_multicolumnview.desktop \
-	share/services/konq_sidebartng.desktop \
-	share/services/konq_textview.desktop \
-	share/services/konq_treeview.desktop \
-	share/services/konqueror.desktop \
-	share/services/konqueror_config.desktop \
-	share/services/konsolepart.desktop \
-	share/services/kshorturifilter.desktop \
-	share/services/kuriikwsfilter.desktop \
-	share/services/kurisearchfilter.desktop \
-	share/services/kxkb.desktop \
-	share/services/localdomainurifilter.desktop \
-	share/services/mac.protocol \
-	share/services/man.protocol \
-	share/services/nntp.protocol \
-	share/services/picturethumbnail.desktop \
-	share/services/pop3.protocol \
-	share/services/pop3s.protocol \
-	share/services/print.protocol \
-	share/services/searchproviders/acronym.desktop \
-	share/services/searchproviders/alltheweb.desktop \
-	share/services/searchproviders/altavista.desktop \
-	share/services/searchproviders/appsy.desktop \
-	share/services/searchproviders/austronaut.desktop \
-	share/services/searchproviders/bugft.desktop \
-	share/services/searchproviders/bugno.desktop \
-	share/services/searchproviders/call.desktop \
-	share/services/searchproviders/cpan.desktop \
-	share/services/searchproviders/ctan.desktop \
-	share/services/searchproviders/ctan_cat.desktop \
-	share/services/searchproviders/dmoz.desktop \
-	share/services/searchproviders/docbook.desktop \
-	share/services/searchproviders/excite.desktop \
-	share/services/searchproviders/foldoc.desktop \
-	share/services/searchproviders/freshmeat.desktop \
-	share/services/searchproviders/google.desktop \
-	share/services/searchproviders/google_advanced.desktop \
-	share/services/searchproviders/google_groups.desktop \
-	share/services/searchproviders/google_images.desktop \
-	share/services/searchproviders/google_lucky.desktop \
-	share/services/searchproviders/hotbot.desktop \
-	share/services/searchproviders/jeeves.desktop \
-	share/services/searchproviders/leo.desktop \
-	share/services/searchproviders/lycos.desktop \
-	share/services/searchproviders/mamma.desktop \
-	share/services/searchproviders/metacrawler.desktop \
-	share/services/searchproviders/msdn.desktop \
-	share/services/searchproviders/nl-teletekst.desktop \
-	share/services/searchproviders/pgpkeys.desktop \
-	share/services/searchproviders/php.desktop \
-	share/services/searchproviders/python.desktop \
-	share/services/searchproviders/rfc.desktop \
-	share/services/searchproviders/rpmfind.desktop \
-	share/services/searchproviders/ruby_application_archive.desktop \
-	share/services/searchproviders/seek.desktop \
-	share/services/searchproviders/sourceforge.desktop \
-	share/services/searchproviders/tel_at.desktop \
-	share/services/searchproviders/thesaurus.desktop \
-	share/services/searchproviders/vivisimo.desktop \
-	share/services/searchproviders/voila.desktop \
-	share/services/searchproviders/webster.desktop \
-	share/services/searchproviders/whatis.desktop \
-	share/services/sftp.protocol \
-	share/services/smb.protocol \
-	share/services/smtp.protocol \
-	share/services/smtps.protocol \
-	share/services/tar.protocol \
-	share/services/textthumbnail.desktop \
-	share/services/thumbnail.protocol \
-	share/services/useragentstrings/ie401onwinnt4.desktop \
-	share/services/useragentstrings/ie45onwinnt5.desktop \
-	share/services/useragentstrings/ie501onwinnt5.desktop \
-	share/services/useragentstrings/ie50onppc.desktop \
-	share/services/useragentstrings/ie50onwin95.desktop \
-	share/services/useragentstrings/ie55onwin98.desktop \
-	share/services/useragentstrings/ie55onwinnt5.desktop \
-	share/services/useragentstrings/ie60onwinnt51.desktop \
-	share/services/useragentstrings/lynxoncurrent.desktop \
-	share/services/useragentstrings/mozm18oncurrent.desktop \
-	share/services/useragentstrings/mozm18onwinnt4.desktop \
-	share/services/useragentstrings/nn301oncurrent.desktop \
-	share/services/useragentstrings/nn475oncurrent.desktop \
-	share/services/useragentstrings/nn475onwin95.desktop \
-	share/services/useragentstrings/nn476onppc.desktop \
-	share/services/useragentstrings/op403onwinnt4.desktop \
-	share/services/useragentstrings/w3moncurrent.desktop \
-	share/services/useragentstrings/wgetoncurrent.desktop \
-	share/services/zip.protocol \
-	share/servicetypes/findpart.desktop \
-	share/servicetypes/kateplugin.desktop \
-	share/servicetypes/konqaboutpage.desktop \
-	share/servicetypes/konqpopupmenuplugin.desktop \
-	share/servicetypes/searchprovider.desktop \
-	share/servicetypes/thumbcreator.desktop \
-	share/servicetypes/uasprovider.desktop \
-	share/sounds/KDE_Beep_Ahem.wav \
-	share/sounds/KDE_Beep_Beep.wav \
-	share/sounds/KDE_Beep_Bottles.wav \
-	share/sounds/KDE_Beep_ClassicBeep.wav \
-	share/sounds/KDE_Beep_ClockChime.wav \
-	share/sounds/KDE_Beep_Connect.wav \
-	share/sounds/KDE_Beep_Door.wav \
-	share/sounds/KDE_Beep_Honk.wav \
-	share/sounds/KDE_Beep_Lightning.wav \
-	share/sounds/KDE_Beep_Pop.wav \
-	share/sounds/KDE_Beep_RimShot.wav \
-	share/sounds/KDE_Beep_RingRing.wav \
-	share/sounds/KDE_Beep_ShortBeep.wav \
-	share/sounds/KDE_Beep_Yo.wav \
-	share/sounds/KDE_Click.wav \
-	share/sounds/KDE_Close_Window.wav \
-	share/sounds/KDE_Critical_Error.wav \
-	share/sounds/KDE_Desktop1.wav \
-	share/sounds/KDE_Desktop2.wav \
-	share/sounds/KDE_Desktop3.wav \
-	share/sounds/KDE_Desktop4.wav \
-	share/sounds/KDE_Desktop5.wav \
-	share/sounds/KDE_Desktop6.wav \
-	share/sounds/KDE_Desktop7.wav \
-	share/sounds/KDE_Desktop8.wav \
-	share/sounds/KDE_Dialog_Appear.wav \
-	share/sounds/KDE_Dialog_Disappear.wav \
-	share/sounds/KDE_Error.wav \
-	share/sounds/KDE_Logout.wav \
-	share/sounds/KDE_Notify.wav \
-	share/sounds/KDE_Startup.wav \
-	share/sounds/KDE_Window_Close.wav \
-	share/sounds/KDE_Window_DeIconify.wav \
-	share/sounds/KDE_Window_Iconify.wav \
-	share/sounds/KDE_Window_Maximize.wav \
-	share/sounds/KDE_Window_Open.wav \
-	share/sounds/KDE_Window_Shade_Down.wav \
-	share/sounds/KDE_Window_Shade_Up.wav \
-	share/sounds/KDE_Window_Sticky.wav \
-	share/sounds/KDE_Window_UnMaximize.wav \
-	share/sounds/KDE_Window_UnSticky.wav \
-	share/sounds/pop.wav \
-	share/templates/.source/CDROM-Device.desktop \
-	share/templates/.source/Floppy.desktop \
-	share/templates/.source/HD.desktop \
-	share/templates/.source/HTMLFile.html \
-	share/templates/.source/Program.desktop \
-	share/templates/.source/TextFile.txt \
-	share/templates/.source/URL.desktop \
-	share/templates/Directory.desktop \
-	share/templates/HTMLFile.desktop \
-	share/templates/linkCDROM.desktop \
-	share/templates/linkFloppy.desktop \
-	share/templates/linkHD.desktop \
-	share/templates/linkProgram.desktop \
-	share/templates/linkURL.desktop \
-	share/templates/TextFile.desktop \
-	share/wallpapers/Blkmarble.jpg \
-	share/wallpapers/Chicken-Songs-2.jpg \
-	share/wallpapers/Circuit.jpg \
-	share/wallpapers/default_blue.jpg \
-	share/wallpapers/Foggy1.jpg \
-	share/wallpapers/kde_box.png \
-	share/wallpapers/kde_passion.jpg \
-	share/wallpapers/kdm_bg.jpg \
-	share/wallpapers/Marble01.jpg \
-	share/wallpapers/No-Ones-Laughing-3.jpg \
-	share/wallpapers/only_k.jpg \
-	share/wallpapers/Paper01.jpg \
-	share/wallpapers/Planning-And-Probing-1.jpg \
-	share/wallpapers/Time-For-Lunch-2.jpg \
-	share/wallpapers/Totally-New-Product-1.jpg \
-	share/wallpapers/triplegears.jpg \
-	share/wallpapers/Won-Ton-Soup-3.jpg
-	
Index: trunk/dports/x11/kdebase3/files/patch-kdebase-3.0.8-darwin
===================================================================
--- trunk/dports/x11/kdebase3/files/patch-kdebase-3.0.8-darwin	(revision 1899)
+++ 	(revision )
@@ -1,5004 +1,0 @@
-Index: admin/Makefile.common
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/Makefile.common,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
-Index: admin/acinclude.m4.in
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/acinclude.m4.in,v
-retrieving revision 1.1.1.4
-retrieving revision 1.17
-diff -u -u -r1.1.1.4 -r1.17
---- admin/acinclude.m4.in	1 Oct 2002 01:44:25 -0000	1.1.1.4
-+++ admin/acinclude.m4.in	20 Oct 2002 19:53:12 -0000	1.17
-@@ -699,13 +699,10 @@
-      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-    
-    # darwin needs this to initialize the environment
--   AC_CHECK_HEADERS(crt_externs.h)
-+   AC_CHECK_HEADERS([crt_externs.h sys/types.h])
-    AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-  
--   # more headers that need to be explicitly included on darwin
--   AC_CHECK_HEADERS(sys/types.h stdint.h)
--
--   # darwin requires a poll emulation library
-+   # darwin requires a poll.h emulation library
-    AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
- 
-    # CoreAudio framework
-@@ -714,6 +711,12 @@
-      FRAMEWORK_COREAUDIO="-framework CoreAudio"
-    ])
- 
-+   # CoreServices framework
-+   AC_CHECK_HEADER(CoreServices/CoreServices.h, [
-+     AC_DEFINE(HAVE_CORESERVICES, 1, [Define if you have the CoreServices API])
-+     FRAMEWORK_CORESERVICES="-framework CoreServices"
-+   ])
-+
-    # Solaris 2.6 and others need -lresolv for res_init
-    AC_CHECK_FUNCS(res_init, , [
-      kde_libs_safe="$LIBS"
-@@ -732,10 +735,11 @@
-      LIBS=$kde_libs_safe
-    ])
- 
--   AC_SUBST(LIB_POLL)
-    AC_SUBST(FRAMEWORK_COREAUDIO)
-    LIBSOCKET="$X_EXTRA_LIBS"
-    AC_SUBST(LIBSOCKET)
-+   AC_SUBST(FRAMEWORK_CORESERVICES)
-+   AC_SUBST(LIB_POLL)
-    AC_SUBST(LIBRESOLV)
-    AC_SUBST(X_EXTRA_LIBS)
-    AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-@@ -905,7 +909,7 @@
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- 
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
- LIBS="-lXext -lX11 $LIBSOCKET"
- 
- AC_TRY_LINK([
-@@ -947,9 +951,9 @@
- kde_save_LDFLAGS="$LDFLAGS"
- kde_save_CFLAGS="$CFLAGS"
- kde_save_LIBS="$LIBS"
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
- CFLAGS="$CFLAGS -I$x_includes"
--LIBS="-lXinerama -lXext"
-+LIBS="-lXinerama -lXext -lX11"
- 
- if test "x$no_xinerama" = "xno"; then
- 
-@@ -1846,15 +1850,29 @@
-    AC_REQUIRE([K_PATH_X])
- 
- if test $kde_qtver = 3; then
-+   AC_SUBST(LIB_ARTSKDE, "-lartskde")
-+   AC_SUBST(LIB_DCOP, "-lDCOP")
-+   AC_SUBST(LIB_KAB, "-lkab")
-+   AC_SUBST(LIB_KABC, "-lkabc")
-    AC_SUBST(LIB_KDECORE, "-lkdecore")
-+   AC_SUBST(LIB_KDED, "@PREFIX@/lib/kded.la")
-+   AC_SUBST(LIB_KDEFX, "-lkdefx")
-+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+   AC_SUBST(LIB_KDESASL, "-lkdesasl")
-+   AC_SUBST(LIB_KDESU, "-lkdesu")
-    AC_SUBST(LIB_KDEUI, "-lkdeui")
--   AC_SUBST(LIB_KIO, "-lkio")
--   AC_SUBST(LIB_SMB, "-lsmb")
--   AC_SUBST(LIB_KAB, "-lkab")
-    AC_SUBST(LIB_KHTML, "-lkhtml")
--   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KIO, "-lkio")
-    AC_SUBST(LIB_KPARTS, "-lkparts")
--   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+   AC_SUBST(LIB_KJAVA, "-lkjava")
-+   AC_SUBST(LIB_KJS, "-lkjs")
-+   AC_SUBST(LIB_KMID, "-lkmid")
-+   AC_SUBST(LIB_KSCRIPT, "-lkscript")
-+   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KTEXTEDITOR, "-lktexteditor")
-+   AC_SUBST(LIB_SHELLSCRIPT, "-lshellscript")
-+   AC_SUBST(LIB_SMB, "-lsmb")
-+   AC_SUBST(LIB_VCARD, "-lvcard")
- # these are for backward compatibility
-    AC_SUBST(LIB_KSYCOCA, "-lkio")
-    AC_SUBST(LIB_KFILE, "-lkio")
-@@ -2544,10 +2562,10 @@
-       if test $kde_use_debug_code = "full"; then
-         CFLAGS="-g3 $CFLAGS"
-       else
--        CFLAGS="-g -O2 $CFLAGS"
-+        CFLAGS="-g -O $CFLAGS"
-       fi
-     else
--      CFLAGS="-O2 $CFLAGS"
-+      CFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CFLAGS"
-     fi
-   fi
- 
-@@ -2577,7 +2595,7 @@
-         if test "$kde_use_debug_code" = "full"; then
-           CXXFLAGS="-g3 $CXXFLAGS"
-         else
--          CXXFLAGS="-g -O2 $CXXFLAGS"
-+          CXXFLAGS="-g -O $CXXFLAGS"
-         fi
-       fi
-       KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-@@ -2589,7 +2607,7 @@
-       if test "$CXX" = "KCC"; then
-         CXXFLAGS="+K3 $CXXFLAGS"
-       else
--        CXXFLAGS="-O2 $CXXFLAGS"
-+        CXXFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CXXFLAGS"
-       fi  
-     fi
-   fi
-@@ -3058,9 +3076,9 @@
-     ac_save_ldflags="$LDFLAGS"
-     ac_save_cflags="$CFLAGS"
-     if test "x$kde_use_qt_emb" != "xyes"; then
--      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-+      LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-     else
--      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-+      LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-     fi
-     CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-     test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-@@ -4521,6 +4539,83 @@
- 	done
- ])
- 
-+AC_DEFUN(KDE_CHECK_LDAP,
-+[
-+  AC_MSG_CHECKING([for LDAP])
-+
-+  if test -n "$1"; then
-+    ldap_extra_dirs="$1"
-+  fi
-+
-+  ldap_incdirs="$ldap_extra_dirs/include /usr/include /usr/local/include/ $kde_extra_includes"
-+  AC_FIND_FILE(ldap.h, $ldap_incdirs, ldap_incdir)
-+  if test ! -r $ldap_incdir/ldap.h; then
-+    ldap_incdir=no
-+  fi
-+
-+  ldap_libdirs="$ldap_extra_dirs/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-+  for ext in la so sl dylib a; do
-+    AC_FIND_FILE(libldap.$ext, $ldap_libdirs, ldap_libdir_test)
-+    if test -r $ldap_libdir_test/libldap.$ext; then
-+      ldap_libdir=$ldap_libdir_test
-+      break
-+    fi
-+  done
-+  if test -z "$ldap_libdir"; then
-+    ldap_libdir=no
-+  fi
-+  if test x$ldap_libdir != xno && test x$ldap_incdir != xno; then
-+    LDAP_INCS=-I$ldap_incdir
-+    LDAP_LIBS=-L$ldap_libdir
-+    # on MacOSX, we link against the framework instead of
-+    # directly to the libraries, for forward-compatibility
-+    if test -d "/System/Library/Frameworks/LDAP.framework"; then
-+      LIBLDAP="-framework LDAP"
-+    else
-+      LIBLDAP="-lldap -llber -lresolv"
-+    fi
-+    if test "$USE_RPATH" = "yes"; then
-+      LDAP_RPATH="-R $LDAPLIBDIR/lib"
-+    fi
-+
-+    kde_safe_LIBS="$LIBS"
-+    kde_safe_CFLAGS="$CFLAGS"
-+    LIBS="$LIBS $all_libraries $LDAP_LIBS $LIBLDAP $KERBEROS_LIBS $X_EXTRA_LIBS"
-+    CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KERBEROS_INCS"
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    AC_TRY_LINK(
-+      [#include <lber.h>
-+#include <ldap.h>
-+#if LDAP_VENDOR_VERSION < 20000
-+#error OpenLDAP version too old, please upgrade to version 2 or higher
-+#endif
-+],
-+      [ LDAP *ldap; ],
-+      [ ldap_old=no ],
-+      [ ldap_old=yes ]
-+    )
-+    LIBS="$kde_safe_LIBS"
-+    CFLAGS="$kde_safe_CFLAGS"
-+
-+    if test x$ldap_old = xno; then
-+      AC_SUBST(LDAP_INCS)
-+      AC_SUBST(LDAP_LIBS)
-+      AC_SUBST(LDAP_RPATH)
-+      AC_SUBST(LIBLDAP)
-+      AC_DEFINE_UNQUOTED(HAVE_LIBLDAP,1,[Define if you have LDAP libraries])
-+    else
-+      LDAP_INCS=
-+      LDAP_LIBS=
-+      LDAP_RPATH=
-+      LIBLDAP=
-+    fi
-+    AC_MSG_RESULT([libraries $ldap_libdir, headers $ldap_incdir])
-+  else
-+    AC_MSG_RESULT([not found])
-+  fi
-+])
-+
- dnl KDE_CHEC_JAVA_DIR(onlyjre)
- AC_DEFUN(KDE_CHECK_JAVA_DIR,
- [
-@@ -4555,6 +4650,7 @@
-       KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-       KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-       KDE_JAVA_PREFIX(/opt/java*)
-+      KDE_JAVA_PREFIX(/Library/Java/Home)
-     
-       kde_cv_path="NONE"
-       kde_save_IFS=$IFS
-@@ -4606,10 +4702,20 @@
- dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
- if test "x$kde_java_bindir" != "xno"; then
- 
-+  case $host_os in
-+    darwin*)
-+      dnl Look for libjvm.dylib
-+      kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.dylib | sed 's,libjvm.dylib,,'|head -n 1`
-+      kd_java_libhpidir=''
-+      dnl Darwin doesn't have libhpi
-+      ;;
-+    *)
-   dnl Look for libjvm.so
-   kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-   dnl Look for libhpi.so and avoid green threads
--  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-+  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | tail -n 1`
-+      ;;
-+  esac
- 
-   dnl Now check everything's fine under there
-   dnl the include dir is our flag for having the JDK
-@@ -4638,17 +4744,29 @@
-     JAVAC=
-     jni_includes=
-   fi
--
-+  case $host_os in
-+    darwin*)
-+      if test ! -r "$kde_java_libjvmdir/libjvm.dylib"; then
-+        AC_MSG_ERROR([libjvm.dylib not found under $kde_java_libjvmdir. Use --without-java.])
-+      fi
-+      dnl Darwin doesn't have libhpi, but it's not fatal
-+      LIB_JVM="-framework JavaVM"
-+      LIB_HPI=""
-+      ;;
-+    *)
-   if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-      AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-   fi 
-+      LIB_JVM="-L$kde_java_libjvmdir -ljvm"
-+      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-+        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-+      fi
-+      LIB_HPI="-L$kde_java_libhpidir -lhpi"
-+      ;;
-+  esac
- 
-   if test ! -x "$kde_java_bindir/java"; then
-       AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
--  fi
--
--  if test ! -r "$kde_java_libhpidir/libhpi.so"; then
--    AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-   fi
- 
-   if test -n "$jni_includes"; then
-Index: admin/detect-autoconf.sh
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/detect-autoconf.sh,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- admin/detect-autoconf.sh	10 Jul 2002 02:47:38 -0000	1.1.1.1
-+++ admin/detect-autoconf.sh	15 Jul 2002 22:55:00 -0000	1.2
-@@ -42,12 +42,12 @@
- checkAutomakeAclocal ()
- {
-   if test -z "$UNSERMAKE"; then
--    if test -x "`$WHICH automake-1.5`" ; then
--      AUTOMAKE="`$WHICH automake-1.5`"
--      ACLOCAL="`$WHICH aclocal-1.5`"
--    elif test -x "`$WHICH automake-1.6`" ; then
-+    if test -x "`$WHICH automake-1.6`" ; then
-       AUTOMAKE="`$WHICH automake-1.6`"
-       ACLOCAL="`$WHICH aclocal-1.6`"
-+    elif test -x "`$WHICH automake-1.5`" ; then
-+      AUTOMAKE="`$WHICH automake-1.5`"
-+      ACLOCAL="`$WHICH aclocal-1.5`"
-     fi
-   else
-      AUTOMAKE="$UNSERMAKE"
-Index: admin/libtool.m4.in
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/libtool.m4.in,v
-retrieving revision 1.1.1.3
-retrieving revision 1.7
-diff -u -u -r1.1.1.3 -r1.7
---- admin/libtool.m4.in	14 Aug 2002 13:18:45 -0000	1.1.1.3
-+++ admin/libtool.m4.in	16 Sep 2002 14:31:34 -0000	1.7
-@@ -609,6 +609,12 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
-+  darwin*)
-+    # this should be enough... the length test freaks out some versions
-+    # of OSX's `expr`
-+    lt_cv_sys_max_cmd_len=16384;
-+    ;;
-+
-   *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-@@ -1132,7 +1138,7 @@
- darwin* | rhapsody*)
-   dynamic_linker="$host_os dyld"
-   version_type=darwin
--  need_lib_prefix=no
-+  need_lib_prefix=yes
-   need_version=no
-   # FIXME: Relying on posixy $() will cause problems for
-   #        cross-compilation, but unfortunately the echo tests do not
-@@ -1901,16 +1907,7 @@
-   ;;
- 
- darwin* | rhapsody*)
--  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  case "$host_os" in
--  rhapsody* | darwin1.[[012]])
--    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
--    ;;
--  *) # Darwin 1.3 on
--    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
--    ;;
--  esac
-+  lt_cv_deplibs_check_method='pass_all'
-   ;;
- 
- freebsd*)
-@@ -2560,6 +2557,11 @@
- 	;;
-     esac
-     ;;
-+  darwin*)
-+    shared_flag='-dynamiclib'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC -dynamiclib -install_name $rpath/$soname $predep_objects ${lib}-master.o $deplibs $postdep_objects $compiler_flags -o $lib'
-+    output_verbose_link_cmd='$CC -dynamiclib $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-+    ;;
-   dgux*)
-     case $cc_basename in
-       ec++)
-@@ -4750,7 +4752,9 @@
- 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+	#_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+        # testing with twolevel namespaces
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- 	;;
-       esac
- 
-@@ -4758,7 +4762,7 @@
-       #        cross-compilation, but unfortunately the echo tests do not
-       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-       #	       `"' quotes if we put them in here... so don't!
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags $(test x$module != xyes && echo -install_name $rpath/$soname $verstring)'
-       # We need to add '_' to the symbols in $export_symbols first
-       #_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' && strip -s $export_symbols'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-Index: admin/ltmain.sh
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/ltmain.sh,v
-retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -u -r1.1.1.2 -r1.4
---- admin/ltmain.sh	10 Jul 2002 02:47:39 -0000	1.1.1.2
-+++ admin/ltmain.sh	13 Jul 2002 04:33:25 -0000	1.4
-@@ -3321,7 +3321,23 @@
- 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- 	  eval cmds=\"$archive_expsym_cmds\"
- 	else
-+          if test "x$verstring" = "x0.0"; then
-+                tmp_verstring=
-+          else
-+                tmp_verstring="$verstring"
-+          fi
-+ 	  save_deplibs="$deplibs"
-+ 	  for conv in $convenience; do
-+            tmp_deplibs=
-+            for test_deplib in $deplibs; do
-+              if test "$test_deplib" != "$conv"; then
-+                tmp_deplibs="$tmp_deplibs $test_deplib"
-+              fi
-+            done
-+            deplibs="$tmp_deplibs"
-+ 	  done
- 	  eval cmds=\"$archive_cmds\"
-+ 	  deplibs="$save_deplibs"
- 	fi
- 
- 	if len=`expr "X$cmds" : ".*"` &&
-@@ -3419,7 +3435,12 @@
- 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- 	    eval cmds=\"$archive_expsym_cmds\"
- 	  else
--	    eval cmds=\"$archive_cmds\"
-+            save_deplibs="$deplibs"
-+            for conv in $convenience; do
-+              deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
-+            done
-+            eval cmds=\"$archive_cmds\"
-+            deplibs="$save_deplibs"
- 	  fi
- 
- 	  # Append the command to remove the reloadable object files
-@@ -3632,6 +3653,14 @@
- 	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- 	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- 	;;
-+      esac
-+
-+      case $host in
-+      *darwin*)
-+        # Don't allow lazy linking, it breaks C++ global constructors
-+        compile_command="$compile_command ${wl}-bind_at_load"
-+        finalize_command="$finalize_command ${wl}-bind_at_load"
-+        ;;
-       esac
- 
-       compile_command="$compile_command $compile_deplibs"
-Index: admin/missing
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/admin/missing,v
-retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -u -r1.1.1.2 -r1.4
-Index: startkde
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/startkde,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- startkde	1 Oct 2002 02:32:40 -0000	1.1.1.4
-+++ startkde	1 Oct 2002 03:01:44 -0000	1.5
-@@ -30,6 +30,9 @@
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
- 
-+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-+unset DYLD_FORCE_FLAT_NAMESPACE
-+
- test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
- xsetroot -cursor_name left_ptr $bkg
- 
-@@ -134,7 +137,11 @@
- fi
- 
- # the splashscreen and progress indicator
--ksplash
-+if [ -x "@PREFIX@/bin/ksplashml" ]; then
-+	ksplashml
-+else
-+	ksplash
-+fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
-Index: debian/konsole.links
-===================================================================
-RCS file: debian/konsole.links
-diff -N debian/konsole.links
-Index: doc/kaddressbook/index.cache.bz2
-===================================================================
-RCS file: doc/kaddressbook/index.cache.bz2
-diff -N doc/kaddressbook/index.cache.bz2
-Binary files /dev/null and /tmp/cvs029260 differ
-Index: kate/app/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kate/app/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.6
-diff -u -u -r1.1.1.3 -r1.6
---- kate/app/Makefile.am	14 Aug 2002 14:26:29 -0000	1.1.1.3
-+++ kate/app/Makefile.am	15 Aug 2002 15:26:45 -0000	1.6
-@@ -7,17 +7,18 @@
- 	kateviewmanager.cpp kateviewspace.cpp katemain.cpp \
- 	kateIface.skel kategrepdialog.cpp katefiledialog.cpp katemailfilesdialog.cpp \
-         kbookmarkhandler.cpp kactionselector.cpp katedockcontainer.cpp
--
--libkateinterfaces_la_LIBADD   = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la
-+libkateinterfaces_la_LIBADD   = $(top_builddir)/kate/interfaces/libkateinterfacesprivate.la -lkscript $(top_builddir)/kate/lib/libkmultitabbar.la
- libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
- 
- kate_la_SOURCES = dummy_kate_la.cpp
--kate_la_LIBADD = libkateinterfaces.la
--kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version 
-+kate_la_LIBADD   = libkateinterfaces.la -lkscript $(LIB_DCOP) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
-+	$(LIB_KPARTS) $(LIB_KIO) $(top_builddir)/kate/lib/libkmultitabbar.la
-+kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version $(QT_LDFLAGS)
- 
- kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp
--kwrite_la_LIBADD   = -lktexteditor
--kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-+kwrite_la_LIBADD  = libkateinterfaces.la $(LIB_DCOP) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
-+	$(LIB_KPARTS) $(LIB_KIO) -lktexteditor
-+kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version $(QT_LDFLAGS)
- 
- kate_SOURCES = dummy_kate.cpp
- kate_LDADD = kate.la
-Index: kate/interfaces/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kate/interfaces/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.5
-diff -u -u -r1.1.1.3 -r1.5
---- kate/interfaces/Makefile.am	14 Aug 2002 14:26:30 -0000	1.1.1.3
-+++ kate/interfaces/Makefile.am	14 Aug 2002 15:35:40 -0000	1.5
-@@ -2,11 +2,12 @@
- 
- noinst_LTLIBRARIES = libkateinterfacesprivate.la
- 
--libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentmanager.cpp viewmanager.cpp toolviewmanager.cpp \
--                                                           pluginmanager.cpp plugin.cpp \
--                                                           pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
--libkateinterfacesprivate_la_LIBADD   = -lkatepartinterfaces
--libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentmanager.cpp viewmanager.cpp \
-+	toolviewmanager.cpp pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp \
-+	pluginconfiginterfaceextension.cpp
-+libkateinterfacesprivate_la_LIBADD   = -lkatepartinterfaces $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) $(LIB_DCOP) $(LIB_KPARTS)
-+
-+libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(QT_LDFLAGS)
- 
- kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
- kateincludedir = $(includedir)/kate
-Index: kcontrol/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
-Index: kcontrol/access/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/access/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/access/Makefile.am	1 Oct 2002 02:33:58 -0000	1.1.1.3
-+++ kcontrol/access/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -12,12 +12,12 @@
- lib_LTLIBRARIES = kaccess.la
- 
- kaccess_la_SOURCES = kaccess.cpp main.cpp
--kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kaccess_la_LIBADD = $(LIB_KDEUI)
-+kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
-+kaccess_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
- 
- kcm_access_la_SOURCES = kcmaccess.cpp 
--kcm_access_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_access_la_LIBADD = $(LIB_KIO)
-+kcm_access_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_access_la_LIBADD = $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- 
- noinst_HEADERS = kcmaccess.h
- 
-Index: kcontrol/arts/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/arts/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/arts/Makefile.am	1 Oct 2002 02:33:59 -0000	1.1.1.3
-+++ kcontrol/arts/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -2,8 +2,8 @@
- 
- kcm_arts_la_SOURCES = arts.cpp midi.cpp arts_general.ui arts_soundio.ui
- 
--kcm_arts_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_arts_la_LIBADD = -lkio -lkmid
-+kcm_arts_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_arts_la_LIBADD = -lkio -lkmid $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES = -I$(kde_includes)/arts  $(all_includes)
- 
-Index: kcontrol/background/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/background/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/background/Makefile.am	1 Oct 2002 02:34:00 -0000	1.1.1.3
-+++ kcontrol/background/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -6,10 +6,11 @@
- 
- kde_module_LTLIBRARIES = kcm_background.la
- 
--kcm_background_la_SOURCES = bgdialogs.cpp backgnd.cpp main.cpp backgndbase.ui \
--                            bgadvanced.ui advancedDialog.cpp
--kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
--kcm_background_la_LIBADD = libbgnd.la $(LIB_KIO)
-+kcm_background_la_SOURCES = backgnd.cpp bgdialogs.cpp main.cpp backgndbase.ui \
-+			    bgadvanced.ui advancedDialog.cpp
-+kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_background_la_LIBADD = $(LIB_KIO) libbgnd.la $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
-+	$(LIB_DCOP) $(LIB_KDEFX)
- 
- METASOURCES = AUTO
- 
-Index: kcontrol/bell/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/bell/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/bell/Makefile.am	25 Jun 2002 02:03:44 -0000	1.1.1.1
-+++ kcontrol/bell/Makefile.am	25 Jun 2002 02:06:13 -0000	1.2
-@@ -3,7 +3,7 @@
- kcm_bell_la_SOURCES = bell.cpp
- 
- kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_bell_la_LIBADD = -lkdeui
-+kcm_bell_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/clock/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/clock/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/clock/Makefile.am	25 Jun 2002 02:03:44 -0000	1.1.1.1
-+++ kcontrol/clock/Makefile.am	25 Jun 2002 02:06:13 -0000	1.2
-@@ -2,8 +2,8 @@
- 
- kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp 
- 
--kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_clock_la_LIBADD = -lkdeui
-+kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_clock_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
- 
- INCLUDES= $(all_includes)
-  
-Index: kcontrol/colors/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/colors/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/colors/Makefile.am	14 Aug 2002 14:29:16 -0000	1.1.1.2
-+++ kcontrol/colors/Makefile.am	14 Aug 2002 15:35:41 -0000	1.3
-@@ -5,8 +5,9 @@
- kde_module_LTLIBRARIES = kcm_colors.la
- 
- kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
--kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
--kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
-+kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_X11) $(LIB_QT) \
-+	$(LIB_KDECORE) $(LIB_KDEFX) $(LIB_KIO)
- kcm_colors_la_METASOURCES = colorscm.moc widgetcanvas.moc
- 
- noinst_HEADERS = colorscm.h widgetcanvas.h
-Index: kcontrol/crypto/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/crypto/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/crypto/Makefile.am	1 Oct 2002 02:34:03 -0000	1.1.1.3
-+++ kcontrol/crypto/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -3,8 +3,8 @@
- 
- kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
- 
--kcm_crypto_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
--kcm_crypto_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSSL)
-+kcm_crypto_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_crypto_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBSSL) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- kcm_crypto_la_METASOURCES = AUTO
- 
-Index: kcontrol/css/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/css/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/css/Makefile.am	1 Oct 2002 02:34:03 -0000	1.1.1.3
-+++ kcontrol/css/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -5,8 +5,8 @@
- 
- kde_module_LTLIBRARIES = kcm_css.la
- kcm_css_la_SOURCES = template.cpp cssconfig.ui kcmcss.cpp preview.ui
--kcm_css_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_css_la_LIBADD = -lkdeui $(LIB_KIO)
-+kcm_css_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_css_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- kcm_css_la_METASOURCES = AUTO
-  
-Index: kcontrol/ebrowsing/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/ebrowsing/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/ebrowsing/Makefile.am	1 Oct 2002 02:34:03 -0000	1.1.1.2
-+++ kcontrol/ebrowsing/Makefile.am	1 Oct 2002 03:01:45 -0000	1.3
-@@ -10,8 +10,8 @@
- 
- kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
- 
--kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
-+kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- # Don't link this lib to the plugins. They are dlopened and linking to them
- # results in crashes when closing kcmshell.
- # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
-Index: kcontrol/ebrowsing/plugins/ikws/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/ebrowsing/plugins/ikws/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/ebrowsing/plugins/ikws/Makefile.am	10 Jul 2002 03:17:39 -0000	1.1.1.2
-+++ kcontrol/ebrowsing/plugins/ikws/Makefile.am	10 Jul 2002 03:42:56 -0000	1.3
-@@ -7,10 +7,10 @@
- kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la
- 
- libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
-+libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
- 
- libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
-+libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
- 
- libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel kuriikwsfilter.cpp searchprovider.cpp
- libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp searchprovider.cpp
-Index: kcontrol/ebrowsing/plugins/shorturi/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/ebrowsing/plugins/shorturi/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/ebrowsing/plugins/shorturi/Makefile.am	25 Jun 2002 02:03:44 -0000	1.1.1.1
-+++ kcontrol/ebrowsing/plugins/shorturi/Makefile.am	25 Jun 2002 02:06:13 -0000	1.2
-@@ -7,8 +7,8 @@
- 
- kde_module_LTLIBRARIES = libkshorturifilter.la
- 
--libkshorturifilter_la_LDFLAGS = -module $(KDE_PLUGIN)
--libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
-+libkshorturifilter_la_LDFLAGS = -module $(KDE_PLUGIN) $(QT_LDFLAGS)
-+libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
- 
- libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel
- 
-Index: kcontrol/email/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/email/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/email/Makefile.am	1 Oct 2002 02:34:05 -0000	1.1.1.3
-+++ kcontrol/email/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -3,8 +3,8 @@
- kde_module_LTLIBRARIES = kcm_email.la
- 
- kcm_email_la_SOURCES = emailbase.ui email.cpp
--kcm_email_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_email_la_LIBADD = -lkdeui $(LIB_KIO)
-+kcm_email_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_email_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- INCLUDES= $(all_includes) 
- 
- kcm_email_la_METASOURCES = AUTO
-Index: kcontrol/energy/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/energy/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/energy/Makefile.am	1 Oct 2002 02:34:05 -0000	1.1.1.4
-+++ kcontrol/energy/Makefile.am	1 Oct 2002 03:01:45 -0000	1.5
-@@ -7,8 +7,8 @@
- kde_module_LTLIBRARIES = kcm_energy.la
- 
- kcm_energy_la_SOURCES = energy.cpp
--kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
--kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_KDEUI) $(LIB_KIO)
-+kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- kcm_energy_la_METASOURCES = energy.moc
- 
- noinst_HEADERS = energy.h
-Index: kcontrol/filetypes/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/filetypes/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/filetypes/Makefile.am	1 Oct 2002 02:34:06 -0000	1.1.1.3
-+++ kcontrol/filetypes/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -1,7 +1,7 @@
- INCLUDES= $(all_includes)
- 
--kcm_filetypes_la_LIBADD	= libfiletypes.la $(LIB_KIO)
--kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-+kcm_filetypes_la_LIBADD	= libfiletypes.la $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
-+kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(QT_LDFLAGS)
- kcm_filetypes_la_METASOURCES = AUTO
- 
- kde_module_LTLIBRARIES = kcm_filetypes.la
-Index: kcontrol/fonts/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/fonts/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/fonts/Makefile.am	1 Oct 2002 02:34:06 -0000	1.1.1.3
-+++ kcontrol/fonts/Makefile.am	1 Oct 2002 03:01:45 -0000	1.4
-@@ -5,8 +5,8 @@
- kde_module_LTLIBRARIES = kcm_fonts.la
- 
- kcm_fonts_la_SOURCES = fonts.cpp kxftconfig.cpp
--kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined
--kcm_fonts_la_LIBADD = $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS)
-+kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_fonts_la_LIBADD = $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- kcm_fonts_la_METASOURCES = fonts.moc
- 
- noinst_HEADERS = fonts.h kxftconfig.h
-Index: kcontrol/icons/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/icons/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/icons/Makefile.am	14 Aug 2002 14:28:29 -0000	1.1.1.3
-+++ kcontrol/icons/Makefile.am	14 Aug 2002 15:35:41 -0000	1.4
-@@ -5,8 +5,8 @@
- kde_module_LTLIBRARIES = kcm_icons.la
- 
- kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp
--kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
--kcm_icons_la_LIBADD = $(LIB_KIO)
-+kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_icons_la_LIBADD = $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- kcm_icons_la_METASOURCES = icons.moc iconthemes.moc main.moc
- 
- 
-Index: kcontrol/info/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/info/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/info/Makefile.am	25 Jun 2002 02:03:45 -0000	1.1.1.1
-+++ kcontrol/info/Makefile.am	25 Jun 2002 02:06:13 -0000	1.2
-@@ -2,8 +2,8 @@
- 
- kcm_info_la_SOURCES = main.cpp memory.cpp
- 
--kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO)
-+kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS) $(FRAMEWORK_COREAUDIO)
-+kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
-  
-Index: kcontrol/info/info.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/info/info.cpp,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/info/info.cpp	10 Jul 2002 03:17:53 -0000	1.1.1.2
-+++ kcontrol/info/info.cpp	10 Jul 2002 03:42:56 -0000	1.3
-@@ -471,6 +471,8 @@
- #include "info_svr4.cpp"
- #elif _AIX
- #include "info_aix.cpp"
-+#elif defined(__APPLE__)
-+#include "info_osx.cpp"
- #else
- #include "info_generic.cpp"	/* Default for unsupportet systems.... */
- #endif
-Index: kcontrol/info/info_osx.cpp
-===================================================================
-RCS file: kcontrol/info/info_osx.cpp
-diff -N kcontrol/info/info_osx.cpp
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ kcontrol/info/info_osx.cpp	25 Jun 2002 02:06:13 -0000	1.1
-@@ -0,0 +1,163 @@
-+/*
-+ * kdebase3-3.0.1-3.patch,v 1.2 2002/06/24 01:48:12 ranger Exp
-+ *
-+ * info_fbsd.cpp is part of the KDE program kcminfo.  This displays
-+ * various information about the system (hopefully a FreeBSD system)
-+ * it's running on.
-+ */
-+
-+#define INFO_CPU_AVAILABLE
-+//#define INFO_IRQ_AVAILABLE
-+//#define INFO_DMA_AVAILABLE
-+//#define INFO_PCI_AVAILABLE
-+//#define INFO_IOPORTS_AVAILABLE
-+#define INFO_SOUND_AVAILABLE
-+#define INFO_DEVICES_AVAILABLE
-+#define INFO_SCSI_AVAILABLE
-+#define INFO_PARTITIONS_AVAILABLE
-+#define INFO_XSERVER_AVAILABLE
-+
-+/*
-+ * all following functions should return TRUE, when the Information
-+ * was filled into the lBox-Widget. Returning FALSE indicates that
-+ * information was not available.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+
-+#include <fstab.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <iostream.h>
-+
-+#include <qdict.h>
-+#include <qfile.h>
-+#include <qfontmetrics.h>
-+#include <qptrlist.h>
-+#include <qstring.h>
-+#include <qtextstream.h>
-+
-+#include <kdebug.h>
-+
-+#include <mach/mach.h>
-+#include <mach-o/arch.h>
-+
-+#ifdef HAVE_COREAUDIO
-+#include <CoreAudio/CoreAudio.h>
-+#endif
-+
-+#include <machine/limits.h>
-+
-+bool GetInfo_CPU (QListView *lBox)
-+{
-+
-+	QString cpustring;
-+
-+        kern_return_t ret;
-+        struct host_basic_info basic_info;
-+        unsigned int count=HOST_BASIC_INFO_COUNT;
-+
-+        ret=host_info(mach_host_self(), HOST_BASIC_INFO, 
-+                (host_info_t)&basic_info, &count);
-+        if (ret != KERN_SUCCESS) {
-+		kdDebug() << "unable to get host information from mach" << endl;
-+		return false;
-+        } else {
-+		kdDebug() << "got Host Info: (" << basic_info.avail_cpus << ") CPUs available" << endl;
-+        	const NXArchInfo *archinfo;
-+        	archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type, basic_info.cpu_subtype);
-+		new QListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus));
-+		for (int i = 1; i <= basic_info.avail_cpus; i++) {
-+			cpustring = i18n("CPU %1: %2").arg(i).arg(archinfo->description);
-+			new QListViewItem(lBox, cpustring);
-+		}
-+		return true;
-+	}
-+	return false;
-+}
-+
-+bool GetInfo_IRQ (QListView *)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_DMA (QListView *)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_PCI (QListView *)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_IO_Ports (QListView *)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_Sound (QListView *lBox)
-+{
-+#ifdef HAVE_COREAUDIO
-+#define kMaxStringSize 1024
-+	OSStatus status;
-+	AudioDeviceID gOutputDeviceID;
-+	unsigned long propertySize;
-+	char deviceName[kMaxStringSize];
-+	char manufacturer[kMaxStringSize];
-+	propertySize = sizeof(gOutputDeviceID);
-+	status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &gOutputDeviceID);
-+	if (status) {
-+		kdDebug() << "get default output device failed, status = " << (int)status << endl;
-+		return false;
-+	}
-+
-+	if (gOutputDeviceID != kAudioDeviceUnknown) {
-+
-+		propertySize = kMaxStringSize;
-+
-+		/* Device Name */
-+		status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceName, &propertySize, deviceName);
-+		if (status) {
-+			kdDebug() << "get device name failed, status = " << (int)status << endl;
-+			return false;
-+		}
-+		new QListViewItem(lBox, i18n("Device Name: %1").arg(deviceName));
-+
-+		/* Manufacturer */
-+		status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer);
-+		if (status) {
-+			kdDebug() << "get manufacturer failed, status = " << (int)status << endl;
-+			return false;
-+		}
-+		new QListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer));
-+		return true;
-+	} else {
-+		return false;
-+	}
-+#else
-+	return false;
-+#endif
-+}
-+
-+bool GetInfo_SCSI (QListView *lbox)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_Partitions (QListView *lbox)
-+{
-+	return false;
-+}
-+
-+bool GetInfo_XServer_and_Video (QListView *lBox)
-+{
-+	return GetInfo_XServer_Generic( lBox );
-+}
-+
-+bool GetInfo_Devices (QListView *lbox)
-+{
-+	return false;
-+}
-Index: kcontrol/info/memory.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/info/memory.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/info/memory.cpp	1 Oct 2002 02:34:08 -0000	1.1.1.4
-+++ kcontrol/info/memory.cpp	1 Oct 2002 03:01:46 -0000	1.5
-@@ -431,6 +431,8 @@
- 
- #ifdef __linux__
- #include "memory_linux.cpp"
-+#elif defined(__APPLE__)
-+#include "memory_osx.cpp"
- #elif sgi
- #include "memory_sgi.cpp"
- #elif defined(__svr4__) && defined(sun)
-Index: kcontrol/info/memory_osx.cpp
-===================================================================
-RCS file: kcontrol/info/memory_osx.cpp
-diff -N kcontrol/info/memory_osx.cpp
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ kcontrol/info/memory_osx.cpp	25 Jun 2002 02:06:13 -0000	1.1
-@@ -0,0 +1,72 @@
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <qfile.h>
-+#include <mach/mach_init.h>
-+#include <mach/mach_host.h>
-+#include <mach/host_info.h>
-+#include <sys/stat.h>
-+#include <dirent.h>
-+#include <kdebug.h>
-+
-+void KMemoryWidget::update()
-+{
-+
-+	vm_statistics_data_t vm_info;
-+	mach_msg_type_number_t info_count;
-+	DIR *dirp;
-+	struct dirent *dp;
-+	off_t total;
-+
-+	info_count = HOST_VM_INFO_COUNT;
-+	if (host_statistics(mach_host_self (), HOST_VM_INFO, (host_info_t)&vm_info, &info_count)) {
-+		kdDebug() << "could not get memory statistics" << endl;
-+		return;
-+	}
-+
-+	Memory_Info[TOTAL_MEM]    = (vm_info.active_count + vm_info.inactive_count +
-+		vm_info.free_count + vm_info.wire_count) * vm_page_size;
-+	Memory_Info[FREE_MEM]     = vm_info.free_count * vm_page_size;
-+	Memory_Info[SHARED_MEM]   = NO_MEMORY_INFO;
-+	Memory_Info[BUFFER_MEM]   = NO_MEMORY_INFO;
-+	Memory_Info[CACHED_MEM]   = NO_MEMORY_INFO;
-+
-+	dirp = opendir("/private/var/vm");
-+	if (!dirp) {
-+		kdDebug() << "unable to open /private/var/vm" << endl;
-+		return;
-+	}
-+
-+	total = 0;
-+
-+	while ((dp = readdir (dirp)) != NULL) {
-+		struct stat sb;
-+		char fname [MAXNAMLEN];
-+
-+		if (strncmp (dp->d_name, "swapfile", 8))
-+			continue;
-+
-+		strcpy (fname, "/private/var/vm/");
-+		strcat (fname, dp->d_name);
-+		if (stat (fname, &sb) < 0)
-+			continue;
-+
-+		total += sb.st_size;
-+	}
-+	closedir (dirp);
-+
-+	info_count = HOST_VM_INFO_COUNT;
-+	if (host_statistics (mach_host_self (), HOST_VM_INFO,
-+		(host_info_t) &vm_info, &info_count)) {
-+			kdDebug() << "unable to get VM info" << endl;
-+	}
-+
-+	Memory_Info[SWAP_MEM]     = total;
-+	// off_t used = (vm_info.pageouts - vm_info.pageins) * vm_page_size;
-+	Memory_Info[FREESWAP_MEM] = NO_MEMORY_INFO;
-+
-+	/* free = vm_info.free_count * vm_page_size;
-+	   used = vm_info.active_count * vm_page_size;
-+	   total = (vm_info.active_count + vm_info.inactive_count +
-+		vm_info.free_count + vm_info.wire_count) * vm_page_size; */
-+
-+}
-Index: kcontrol/input/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/input/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/input/Makefile.am	10 Jul 2002 03:17:57 -0000	1.1.1.2
-+++ kcontrol/input/Makefile.am	10 Jul 2002 03:42:56 -0000	1.3
-@@ -4,8 +4,8 @@
- 
- kcm_input_la_SOURCES = main.cpp mouse.cpp kmousedlg.ui
- 
--kcm_input_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_input_la_LIBADD = $(XTESTLIB) $(LIB_KIO) $(LIB_KDEUI)
-+kcm_input_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_input_la_LIBADD = $(XTESTLIB) $(LIB_KIO) $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/ioslaveinfo/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/ioslaveinfo/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/ioslaveinfo/Makefile.am	10 Jul 2002 03:17:59 -0000	1.1.1.2
-+++ kcontrol/ioslaveinfo/Makefile.am	10 Jul 2002 03:42:56 -0000	1.3
-@@ -2,8 +2,8 @@
- 
- kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
- 
--kcm_ioslaveinfo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_ioslaveinfo_la_LIBADD = -lkdeui $(LIB_KIO)
-+kcm_ioslaveinfo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_ioslaveinfo_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/kcontrol/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kcontrol/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/kcontrol/Makefile.am	1 Oct 2002 02:34:11 -0000	1.1.1.4
-+++ kcontrol/kcontrol/Makefile.am	1 Oct 2002 03:01:46 -0000	1.5
-@@ -33,19 +33,19 @@
- 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
- 	kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel
- 
--kcontrol_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
--kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kcontrol_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEFX) $(LIB_DCOP)
-+kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
- 
- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
- 			proxywidget.cpp kcdialog.cpp global.cpp \
- 			kcdialog.skel
--kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
--kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_DCOP) $(LIB_KDECORE) $(LIB_QT)
-+kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
- 
- 
- kcminit_la_SOURCES = kcminit.cpp global.cpp
--kcminit_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
--kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kcminit_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
-+kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
- 
- kcontrol_SOURCES = dummy.cpp
- kcontrol_LDADD = kcontrol.la
-Index: kcontrol/kdm/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kdm/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- kcontrol/kdm/Makefile.am	14 Aug 2002 14:28:12 -0000	1.1.1.2
-+++ kcontrol/kdm/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -4,8 +4,9 @@
- 	kdropsite.cpp backgnd.cpp kdm-users.cpp kdm-conv.cpp \
- 	klanguagebutton.cpp main.cpp bgdialogs.cpp
- 
--kcm_kdm_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
--kcm_kdm_la_LIBADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
-+kcm_kdm_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_kdm_la_LIBADD = $(LIB_KIO) $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) \
-+	$(LIB_KDEUI) $(LIB_KDEFX)
- 
- INCLUDES= -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/kdesktop $(all_includes)
- 
-Index: kcontrol/keys/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/keys/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/keys/Makefile.am	1 Oct 2002 02:34:16 -0000	1.1.1.3
-+++ kcontrol/keys/Makefile.am	1 Oct 2002 03:01:46 -0000	1.4
-@@ -1,8 +1,8 @@
- kde_module_LTLIBRARIES = kcm_keys.la
- 
- kcm_keys_la_SOURCES =  shortcuts.cpp modifiers.cpp main.cpp
--kcm_keys_la_LIBADD   = -lkdeui
--kcm_keys_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_keys_la_LIBADD   = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
-+kcm_keys_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/kfontinst/kfile-plugin/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kfontinst/kfile-plugin/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/kfontinst/kfile-plugin/Makefile.am	1 Oct 2002 02:34:17 -0000	1.1.1.2
-+++ kcontrol/kfontinst/kfile-plugin/Makefile.am	1 Oct 2002 03:01:46 -0000	1.3
-@@ -2,7 +2,7 @@
- 
- kfile_font_la_SOURCES = kfile_font.cpp
- kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
--kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS)
-+kfile_font_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KIO) $(LIBFREETYPE_LIBS)
- 
- kdelnkdir = $(kde_servicesdir)
- kde_services_DATA = kfile_font.desktop
-Index: kcontrol/kfontinst/kfontinst/FontEngine.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kfontinst/kfontinst/FontEngine.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/kfontinst/kfontinst/FontEngine.cpp	1 Oct 2002 02:34:18 -0000	1.1.1.4
-+++ kcontrol/kfontinst/kfontinst/FontEngine.cpp	1 Oct 2002 03:01:46 -0000	1.5
-@@ -26,6 +26,8 @@
- // (C) Craig Drummond, 2001
- ////////////////////////////////////////////////////////////////////////////////
- 
-+#include "config.h"
-+
- #include "FontEngine.h"
- #if !defined KFI_THUMBNAIL && !defined KFI_METAINFO
- #include "KfiGlobal.h"
-Index: kcontrol/kfontinst/kfontinst/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kfontinst/kfontinst/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
-Index: kcontrol/kicker/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kicker/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/kicker/Makefile.am	1 Oct 2002 02:34:21 -0000	1.1.1.4
-+++ kcontrol/kicker/Makefile.am	1 Oct 2002 03:01:46 -0000	1.5
-@@ -5,8 +5,9 @@
- 			menutab_impl.cpp extensionInfo.cpp main.cpp \
-                         lookandfeeltab_kcm.cpp advancedOptions.ui advancedDialog.cpp
- 
--kcm_kicker_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_kicker_la_LIBADD =  ../background/libbgnd.la $(LIB_KIO)
-+kcm_kicker_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_kicker_la_LIBADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KSYCOCA) \
-+	$(LIB_KFILE) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_DCOP)
- INCLUDES= -I$(srcdir)/../background $(all_includes)
- 
- kcm_kicker_la_METASOURCES = AUTO
-Index: kcontrol/kio/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/kio/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/kio/Makefile.am	1 Oct 2002 02:34:23 -0000	1.1.1.4
-+++ kcontrol/kio/Makefile.am	1 Oct 2002 03:01:46 -0000	1.5
-@@ -14,8 +14,8 @@
-       uagentproviderdlg.cpp netpref.cpp cache.cpp ksaveioconfig.cpp \
-       socks.cpp socksbase.ui
- 
--kcm_kio_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KIO)
-+kcm_kio_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_DCOP)
- 
- messages: rc.cpp
- 	$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
-Index: kcontrol/knotify/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/knotify/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/knotify/Makefile.am	1 Oct 2002 02:34:24 -0000	1.1.1.4
-+++ kcontrol/knotify/Makefile.am	1 Oct 2002 03:01:46 -0000	1.5
-@@ -4,8 +4,8 @@
- 
- kcm_knotify_la_SOURCES = knotify.cpp
- 
--kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_knotify_la_LIBADD = $(LIB_KIO)
-+kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_knotify_la_LIBADD = $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_DCOP)
- INCLUDES= $(all_includes)
-  
- kcm_knotify_la_METASOURCES = AUTO
-Index: kcontrol/konq/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/konq/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- kcontrol/konq/Makefile.am	1 Oct 2002 02:35:03 -0000	1.1.1.4
-+++ kcontrol/konq/Makefile.am	1 Oct 2002 03:01:46 -0000	1.5
-@@ -9,8 +9,8 @@
- 		fontopts.cpp previews.cpp browser.cpp \
- 		desktop.cpp uiserver.stub main.cpp
- 
--kcm_konq_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA)
-+kcm_konq_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
- 
- kcm_konq_la_DATA = overlapping.png onlyone.png
- kcm_konq_ladir = $(kde_datadir)/kcontrol/pics
-Index: kcontrol/konqhtml/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/konqhtml/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/konqhtml/Makefile.am	1 Oct 2002 02:35:05 -0000	1.1.1.3
-+++ kcontrol/konqhtml/Makefile.am	1 Oct 2002 03:01:47 -0000	1.4
-@@ -9,8 +9,8 @@
- 			     javaopts.cpp pluginopts.cpp appearance.cpp \
- 			     khttpoptdlg.cpp policydlg.cpp main.cpp nsconfigwidget.ui
- 
--kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
-+kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_konqhtml_la_LIBADD = $(LIB_KHTML) $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP) $(LIB_KIO)
- 
- data_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_plugins.desktop
- datadir = $(kde_appsdir)/Settings/Network/WebBrowsing
-Index: kcontrol/konsole/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/konsole/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/konsole/Makefile.am	1 Oct 2002 02:35:06 -0000	1.1.1.3
-+++ kcontrol/konsole/Makefile.am	1 Oct 2002 03:01:47 -0000	1.4
-@@ -5,8 +5,8 @@
- kcm_konsole_la_SOURCES =  schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
- 	schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
- 
--kcm_konsole_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_konsole_la_LIBADD = -lkdeui $(LIB_KIO)
-+kcm_konsole_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP) $(LIB_KDEFX)
- INCLUDES= $(all_includes) 
- 
- kcm_konsole_la_METASOURCES = AUTO
-Index: kcontrol/krdb/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/krdb/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/krdb/Makefile.am	10 Jul 2002 03:19:14 -0000	1.1.1.2
-+++ kcontrol/krdb/Makefile.am	10 Jul 2002 03:42:58 -0000	1.3
-@@ -7,8 +7,8 @@
- 
- noinst_LTLIBRARIES = libkrdb.la
- libkrdb_la_SOURCES = krdb.cpp
--libkrdb_la_LIBADD = $(LIB_KDECORE)
--libkrdb_la_LDFLAGS = -no-undefined $(all_libraries) 
-+libkrdb_la_LIBADD = $(LIB_KDECORE) $(LIB_X11) $(LIB_QT)
-+libkrdb_la_LDFLAGS = -no-undefined $(all_libraries) $(QT_LDFLAGS)
- 
- messages:
- 	$(XGETTEXT) *.cpp -o $(podir)/krdb.pot
-Index: kcontrol/launch/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/launch/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/launch/Makefile.am	25 Jun 2002 02:03:47 -0000	1.1.1.1
-+++ kcontrol/launch/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -2,8 +2,8 @@
- kde_module_LTLIBRARIES        = kcm_launch.la
- INCLUDES                      = $(all_includes) 
- kcm_launch_la_SOURCES      = kcmlaunch.cpp
--kcm_launch_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
--kcm_launch_la_LIBADD       = $(LIB_KDEUI)
-+kcm_launch_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module $(QT_LDFLAGS)
-+kcm_launch_la_LIBADD       = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
- kcm_launch_la_METASOURCES  = AUTO
- noinst_HEADERS                = kcmlaunch.h
- data_DATA                     = kcmlaunch.desktop
-Index: kcontrol/locale/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/locale/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/locale/Makefile.am	1 Oct 2002 02:35:08 -0000	1.1.1.3
-+++ kcontrol/locale/Makefile.am	1 Oct 2002 03:01:47 -0000	1.4
-@@ -10,9 +10,9 @@
- METASOURCES = AUTO
- noinst_HEADERS = toplevel.h kcmlocale.h klanguagebutton.h klocalesample.h menuitem.h localenum.h localemon.h localetime.h localeother.h kmenubutton.h
- 
--kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
--kcm_locale_la_LIBADD = $(LIB_KDEUI)
--
-+kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_locale_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
-+ 
- messages:
- 	$(XGETTEXT) $(kcm_locale_la_SOURCES) -o $(podir)/kcmlocale.pot
- 
-Index: kcontrol/nics/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/nics/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/nics/Makefile.am	14 Aug 2002 14:28:21 -0000	1.1.1.3
-+++ kcontrol/nics/Makefile.am	14 Aug 2002 15:35:42 -0000	1.4
-@@ -2,8 +2,8 @@
- 
- kcm_nic_la_SOURCES = nic.cpp
- 
--kcm_nic_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_nic_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSOCKET)
-+kcm_nic_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_nic_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBSOCKET) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/passwords/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/passwords/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/passwords/Makefile.am	1 Oct 2002 02:35:09 -0000	1.1.1.2
-+++ kcontrol/passwords/Makefile.am	1 Oct 2002 03:01:47 -0000	1.3
-@@ -5,7 +5,7 @@
- kde_module_LTLIBRARIES = kcm_passwords.la
- kcm_passwords_la_SOURCES = passwords.cpp
- kcm_passwords_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
--kcm_passwords_la_LIBADD = $(LIB_KDEUI) -lkdesu
-+kcm_passwords_la_LIBADD = $(LIB_KDEUI) $(LIB_KDESU) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- METASOURCES = AUTO
- noinst_HEADERS = passwords.h
-Index: kcontrol/samba/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/samba/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/samba/Makefile.am	14 Aug 2002 14:28:31 -0000	1.1.1.3
-+++ kcontrol/samba/Makefile.am	14 Aug 2002 15:35:43 -0000	1.4
-@@ -2,8 +2,8 @@
- 
- kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp
- 
--kcm_samba_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_samba_la_LIBADD = $(LIB_KIO)
-+kcm_samba_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_samba_la_LIBADD = $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/screensaver/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/screensaver/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/screensaver/Makefile.am	1 Oct 2002 02:35:15 -0000	1.1.1.2
-+++ kcontrol/screensaver/Makefile.am	1 Oct 2002 03:01:47 -0000	1.3
-@@ -7,8 +7,8 @@
- kde_module_LTLIBRARIES = kcm_screensaver.la
- 
- kcm_screensaver_la_SOURCES = scrnsave.cpp
--kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
--kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB)
-+kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(QT_LDFLAGS)
-+kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_DCOP)
- kcm_screensaver_la_METASOURCES = scrnsave.moc
- 
- noinst_HEADERS = scrnsave.h
-Index: kcontrol/smartcard/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/smartcard/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/smartcard/Makefile.am	14 Aug 2002 14:29:18 -0000	1.1.1.3
-+++ kcontrol/smartcard/Makefile.am	14 Aug 2002 15:35:43 -0000	1.4
-@@ -3,9 +3,9 @@
- 
- kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui smartcard.skel
- 
--kcm_smartcard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_smartcard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
- 
--kcm_smartcard_la_LIBADD = -lkdeui -lksmartcard $(LIB_KIO)
-+kcm_smartcard_la_LIBADD = $(LIB_KDEUI) -lksmartcard $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- kcm_smartcard_la_METASOURCES = AUTO
- 
-Index: kcontrol/smserver/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/smserver/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/smserver/Makefile.am	1 Oct 2002 02:35:16 -0000	1.1.1.2
-+++ kcontrol/smserver/Makefile.am	1 Oct 2002 03:01:47 -0000	1.3
-@@ -1,8 +1,8 @@
- kde_module_LTLIBRARIES = kcm_smserver.la
- 
- kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
--kcm_smserver_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_smserver_la_LIBADD = -lkdeui
-+kcm_smserver_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_smserver_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- INCLUDES= $(all_includes) 
- 
- kcm_smserver_la_METASOURCES = AUTO
-Index: kcontrol/spellchecking/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/spellchecking/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kcontrol/spellchecking/Makefile.am	1 Oct 2002 02:35:16 -0000	1.1.1.2
-+++ kcontrol/spellchecking/Makefile.am	1 Oct 2002 03:01:47 -0000	1.3
-@@ -2,8 +2,8 @@
- 
- kcm_spellchecking_la_SOURCES = spellchecking.cpp
- 
--kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_spellchecking_la_LIBADD = -lkdeui -lkspell
-+kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_spellchecking_la_LIBADD = $(LIB_KDEUI) $(LIB_KSPELL) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes)
- 
-Index: kcontrol/taskbar/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/taskbar/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/taskbar/Makefile.am	1 Oct 2002 02:35:16 -0000	1.1.1.3
-+++ kcontrol/taskbar/Makefile.am	1 Oct 2002 03:01:47 -0000	1.4
-@@ -1,8 +1,8 @@
- kde_module_LTLIBRARIES = kcm_taskbar.la
- 
- kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp
--kcm_taskbar_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_taskbar_la_LIBADD = -lkdeui
-+kcm_taskbar_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_taskbar_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP)
- INCLUDES= $(all_includes) 
- 
- kcm_taskbar_la_METASOURCES = AUTO
-Index: kcontrol/thememgr/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/thememgr/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kcontrol/thememgr/Makefile.am	14 Aug 2002 14:29:26 -0000	1.1.1.3
-+++ kcontrol/thememgr/Makefile.am	14 Aug 2002 15:35:43 -0000	1.4
-@@ -13,8 +13,8 @@
- 	options.h version.h groupdetails.h \
- 	themecreator.h newthemedlg.h
- 
--kcm_themes_la_LIBADD = $(LIB_KIO) 
--kcm_themes_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+kcm_themes_la_LIBADD = $(LIB_KIO) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_DCOP)
-+kcm_themes_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(QT_LDFLAGS)
- 
- apps_DATA = kthememgr.desktop
- appsdir = $(kde_appsdir)/Settings/LookNFeel
-Index: kcontrol/usbview/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kcontrol/usbview/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kcontrol/usbview/Makefile.am	25 Jun 2002 02:03:48 -0000	1.1.1.1
-+++ kcontrol/usbview/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -2,8 +2,8 @@
- 
- kcm_usb_la_SOURCES = kcmusb.cpp usbdevices.cpp usbdb.cpp
- 
--kcm_usb_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_usb_la_LIBADD = $(LIB_KDEUI)
-+kcm_usb_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined $(QT_LDFLAGS)
-+kcm_usb_la_LIBADD = $(LIB_KDEUI) $(LIB_X11) $(LIB_QT) $(LIB_KDECORE)
- 
- INCLUDES= $(all_includes) 
- 
-Index: kdeprint/kjobviewer/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kdeprint/kjobviewer/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kdeprint/kjobviewer/Makefile.am	25 Jun 2002 02:03:49 -0000	1.1.1.1
-+++ kdeprint/kjobviewer/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -9,8 +9,8 @@
- 
- kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
- kjobviewer_la_METASOURCES = AUTO
--kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
--kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
-+kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_DCOP)
-+kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) $(QT_LDFLAGS)
- 
- noinst_HEADERS = kjobviewer.h
- 
-Index: kdeprint/kprinter/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kdeprint/kprinter/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- kdeprint/kprinter/Makefile.am	10 Jul 2002 03:20:23 -0000	1.1.1.2
-+++ kdeprint/kprinter/Makefile.am	11 Jul 2002 22:35:30 -0000	1.2
-@@ -8,7 +8,7 @@
- kprinter_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- kprinter_la_SOURCES = main.cpp printwrapper.cpp
--kprinter_la_LIBADD = -lkdeprint
-+kprinter_la_LIBADD = -lkdeprint $(LIB_QT) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE)
- kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
- kprinter_METASOURCES = AUTO
- 
-Index: kdialog/kdialog.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kdialog/kdialog.cpp,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -u -r1.1.1.1 -r1.3
---- kdialog/kdialog.cpp	14 Aug 2002 14:27:19 -0000	1.1.1.1
-+++ kdialog/kdialog.cpp	26 Aug 2002 19:38:08 -0000	1.3
-@@ -20,8 +20,10 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <stream.h>
-+#include <iostream>
- #include <stdlib.h>
-+
-+using namespace std;
- 
- #include <qlist.h>
- #include <qfile.h>
-Index: kdm/backend/dm.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kdm/backend/dm.h,v
-retrieving revision 1.1.1.3
-retrieving revision 1.3
-diff -u -u -r1.1.1.3 -r1.3
---- kdm/backend/dm.h	1 Oct 2002 02:35:49 -0000	1.1.1.3
-+++ kdm/backend/dm.h	1 Oct 2002 03:01:47 -0000	1.3
-@@ -41,6 +41,10 @@
- #ifndef _DM_H_
- #define _DM_H_ 1
- 
-+#ifdef __APPLE__
-+#define CSRG_BASED
-+#endif
-+
- #include "greet.h"
- 
- #include <X11/Xos.h>
-Index: khelpcenter/khelpcenter.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/khelpcenter/khelpcenter.desktop,v
-retrieving revision 1.1.1.4
-retrieving revision 1.4
-diff -u -u -r1.1.1.4 -r1.4
-Index: khotkeys/khotkeys/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/khotkeys/khotkeys/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- khotkeys/khotkeys/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
-+++ khotkeys/khotkeys/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -4,7 +4,7 @@
- lib_LTLIBRARIES = khotkeys.la
- 
- khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
--khotkeys_la_LIBADD   = ../shared/libshared.la $(LIB_KSYCOCA)
-+khotkeys_la_LIBADD   = ../shared/libshared.la $(LIB_KSYCOCA) $(LIB_QT) $(LIB_X11) $(LIB_KDECORE) $(LIB_DCOP)
- khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- khotkeys_SOURCES = dummy.cpp
-Index: kicker/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kicker/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kicker/Makefile.am	10 Jul 2002 03:21:29 -0000	1.1.1.2
-+++ kicker/Makefile.am	10 Jul 2002 03:42:58 -0000	1.3
-@@ -7,8 +7,10 @@
- 
- CLEANFILES = dummy.cpp dummy_la.cpp
- 
--kicker_la_LIBADD = core/libkicker_core.la  buttons/libkicker_buttons.la \
--	ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO) 
-+kicker_la_LIBADD = $(top_builddir)/kicker/core/libkicker_core.la \
-+	$(top_builddir)/kicker/buttons/libkicker_buttons.la \
-+	$(top_builddir)/kicker/ui/libkicker_ui.la \
-+	$(top_builddir)/kicker/share/libkickermain.la $(LIB_KIO) 
- 
- kicker_la_SOURCES = dummy.cpp
- kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries)
-Index: kicker/menuext/kdeprint/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kicker/menuext/kdeprint/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kicker/menuext/kdeprint/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
-+++ kicker/menuext/kdeprint/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -4,7 +4,7 @@
- 
- kickermenu_kdeprint_la_SOURCES = print_mnu.cpp
- kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint
-+kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_QT)
- 
- kickermenu_kdeprint_la_METASOURCES = AUTO
- 
-Index: kicker/menuext/konsole/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kicker/menuext/konsole/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kicker/menuext/konsole/Makefile.am	14 Aug 2002 14:30:12 -0000	1.1.1.1
-+++ kicker/menuext/konsole/Makefile.am	15 Aug 2002 15:26:45 -0000	1.2
-@@ -3,8 +3,8 @@
- kde_module_LTLIBRARIES = kickermenu_konsole.la
- 
- kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
--kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
-+kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
-+kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT)
- 
- kickermenu_konsole_la_METASOURCES = AUTO
- 
-Index: kicker/menuext/prefmenu/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kicker/menuext/prefmenu/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kicker/menuext/prefmenu/Makefile.am	10 Jul 2002 03:22:41 -0000	1.1.1.1
-+++ kicker/menuext/prefmenu/Makefile.am	11 Jul 2002 22:35:30 -0000	1.2
-@@ -4,7 +4,8 @@
- 
- kickermenu_prefmenu_la_SOURCES = prefmenu.cpp
- kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kickermenu_prefmenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la
-+kickermenu_prefmenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la \
-+	$(top_builddir)/kicker/kicker.la
- 
- kickermenu_prefmenu_la_METASOURCES = AUTO
- 
-Index: kicker/menuext/recentdocs/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kicker/menuext/recentdocs/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kicker/menuext/recentdocs/Makefile.am	10 Jul 2002 03:22:42 -0000	1.1.1.1
-+++ kicker/menuext/recentdocs/Makefile.am	11 Jul 2002 22:35:30 -0000	1.2
-@@ -4,7 +4,8 @@
- 
- kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp
- kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la
-+kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la \
-+	$(top_builddir)/kicker/kicker.la
- 
- kickermenu_recentdocs_la_METASOURCES = AUTO
- 
-Index: kioslave/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.5
-diff -u -u -r1.1.1.3 -r1.5
---- kioslave/Makefile.am	14 Aug 2002 14:27:55 -0000	1.1.1.3
-+++ kioslave/Makefile.am	14 Aug 2002 15:35:43 -0000	1.5
-@@ -8,10 +8,14 @@
- SMB_SUBDIR=smb
- endif
- 
-+if include_kioslave_nfs
-+NFS_SUBDIR=nfs
-+endif
-+
- if include_devicesdir
- DEVICES_SUBDIR=devices
- endif
- 
--
--SUBDIRS = cgi floppy filter fish info mac man nfs nntp pop3 imap4 smtp \
--  smbro sftp tar zip finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) $(DEVICES_SUBDIR)
-+SUBDIRS = cgi floppy filter fish info mac man nntp pop3 imap4 smtp \
-+	smbro sftp tar zip finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) \
-+	$(NFS_SUBDIR) $(DEVICES_SUBDIR)
-Index: kioslave/devices/kdedmodule/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/devices/kdedmodule/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kioslave/devices/kdedmodule/Makefile.am	10 Jul 2002 03:22:56 -0000	1.1.1.1
-+++ kioslave/devices/kdedmodule/Makefile.am	11 Jul 2002 22:35:30 -0000	1.2
-@@ -3,8 +3,8 @@
- INCLUDES = $(all_includes)
- LDFLAGS =$(all_libraries)
- kded_mountwatcher_la_SOURCES = mountwatcher.cpp mountwatcher.skel disklist.cpp disks.cpp
--kded_mountwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kded_mountwatcher_la_LIBADD = $(LIB_KSYCOCA)
-+kded_mountwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
-+kded_mountwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_DCOP) $(LIB_KDECORE) $(LIB_KDED)
- 
- METASOURCES = AUTO
- 
-Index: kioslave/ldap/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/ldap/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- kioslave/ldap/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
-+++ kioslave/ldap/Makefile.am	21 Oct 2002 01:34:23 -0000	1.2
-@@ -9,7 +9,7 @@
- kde_module_LTLIBRARIES = kio_ldap.la
- 
- kio_ldap_la_SOURCES = kio_ldap.cpp kldap.cpp kldapurl.cpp
--kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(KERBEROS_LIBS)
-+kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIBLDAP) $(KERBEROS_LIBS)
- kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) $(KRB_RPATH) -module $(KDE_PLUGIN)
- 
- noinst_HEADERS = kio_ldap.h kldap.h kldapurl.h
-Index: kioslave/ldap/configure.in.in
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/ldap/configure.in.in,v
-retrieving revision 1.1.1.2
-retrieving revision 1.5
-diff -u -u -r1.1.1.2 -r1.5
---- kioslave/ldap/configure.in.in	10 Jul 2002 03:23:08 -0000	1.1.1.2
-+++ kioslave/ldap/configure.in.in	20 Oct 2002 19:12:01 -0000	1.5
-@@ -1,97 +1,13 @@
--AC_MSG_CHECKING(whether to compile LDAP support)
-+AC_MSG_CHECKING([whether to compile LDAP support])
- AC_ARG_WITH(ldap,
--[  --without-ldap=PATH     Set path for LDAP files [default=check]],
--[ case "$withval" in
--  yes)
--    with_ldap=CHECK
--    ;;
--  esac ],
--[ with_ldap=CHECK ]
--)dnl
-+  [  --without-ldap=PATH     Set path for LDAP files [default=check]],
-+  [ ac_use_ldap="$withval" ],
-+  [ ac_use_ldap=no ]
-+)
-+AC_MSG_RESULT($ac_use_ldap)
- 
--if test "x$with_ldap" = "xCHECK" ; then
--  with_ldap=NOTFOUND
--  search_incs="$kde_includes /usr/include /usr/local/include"
--  AC_FIND_FILE(ldap.h, $search_incs, ldap_incdir)
--  if test -r $ldap_incdir/ldap.h ; then
--    test "x$ldap_incdir" != "x/usr/include" && LDAP_INCS="-I$ldap_incdir"
--    with_ldap=FOUND
--  fi
--  if test $with_ldap = FOUND ; then
--    with_ldap=NOTFOUND
--    for ext in la so sl a ; do
--      AC_FIND_FILE(libldap.$ext, $kde_libraries /usr/lib /usr/local/lib,
--        ldap_libdir)
--      if test -r $ldap_libdir/libldap.$ext ; then
--        if test "x$ldap_libdir" != "x/usr/lib" ; then
--          LDAP_LIBS="-L$ldap_libdir "
--          test "$USE_RPATH" = yes && LDAP_RPATH="-R $ldap_libdir"
--        fi
--        LDAP_LIBS="${LDAP_LIBS}-lldap -llber -lresolv"
--        with_ldap=FOUND
--        break
--      fi
--    done
--  fi
-+if test "x$ac_use_ldap" != "no" ; then
-+  KDE_CHECK_LDAP($ac_use_ldap)
- fi
- 
--case "$with_ldap" in
--no) AC_MSG_RESULT(no) ;;
--NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
--*)
--  if test "x$with_ldap" = "xFOUND" ; then
--    msg="incs=$ldap_incdir libs=$ldap_libdir"
--  else
--    msg="$with_ldap"
--    LDAP_ROOT="$with_ldap"
--    if test "x$LDAP_ROOT" != "x/usr" ; then
--      LDAP_INCS="-I${LDAP_ROOT}/include"
--      LDAP_LIBS="-L${LDAP_ROOT}/lib "
--      if test "$USE_RPATH" = "yes" ; then
--        LDAP_RPATH="-R ${LDAP_ROOT}/lib"
--      fi
--    fi
--    LDAP_LIBS="${LDAP_LIBS}-lldap -llber -lresolv"
--  fi
--  kde_safe_LIBS="$LIBS"
--  kde_safe_CFLAGS="$CFLAGS"
--  LIBS="$LIBS $all_libraries $LDAP_LIBS $KERBEROS_LIBS $X_EXTRA_LIBS"
--  CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KERBEROS_INCS"
--  AC_LANG_SAVE
--  AC_LANG_C
--  AC_TRY_LINK(dnl
--  [
--  #include <lber.h>
--  #include <ldap.h>
--  #if LDAP_VENDOR_VERSION < 20000
--  #error OpenLDAP version too old, please upgrade to version 2 or higher
--  #endif
--  ],
--  [
--  LDAP *ldap;
--  ],
--  , with_ldap=no
--  )
--  AC_LANG_RESTORE
--  CFLAGS=$kde_safe_CFLAGS
--  LIBS=$kde_safe_LIBS
--  if test "$with_ldap" = "no" ; then
--    LDAP_INCS=
--    LDAP_LIBS=
--    LDAP_RPATH=
--    LDAP_SUBDIR=
--    AC_MSG_RESULT(no (but first try gave $msg))
--  else
--    AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
--    LDAP_SUBDIR="ldap"
--    AC_MSG_RESULT($msg)
--  fi
--  ;;
--esac
--
--AC_SUBST(LDAP_INCS)
--AC_SUBST(LDAP_LIBS)
--AC_SUBST(LDAP_RPATH)
--
- AM_CONDITIONAL(include_kioslave_ldap, test -n "$LDAP_SUBDIR")
--
-Index: kioslave/nfs/.cvsignore
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/nfs/.cvsignore,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
-Index: kioslave/nfs/README
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/nfs/README,v
-retrieving revision 1.1.1.1
-retrieving revision 1.4
-diff -u -u -r1.1.1.1 -r1.4
---- kioslave/nfs/README	25 Jun 2002 02:03:52 -0000	1.1.1.1
-+++ kioslave/nfs/README	16 Sep 2002 14:52:42 -0000	1.4
-@@ -1,3 +1,29 @@
- this is an ioslave for KDE 2 for NFS, version 2.
- 
- Alex
-+
-+Darwin notes --
-+
-+It looks like there are C++ type issues with the Darwin headers
-+(try building, you'll see the "too many arguments to function" stuff)
-+
-+The problem seems to be <rpc/clnt.h> having definitions that don't
-+play nice with C++.  The client rpc handle does a bunch of void stuff
-+in the struct which is fine in C but makes an empty arg list in C++.
-+
-+typedef struct {
-+        AUTH    *cl_auth;                       /* authenticator */
-+        struct clnt_ops {
-+                enum clnt_stat  (*cl_call)();   /* call remote procedure */
-+                void            (*cl_abort)();  /* abort a call */
-+                void            (*cl_geterr)(); /* get specific error code */
-+                bool_t          (*cl_freeres)(); /* frees results */
-+                void            (*cl_destroy)();/* destroy this structure */
-+                bool_t          (*cl_control)();/* the ioctl() of rpc */
-+        } *cl_ops;
-+        caddr_t                 cl_private;     /* private stuff */
-+} CLIENT;
-+
-+
-+The only solution is to probably reimplement clnt.h locally to fix
-+these (wrapping the "#include <rpc/rpc.h>" in an extern "C" isn't enough).
-Index: kioslave/nfs/configure.in.in
-===================================================================
-RCS file: kioslave/nfs/configure.in.in
-diff -N kioslave/nfs/configure.in.in
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ kioslave/nfs/configure.in.in	12 Jul 2002 02:04:22 -0000	1.2
-@@ -0,0 +1,7 @@
-+AC_MSG_CHECKING(whether to compile NFS support)
-+AC_ARG_WITH(nfs,
-+[  --without-nfs           Disable NFS kioslave [default=no]],
-+	with_nfs=$withval, with_nfs=yes
-+)dnl
-+AC_MSG_RESULT($withval)
-+AM_CONDITIONAL(include_kioslave_nfs, test "$with_nfs" = "yes")
-Index: kioslave/nfs/kio_nfs.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/nfs/kio_nfs.cpp,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -u -r1.1.1.1 -r1.3
---- kioslave/nfs/kio_nfs.cpp	1 Oct 2002 02:36:16 -0000	1.1.1.1
-+++ kioslave/nfs/kio_nfs.cpp	16 Sep 2002 14:51:29 -0000	1.3
-@@ -1,6 +1,6 @@
- /*  This file is part of the KDE project
- 
--    $Id: patch-kdebase-3.0.8-darwin,v 1.1 2002/10/24 07:36:17 michaelm Exp $
-+    $Id: patch-kdebase-3.0.8-darwin,v 1.1 2002/10/24 07:36:17 michaelm Exp $
- 
-     Copyright (C) 2000 Alexander Neundorf <neundorf@kde.org>
- 
-@@ -47,6 +47,8 @@
- #include <time.h>
- #include <unistd.h>
- 
-+#include <iostream.h>
-+
- #include <qfile.h>
- #include <qdir.h>
- 
-@@ -200,7 +202,6 @@
-    return (time(0)-m_detectTime);
- };
- 
--/*
- ostream& operator<< (ostream& s, const NFSFileHandle& x)
- {
-    for (int i =0; i<NFS_FHSIZE; i++)
-@@ -208,7 +209,6 @@
-    s<<dec;
-    return s;
- }
--*/
- 
- NFSProtocol::NFSProtocol (const QCString &pool, const QCString &app )
- :SlaveBase( "nfs", pool, app )
-Index: kioslave/nfs/kio_nfs.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kioslave/nfs/kio_nfs.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -u -r1.1.1.1 -r1.3
---- kioslave/nfs/kio_nfs.h	1 Oct 2002 02:36:16 -0000	1.1.1.1
-+++ kioslave/nfs/kio_nfs.h	16 Sep 2002 14:51:29 -0000	1.3
-@@ -35,6 +35,8 @@
- #include <netinet/in.h>
- #include <sys/time.h>
- 
-+#include <iostream.h>
-+
- class NFSFileHandle
- {
-    public:
-@@ -53,7 +55,7 @@
-       time_t m_detectTime;
- };
- 
--//ostream& operator<<(ostream&, const NFSFileHandle&);
-+ostream& operator<<(ostream&, const NFSFileHandle&);
- 
- typedef QMap<QString,NFSFileHandle> NFSFileHandleMap;
- 
-Index: klipper/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/klipper/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -u -r1.1.1.2 -r1.4
---- klipper/Makefile.am	10 Jul 2002 03:23:37 -0000	1.1.1.2
-+++ klipper/Makefile.am	3 Oct 2002 22:02:42 -0000	1.4
-@@ -6,19 +6,19 @@
- 
- CLEANFILES = dummy.cpp
- 
--klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) 
-+klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_X11) $(LIB_DCOP)
- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \
-     toplevel.skel
- 
- klipper_la_METASOURCES = AUTO
--klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+klipper_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -module -avoid-version
- 
- klipper_LDADD = klipper.la $(LIB_KSYCOCA)
- klipper_SOURCES = dummy.cpp
- klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- klipper_panelapplet_la_LIBADD = klipper.la
--klipper_panelapplet_la_SOURCES = applet.cpp
-+klipper_panelapplet_la_SOURCES = applet.cpp applet.skel
- klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- 
-Index: kmenuedit/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kmenuedit/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- kmenuedit/Makefile.am	14 Aug 2002 14:27:55 -0000	1.1.1.3
-+++ kmenuedit/Makefile.am	14 Aug 2002 15:35:43 -0000	1.4
-@@ -7,8 +7,8 @@
- 
- kmenuedit_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
- 
--kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
--kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
-+kmenuedit_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -module -avoid-version
- 
- kmenuedit_SOURCES = dummy.cpp
- kmenuedit_LDADD   = kmenuedit.la
-Index: konqueror/client/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konqueror/client/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -u -r1.1.1.2 -r1.4
---- konqueror/client/Makefile.am	14 Aug 2002 14:30:59 -0000	1.1.1.2
-+++ konqueror/client/Makefile.am	14 Aug 2002 15:35:43 -0000	1.4
-@@ -4,8 +4,8 @@
- lib_LTLIBRARIES = kfmclient.la
- 
- INCLUDES= -I.. $(all_includes)
--kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kfmclient_la_LIBADD =  $(LIB_KIO)
-+kfmclient_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -module -avoid-version
-+kfmclient_la_LIBADD =  $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP) $(LIB_KDEUI)
- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
- 
- noinst_HEADERS = kfmclient.h
-Index: konqueror/keditbookmarks/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konqueror/keditbookmarks/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- konqueror/keditbookmarks/Makefile.am	10 Jul 2002 03:24:04 -0000	1.1.1.2
-+++ konqueror/keditbookmarks/Makefile.am	12 Jul 2002 02:04:22 -0000	1.2
-@@ -7,7 +7,7 @@
- keditbookmarks_la_SOURCES = main.cpp items.cpp toplevel.cpp toplevel.skel commands.cpp
- kbookmarklistener_DIR = $(top_srcdir)/libkonq
- 
--keditbookmarks_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la
-+keditbookmarks_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML)
- keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- bin_PROGRAMS = keditbookmarks
-Index: konqueror/sidebar/trees/history_module/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konqueror/sidebar/trees/history_module/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.4
-diff -u -u -r1.1.1.3 -r1.4
---- konqueror/sidebar/trees/history_module/Makefile.am	1 Oct 2002 02:36:50 -0000	1.1.1.3
-+++ konqueror/sidebar/trees/history_module/Makefile.am	1 Oct 2002 03:01:48 -0000	1.4
-@@ -6,7 +6,7 @@
- 
- konq_sidebartree_history_la_SOURCES = history_module.cpp history_item.cpp \
- 	history_settings.cpp history_settings.skel
--konq_sidebartree_history_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-+konq_sidebartree_history_la_LDFLAGS = $(all_libraries) -no-undefined -module $(KDE_PLUGIN)
- konq_sidebartree_history_la_LIBADD =  ../../libkonqsidebarplugin.la ../libkonq_sidebar_tree.la
- 
- kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel
-Index: konqueror/sidebar/trees/history_module/history_module.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konqueror/sidebar/trees/history_module/history_module.h,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- konqueror/sidebar/trees/history_module/history_module.h	14 Aug 2002 14:30:58 -0000	1.1.1.2
-+++ konqueror/sidebar/trees/history_module/history_module.h	14 Aug 2002 15:35:44 -0000	1.3
-@@ -53,8 +53,7 @@
-     bool sortsByName() const { return m_sortsByName; }
- 
-     static QString groupForURL( const KURL& url ) {
--	static const QString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
--	return url.host().isEmpty() ? misc : url.host();
-+	return url.host().isEmpty() ? KGlobal::staticQString(i18n("Miscellaneous")) : url.host();
-     }
- 
- public slots:
-Index: konsole/kcmkonsole.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/kcmkonsole.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/kcmkonsole.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.5
-+++ konsole/kcmkonsole.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -24,7 +24,6 @@
- Name[es]=Consola
- Name[et]=Konsool
- Name[eu]=Konsola
--Name[fa]=کنسول
- Name[fi]=Konsoli
- Name[gl]=Consola
- Name[he]=מסוף
-@@ -59,7 +58,6 @@
- Name[zu]=I Khonsole
- 
- GenericName=All Konsole Settings
--GenericName[af]=alle konsole instellings
- GenericName[ar]=كل اعدادات Konsole
- GenericName[az]=Bütün Konsol Qurğuları
- GenericName[be]=Усе настройкі кансолі
-@@ -75,7 +73,6 @@
- GenericName[es]=Opciones de Konsole
- GenericName[et]=Konsooli seadistused
- GenericName[eu]=Konsolaren Konfigurazioa
--GenericName[fa]=تمام تنظیمات ک‌نسول
- GenericName[fi]=Kaikki konsolin asetukset
- GenericName[fr]=Configuration de Konsole
- GenericName[gl]=Propiedades da Konsole
-@@ -130,7 +127,6 @@
- Keywords[eo]=konzolo,pupitro,terminalo
- Keywords[es]=konsole,consola,terminal
- Keywords[et]=konsool,terminal
--Keywords[fa]=konsole,console,terminal,کنسول,ترمینال,ک‌نسول
- Keywords[fi]=konsole,konsoli,pääte-emulaattori
- Keywords[gl]=konsole,consola,terminal
- Keywords[he]=Konsole,Console,מסוף,טרמינל
-Index: konsole/konsole.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsole.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.5
-+++ konsole/konsole.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -18,7 +18,6 @@
- Name[eo]=Konzolo
- Name[et]=Konsool
- Name[eu]=Konsola
--Name[fa]=ک‌نسول
- Name[fi]=Pääte-emulaattori
- Name[he]=מסוף
- Name[hr]=Konzola
-@@ -39,7 +38,6 @@
- Name[zu]=iKonsole
- 
- GenericName=Terminal Program
--GenericName[af]=terminaal program
- GenericName[ar]=برنامج تيرمينال
- GenericName[be]=Тэрмінал
- GenericName[bg]=Терминална програма
-@@ -47,12 +45,11 @@
- GenericName[cs]=Terminálový program
- GenericName[da]=Terminalprogram
- GenericName[de]=Terminal-Programm
--GenericName[el]=Πρόγραμμα τερματικού
-+GenericName[el]=Πρόγραμμα Τερματικού
- GenericName[eo]=Terminalimitaĵo
- GenericName[es]=Programa de terminal
- GenericName[et]=Terminali emulaator
- GenericName[eu]=Terminala Programa
--GenericName[fa]=برنامه‌ی ترمینال
- GenericName[fi]=Terminaaliohjelma
- GenericName[fr]=Terminal
- GenericName[he]=תוכנית מסוף
-@@ -63,7 +60,6 @@
- GenericName[lt]=Terminalo programa
- GenericName[lv]=Termināla Programma
- GenericName[mt]=Programm ta' terminal
--GenericName[nb]=Terminalprogram
- GenericName[nl]=terminalprogramma
- GenericName[nn]=Terminalprogram
- GenericName[pl]=Program terminala
-Index: konsole/konsolehere.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsolehere.desktop,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- konsole/konsolehere.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.2
-+++ konsole/konsolehere.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -9,23 +9,12 @@
- Name[bs]=Otvori terminal ovdje
- Name[cs]=Otevřít terminál zde
- Name[da]=Åbn terminal her
--Name[de]=Terminal öffnen
--Name[el]=Άνοιγμα τερματικού εδώ
- Name[es]=Abrir terminal aquí
--Name[fa]=ترمینال را اینجا باز کن
--Name[fi]=Avaa terminaali tähän
--Name[fr]=Ouvrir un terminal ici
- Name[he]=פתח מסוף כאן
- Name[hu]=Parancsértelmező megnyitása itt
- Name[ja]=ここでターミナルを開く
- Name[mt]=Iftaħ terminal hawn
--Name[nb]=Åpne terminal her
--Name[nl]=Terminal openen
--Name[pt]=Abrir um Terminal Aqui
- Name[pt_BR]=Abrir Terminal aqui
--Name[sk]=Tu otvoriť terminál
- Name[sv]=Öppna terminal här
--Name[xh]=Vula Isiphelo Sendlela Apha
--Name[zh_TW]=在這裡開啟終端機
- Icon=konsole
- Exec=konsole --workdir %U
-Index: konsole/konsolepart.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsolepart.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsolepart.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.5
-+++ konsole/konsolepart.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -22,15 +22,13 @@
- Name[cs]=Emulátor terminálu
- Name[da]=terminalemulator
- Name[de]=Terminal-Emulator
--Name[el]=Εξομοίωση τερματικού
-+Name[el]=Εξομοίωση Τερματικού
- Name[eo]=Terminalimitaĵo
- Name[es]=Emulador de terminal
- Name[et]=Terminali emulaator
- Name[eu]=Terminal Imitazioa
--Name[fa]=شبیه‌ساز ترمینال
- Name[fi]=Pääte-emulaattori
--Name[fo]=Útstøðshermari
--Name[fr]=Émulateur de terminal
-+Name[fr]=Terminal
- Name[gl]=Emulador de Terminal
- Name[he]=הדמיית מסוף
- Name[hr]=Emulator Terminala
-Index: konsole/konsolesu.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsolesu.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsolesu.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.5
-+++ konsole/konsolesu.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -16,12 +16,11 @@
- Name[cs]=Konsole - superuživatelský režim
- Name[da]=Konsole (superbruger-tilstand)
- Name[de]=Konsole (Systemverwaltungs-Modus)
--Name[el]=Κονσόλα - Λειτουργία ως root
-+Name[el]=Κονσόλα - Λειτουργία Υπερ Χρήστη
- Name[eo]=Konzolo (kiel sistemestro)
- Name[es]=Konsole - modo superusuario
- Name[et]=Konsole (administraator)
- Name[eu]=Konsole (root era)
--Name[fa]=ک‌نسول - حالت کاربر برتر
- Name[fi]=Pääteikkuna - pääkäyttäjätila
- Name[fr]=Konsole (mode superutilisateur)
- Name[he]=מסוף - מצב משתמש-על
-@@ -32,7 +31,6 @@
- Name[lt]=Konsole – super vartotojo režimas
- Name[lv]=Konsole - Super Lietotāja Režīms
- Name[mt]=Konsole (modalità Super User)
--Name[nb]=Terminal (Superbrukermodus)
- Name[nl]=Konsole (in systeembeheermodus)
- Name[nn]=Konsole - Superbrukarmodus
- Name[pl]=Terminal  - tryb administratora
-@@ -51,11 +49,10 @@
- Name[xh]=Isiphelo Sendlela Indlela Sephezulu Yomsebenzisi
- Name[xx]=xx
- Name[zh_CN]=Konsole - 超级用户模式
--Name[zh_TW]=Konsole - 超級使用者模式
-+Name[zh_TW]=終端機 - 超級使用者模式
- Name[zu]=Konsole - Imodi Ephezulu Yomsebenzisi
- 
- GenericName=Terminal Program
--GenericName[af]=terminaal program
- GenericName[ar]=برنامج تيرمينال
- GenericName[be]=Тэрмінал
- GenericName[bg]=Терминална програма
-@@ -63,12 +60,11 @@
- GenericName[cs]=Terminálový program
- GenericName[da]=Terminalprogram
- GenericName[de]=Terminal-Programm
--GenericName[el]=Πρόγραμμα τερματικού
-+GenericName[el]=Πρόγραμμα Τερματικού
- GenericName[eo]=Terminalimitaĵo
- GenericName[es]=Programa de terminal
- GenericName[et]=Terminali emulaator
- GenericName[eu]=Terminala Programa
--GenericName[fa]=برنامه‌ی ترمینال
- GenericName[fi]=Terminaaliohjelma
- GenericName[fr]=Terminal
- GenericName[he]=תוכנית מסוף
-@@ -79,7 +75,6 @@
- GenericName[lt]=Terminalo programa
- GenericName[lv]=Termināla Programma
- GenericName[mt]=Programm ta' terminal
--GenericName[nb]=Terminalprogram
- GenericName[nl]=terminalprogramma
- GenericName[nn]=Terminalprogram
- GenericName[pl]=Program terminala
-Index: konsole/kwrited.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/kwrited.desktop,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/kwrited.desktop	1 Oct 2002 02:36:51 -0000	1.1.1.4
-+++ konsole/kwrited.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -12,7 +12,6 @@
- Name[eo]=Diskskrib-demono
- Name[es]=Demonio de escritura de KDE
- Name[et]=KDE write deemon
--Name[fa]=سرویس نوشتن ک‌د‌ای
- Name[fi]=KDE kirjoituspalvelin
- Name[fr]=Démon de commande Write de KDE
- Name[he]=תהליך השירות Write של KDE
-@@ -42,7 +41,7 @@
- Name[xh]=KDE iDaemon yokuBhala
- Name[xx]=xx
- Name[zh_CN]=KDE 书写器守护进程
--Name[zh_TW]=KDE Write 伺服程式
-+Name[zh_TW]=KDE Write 服務程式
- Name[zu]=KDE i Daemon yokuBhala
- Type=Service
- X-KDE-StartupNotify=false
-Index: konsole/konsole/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.3
-diff -u -u -r1.1.1.3 -r1.3
---- konsole/konsole/Makefile.am	14 Aug 2002 14:27:36 -0000	1.1.1.3
-+++ konsole/konsole/Makefile.am	14 Aug 2002 15:35:44 -0000	1.3
-@@ -47,8 +47,8 @@
- konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
-      TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
-      konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp
--konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
--konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB)
-+konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
-+konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
- 
- # konsole executable
- konsole_SOURCES = dummy.cpp
-Index: konsole/konsole/TEPty.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEPty.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.6
-diff -u -u -r1.1.1.4 -r1.6
---- konsole/konsole/TEPty.cpp	1 Oct 2002 02:37:00 -0000	1.1.1.4
-+++ konsole/konsole/TEPty.cpp	16 Oct 2002 21:58:59 -0000	1.6
-@@ -158,7 +158,6 @@
- #define TTY_GROUP "tty"
- 
- #include <kstandarddirs.h>
--#include <klocale.h>
- #include <kdebug.h>
- 
- #ifndef HERE
-@@ -246,10 +245,10 @@
- void TEPty::setSize(int lines, int columns)
- {
-   //kdDebug(1211)<<"TEPty::setSize()"<<endl;
--  m_WSize.ws_row = (unsigned short)lines;
--  m_WSize.ws_col = (unsigned short)columns;
--  if(m_MasterFd < 0) return;
--  ioctl(m_MasterFd, TIOCSWINSZ,(char *)&m_WSize);
-+  wsize.ws_row = (unsigned short)lines;
-+  wsize.ws_col = (unsigned short)columns;
-+  if(fd < 0) return;
-+  ioctl(fd,TIOCSWINSZ,(char *)&wsize);
-   //kdDebug(1211)<<"TEPty::setSize() done"<<endl;
- }
- 
-@@ -258,7 +257,7 @@
- #ifdef HAVE_UTEMPTER
-   {
-      KUtmpProcess utmp;
--     utmp.cmdFd = m_MasterFd;
-+     utmp.cmdFd = fd;
-      utmp << "/usr/sbin/utempter" << "-d" << ttynam;
-      utmp.start(KProcess::Block);
-   }
-@@ -271,7 +270,7 @@
-         logout(tty_name);
-   }
- #endif
--  if (m_bNeedGrantPty) chownpty(m_MasterFd, false);
-+  if (needGrantPty) chownpty(fd, false);
-  
-   KProcess::commClose();
- }
-@@ -304,19 +303,11 @@
-   term = _term;
-   konsole_dcop = _konsole_dcop;
-   konsole_dcop_session = _konsole_dcop_session;
--  m_bAddUtmp = _addutmp;
--  if (m_MasterFd < 0)
--     return -1;
-+  addutmp = _addutmp;
- 
-   if (!start(NotifyOnExit, (Communication) (Stdout | NoRead)))
-      return -1;
- 
--  if (m_SlaveFd >= 0)
--  {
--     close(m_SlaveFd);
--     m_SlaveFd = -1;
--  }
--
-   resume(); // Start...
-   return 0;
- 
-@@ -332,9 +323,9 @@
-     chmod(deviceName(), sbuf.st_mode & ~(S_IWGRP|S_IWOTH));
- }
- 
--void TEPty::openPty()
--{ 
--  m_bNeedGrantPty = true;
-+int TEPty::openPty()
-+{ int ptyfd = -1;
-+  needGrantPty = true;
- 
- #include <kdeversion.h>
- #if KDE_VERSION <305
-@@ -348,11 +339,10 @@
- 
-   // We try, as we know them, one by one.
- #if defined(HAVE_OPENPTY) //FIXME: some work needed.
--  if (m_MasterFd < 0) {
-+  if (ptyfd < 0) {
-     int master_fd, slave_fd;
-     if (openpty(&master_fd, &slave_fd, NULL, NULL, NULL) == 0) {
--      m_MasterFd = master_fd;
--      m_SlaveFd = slave_fd;
-+      ptyfd = master_fd;
- #ifdef HAVE_PTSNAME
-       strncpy(ptynam, ptsname(master_fd), 50);
- #else
-@@ -361,7 +351,7 @@
- #endif
-       strncpy(ttynam, ttyname(slave_fd), 50);
- 
--      m_bNeedGrantPty = false;
-+      needGrantPty = false;
-        
-       /* Get the group ID of the special `tty' group.  */
-       struct group* p = getgrnam(TTY_GROUP);    /* posix */
-@@ -369,13 +359,13 @@
- 
-       if (fchown(slave_fd, (uid_t) -1, gid) < 0)
-       {
--         m_bNeedGrantPty = true;
-+         needGrantPty = true;
-          fprintf(stderr,"konsole: cannot chown %s.\n",ttynam); 
-          perror("Reason");
-       }
-       else if (chmod(ttynam, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
-       {
--         m_bNeedGrantPty = true;
-+         needGrantPty = true;
-          fprintf(stderr,"konsole: cannot chmod %s.\n",ttynam); 
-          perror("Reason");
-       }
-@@ -385,65 +375,64 @@
- 
- //#if defined(__sgi__) || defined(__osf__) || defined(__svr4__)
- #if defined(HAVE_GRANTPT) && defined(HAVE_PTSNAME)
--  if (m_MasterFd < 0)
-+  if (ptyfd < 0)
-   {
- #ifdef _AIX
--    m_MasterFd = open("/dev/ptc",O_RDWR);
-+    ptyfd = open("/dev/ptc",O_RDWR);
- #else
--    m_MasterFd = open("/dev/ptmx",O_RDWR);
-+    ptyfd = open("/dev/ptmx",O_RDWR);
- #endif
--    if (m_MasterFd >= 0)
-+    if (ptyfd >= 0)
-     {
--      char *ptsn = ptsname(m_MasterFd);
-+      char *ptsn = ptsname(ptyfd);
-       if (ptsn) {
--          strncpy(ttynam, ptsname(m_MasterFd), 50);
--          grantpt(m_MasterFd);
--          m_bNeedGrantPty = false;
-+          strncpy(ttynam, ptsname(ptyfd), 50);
-+          grantpt(ptyfd);
-+          needGrantPty = false;
-       } else {
-       	  perror("ptsname");
--	  close(m_MasterFd);
--	  m_MasterFd = -1;
-+	  close(ptyfd);
-+	  ptyfd = -1;
-       }
-     }
-   }
- #endif
- 
- #if defined(_SCO_DS) || defined(__USLC__) // SCO OSr5 and UnixWare, might be obsolete
--  if (m_MasterFd < 0)
-+  if (ptyfd < 0)
-   { for (int idx = 0; idx < 256; idx++)
-     { sprintf(ptynam, "/dev/ptyp%d", idx);
-       sprintf(ttynam, "/dev/ttyp%d", idx);
-       if (access(ttynam, F_OK) < 0) { idx = 256; break; }
--      if ((m_MasterFd = open (ptynam, O_RDWR)) >= 0)
-+      if ((ptyfd = open (ptynam, O_RDWR)) >= 0)
-       { if (access (ttynam, R_OK|W_OK) == 0) break;
--        close(m_MasterFd); m_MasterFd = -1;
-+        close(ptyfd); ptyfd = -1;
-       }
-     }
-   }
- #endif
- 
--  if (m_MasterFd < 0) // Linux device names, FIXME: Trouble on other systems?
-+  if (ptyfd < 0) // Linux device names, FIXME: Trouble on other systems?
-   { for (const char* s3 = "pqrstuvwxyzabcdefghijklmno"; *s3 != 0; s3++)
-     { for (const char* s4 = "0123456789abcdefghijklmnopqrstuvwxyz"; *s4 != 0; s4++)
-       { sprintf(ptynam,"/dev/pty%c%c",*s3,*s4);
-         sprintf(ttynam,"/dev/tty%c%c",*s3,*s4);
--        if ((m_MasterFd = open(ptynam,O_RDWR)) >= 0)
-+        if ((ptyfd = open(ptynam,O_RDWR)) >= 0)
-         { if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0) break;
--          close(m_MasterFd); m_MasterFd = -1;
-+          close(ptyfd); ptyfd = -1;
-         }
-       }
--      if (m_MasterFd >= 0) break;
-+      if (ptyfd >= 0) break;
-     }
-   }
- 
--  if (m_MasterFd < 0)
-+  if (ptyfd < 0)
-   {
--    fprintf(stderr,"Can't open a pseudo teletype\n"); 
--    m_strError = i18n("Unable to open a suitable terminal device.");
--    return;
-+    //FIXME: handle more gracefully.
-+    fprintf(stderr,"Can't open a pseudo teletype\n"); exit(1);
-   }
- 
--  if (m_bNeedGrantPty && !chownpty(m_MasterFd, true))
-+  if (needGrantPty && !chownpty(ptyfd, true))
-   {
-     fprintf(stderr,"konsole: chownpty failed for device %s::%s.\n",ptynam,ttynam);
-     fprintf(stderr,"       : This means the session can be eavesdroped.\n");
-@@ -453,12 +442,14 @@
-                                              "konsole").local8Bit().data());
-   }
- 
--  fcntl(m_MasterFd,F_SETFL,O_NDELAY);
-+  fcntl(ptyfd,F_SETFL,O_NDELAY);
-+
-+  return ptyfd;
- }
- 
- int TEPty::makePty(bool _addutmp)
- {
--  if (m_MasterFd < 0) // no master pty could be opened
-+  if (fd < 0) // no master pty could be opened
-   {
-   //FIXME:
-     fprintf(stderr,"opening master pty failed.\n");
-@@ -466,18 +457,15 @@
-   }
- 
- #ifdef HAVE_UNLOCKPT
--  unlockpt(m_MasterFd);
-+  unlockpt(fd);
- #endif
- 
- #if defined(TIOCSPTLCK) && 0 //FIXME: obsolete, to removed if no one complains
--  int flag = 0; ioctl(m_MasterFd,TIOCSPTLCK,&flag); // unlock pty
-+  int flag = 0; ioctl(fd,TIOCSPTLCK,&flag); // unlock pty
- #endif
- 
-   // open and set all standard files to slave tty
--  int tt = m_SlaveFd; // Already opened?
--
--  if (tt < 0)
--    tt = open(ttynam, O_RDWR); 
-+  int tt = open(ttynam, O_RDWR);
- 
-   if (tt < 0) // the slave pty could be opened
-   {
-@@ -497,7 +485,7 @@
-   if (_addutmp)
-   {
-      KUtmpProcess utmp;
--     utmp.cmdFd = m_MasterFd;
-+     utmp.cmdFd = fd;
-      utmp << "/usr/sbin/utempter" << "-a" << ttynam << "";
-      utmp.start(KProcess::Block);
-   }
-@@ -537,7 +525,7 @@
- void TEPty::startPgm(const char* pgm, QValueList<QCString> & args, const char* term)
- { 
-   int sig;
--  int tt = makePty(m_bAddUtmp);
-+  int tt = makePty(addutmp);
- 
-   //reset signal handlers for child process
-   for (sig = 1; sig < NSIG; sig++)
-@@ -551,7 +539,7 @@
-   // We need to close all remaining fd's.
-   // Especially the one used by KProcess::start to see if we are running ok.
-   for (int i = 0; i < (int)rlp.rlim_cur; i++)
--    if (i != tt && i != m_MasterFd) close(i); //FIXME: (result of merge) Check if not closing fd is OK)
-+    if (i != tt && i != fd) close(i); //FIXME: (result of merge) Check if not closing fd is OK)
- 
-   dup2(tt,fileno(stdin));
-   dup2(tt,fileno(stdout));
-@@ -606,8 +594,7 @@
-       ioctl(0,TCGETS,(char *)&ttmode);
- #   endif
- #endif
--      if (!m_bXonXoff)
--         ttmode.c_iflag &= ~(IXOFF | IXON);
-+      ttmode.c_iflag &= ~(IXOFF | IXON);
-       ttmode.c_cc[VINTR] = CTRL('C');
-       ttmode.c_cc[VQUIT] = CTRL('\\');
-       ttmode.c_cc[VERASE] = 0177;
-@@ -621,7 +608,7 @@
- #   endif
- #endif
- 
--  close(m_MasterFd);
-+  close(fd);
- 
-   // drop privileges
-   setgid(getgid()); setuid(getuid()); 
-@@ -631,20 +618,41 @@
-   if (konsole_dcop && konsole_dcop[0]) setenv("KONSOLE_DCOP",konsole_dcop,1);
-   if (konsole_dcop_session && konsole_dcop_session[0]) setenv("KONSOLE_DCOP_SESSION",konsole_dcop_session,1);
- 
-+//  kdDebug() << "In TEPty.  args.count() is  " << args.count() << endl;
-+//  kdDebug() << "In TEPty.  i is " << i << endl;
-+//  kdDebug() << "In TEPty.  pgm  is " << pgm << endl;
-+
-+//  for (int k=1; k < 500000 ; k++) {
-+//    for (int j=1; j < 5000 ; j++) {}
-+//    }
-+
-   // convert QStrList into char*[]
-   unsigned int i;
-   char **argv = (char**)malloc(sizeof(char*)*(args.count()+1));
-+//  char **argv = (char**)malloc(sizeof(char*)*(args.count()+0));
-   for (i = 0; i<args.count(); i++) {
-      argv[i] = strdup(args[i]);
-+//      kdDebug() << "argv[" << i << "]=" << argv[i] << endl;
-      }
-+//  for (i = 1; i<args.count(); i++) argv[i-1] = strdup(args.at(i));
-+//   kdDebug() << "pgm WAS = " << pgm << endl;
-+   //pgm = strdup(args.at(0));
-+//  kdDebug() << "pgm WAS CHANGED TO = " << pgm << endl;
-+//  kdDebug() << "In TEPty.  first arg is " << argv[0] << endl;
-+//  kdDebug() << "In TEPty.  i is " << i << endl;
-+//  kdDebug() << "In TEPty.  pgm  is " << pgm << endl;
-+//   for (int k=1; k < 500000 ; k++) {
-+//     for (int j=1; j < 8000 ; j++) {}
-+//   }
- 
-   argv[i] = 0L;
- 
--  ioctl(0,TIOCSWINSZ,(char *)&m_WSize);  // set screen size
-+  ioctl(0,TIOCSWINSZ,(char *)&wsize);  // set screen size
- 
-   // finally, pass to the new program
-   //  kdDebug(1211) << "We are ready to run the program " << pgm << endl;
-   execvp(pgm, argv);
-+  //execvp("/bin/bash", argv);
-   perror("exec failed");
-   exit(1);                             // control should never come here.
- }
-@@ -654,11 +662,8 @@
- */
- TEPty::TEPty() : pSendJobTimer(NULL)
- { 
--  m_bXonXoff = false;
--  memset(&m_WSize, 0, sizeof(struct winsize));
--  m_SlaveFd = -1;
--  m_MasterFd = -1;
--  openPty();
-+  memset(&wsize, 0, sizeof(struct winsize));
-+  fd = openPty();
-   connect(this, SIGNAL(receivedStdout(int, int &)), 
- 	  this, SLOT(DataReceived(int, int&)));
-   connect(this, SIGNAL(processExited(KProcess *)),
-@@ -676,8 +681,8 @@
- 
- int TEPty::setupCommunication(Communication comm)
- {
--   if (m_MasterFd <= 0) return 0;
--   out[0] = m_MasterFd;
-+   if (fd <= 0) return 0;
-+   out[0] = fd;
-    out[1] = dup(2); // Dummy
-    communication = comm;
-    return 1;
-@@ -707,7 +712,7 @@
-   int written;
-   while(!pendingSendJobs.isEmpty()) {
-     SendJob& job = pendingSendJobs.first();
--    written = write(m_MasterFd, job.buffer.data() + job.start, job.length);
-+    written = write(fd, job.buffer.data() + job.start, job.length);
-     if (written==-1) {
-       if ( errno!=EAGAIN && errno!=EINTR )
-         pendingSendJobs.remove(pendingSendJobs.begin());
-@@ -736,14 +741,12 @@
- /*! sends len bytes through the line */
- void TEPty::send_bytes(const char* s, int len)
- {
--  if (m_MasterFd < 0)
--    return;
-   if (!pendingSendJobs.isEmpty()) {
-     appendSendJob(s,len);
-   }else {
-     int written;
-     do {
--      written = write(m_MasterFd,s,len);
-+      written = write(fd,s,len);
-       if (written==-1) {
-         if ( errno==EAGAIN || errno==EINTR )
-           appendSendJob(s,len);
-@@ -759,7 +762,7 @@
- void TEPty::DataReceived(int,int &len)
- { 
-   char buf[4096];
--  len = read(m_MasterFd, buf, 4096);
-+  len = read(fd, buf, 4096);
-   if (len < 0)
-      return;
- 
-@@ -779,4 +782,3 @@
-   else
-     resume();
- }
--
-Index: konsole/konsole/TEPty.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEPty.h,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/TEPty.h	1 Oct 2002 02:37:00 -0000	1.1.1.4
-+++ konsole/konsole/TEPty.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -44,13 +44,11 @@
-      * the necessary connections to the signals and slots of the
-      * instance before starting the execution of the client.
-      */
--    int run( const char* pgm, QStrList & args, const char* term, bool _addutmp,
-+    int run( const char* pgm, QStrList & args, const char* term, bool addutmp,
-              const char* konsole_dcop = "", const char* konsole_dcop_session = "" );
-     void setWriteable(bool writeable);
--    void setXonXoff(bool _xonxoff) { m_bXonXoff = _xonxoff; }
-     int makePty(bool _addutmp);
--    int masterFd() { return m_MasterFd; }
--    QString error() { return m_strError; }
-+    int masterFd() { return fd; }
- 
-   public slots:
-     void lockPty(bool lock);
-@@ -92,7 +90,7 @@
-       
-   private:
-     void startPgm(const char* pgm, QValueList<QCString> & args, const char* term);
--    void openPty();
-+    int  openPty();
-     void appendSendJob(const char* s, int len);
- 
-   private slots:
-@@ -100,16 +98,13 @@
- 
-   private:
- 
--    struct winsize m_WSize;
--    int m_MasterFd;
--    int m_SlaveFd;
--    bool             m_bNeedGrantPty;
--    bool             m_bXonXoff;
--    bool             m_bAddUtmp;
-+    struct winsize wsize;
-+    int fd;
-+    bool             needGrantPty;
-     char ptynam[50]; // "/dev/ptyxx" | "/dev/ptmx"
-     char ttynam[50]; // "/dev/ttyxx" | "/dev/pts/########..."
-     const char *pgm;
--    QString m_strError;
-+    bool addutmp;
- 
-     // environment variables
-     const char *term;
-Index: konsole/konsole/TEScreen.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEScreen.cpp,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
---- konsole/konsole/TEScreen.cpp	1 Oct 2002 02:37:00 -0000	1.1.1.3
-+++ konsole/konsole/TEScreen.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -218,7 +218,7 @@
- {
-   if (cuY == bmargin)
-   {
--    if (tmargin == 0) addHistLine(); // hist.history
-+    if (tmargin == 0 && bmargin == lines-1) addHistLine(); // hist.history
-     scrollUp(tmargin,1);
-   }
-   else if (cuY < lines-1)
-@@ -650,31 +650,15 @@
- /*!
- */
- 
--void TEScreen::Tabulate(int n)
-+void TEScreen::Tabulate()
- {
-   // note that TAB is a format effector (does not write ' ');
--  if (n == 0) n = 1;
--  while((n > 0) && (cuX < columns-1))
--  {
--    cursorRight(1); while((cuX < columns-1) && !tabstops[cuX]) cursorRight(1);
--    n--;
--  }
--}
--
--void TEScreen::backTabulate(int n)
--{
--  // note that TAB is a format effector (does not write ' ');
--  if (n == 0) n = 1;
--  while((n > 0) && (cuX > 0))
--  {
--     cursorLeft(1); while((cuX > 0) && !tabstops[cuX]) cursorLeft(1);
--     n--;
--  }
-+  cursorRight(1); while(cuX < columns-1 && !tabstops[cuX]) cursorRight(1);
- }
- 
- void TEScreen::clearTabStops()
- {
--  for (int i = 0; i < columns; i++) tabstops[i] = false;
-+  for (int i = 0; i < columns; i++) tabstops[i-1] = false;
- }
- 
- void TEScreen::changeTabStop(bool set)
-@@ -736,11 +720,11 @@
-      return;
- 
-   if (cuX+w > columns) {
--    if (getMode(MODE_Wrap)) {
-+    if (getMode(MODE_Wrap)) { 
-       line_wrapped[cuY]=true;
-       NextLine();
--    }
--    else
-+    } 
-+    else 
-       cuX = columns-w;
-   }
- 
-@@ -756,7 +740,7 @@
-   image[i].r = ef_re;
- 
-   cuX += w--;
--
-+  
-   while(w)
-   {
-      i++;
-@@ -917,7 +901,7 @@
-   if (sel_begin != -1)
-   {
-      // Adjust selection to follow scroll.
--     bool beginIsTL = (sel_begin == sel_TL);
-+     bool beginIsTL = (sel_begin == sel_TL);     
-      int diff = dst - loca; // Scroll by this amount
-      int scr_TL=loc(0,hist->getLines());
-      int srca = loca+scr_TL; // Translate index from screen to global
-@@ -939,7 +923,7 @@
-      {
-         clearSelection();
-      }
--     else
-+     else 
-      {
-         if (sel_TL < 0)
-            sel_TL = 0;
-@@ -1286,7 +1270,7 @@
-     {
-       // Strip trailing spaces
-       j = last_space;
--    }
-+    }  
- 
-   QString res(qc, j);
- 
-@@ -1349,7 +1333,7 @@
-           sel_BR += columns;
-        }
-     }
--
-+   
-     // Scroll up if user is looking at the history and we can scroll up
-     if ((histCursor > 0) &&  // We can scroll up and...
-         ((histCursor != newHistLines) || // User is looking at history...
-@@ -1373,7 +1357,7 @@
-        {
-           clearSelection();
-        }
--       else
-+       else 
-        {
-           if (sel_TL < 0)
-              sel_TL = 0;
-Index: konsole/konsole/TEScreen.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEScreen.h,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
---- konsole/konsole/TEScreen.h	1 Oct 2002 02:37:00 -0000	1.1.1.3
-+++ konsole/konsole/TEScreen.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -65,8 +65,7 @@
-     //
-     void Return      ();
-     void BackSpace   ();
--    void Tabulate    (int n = 1);
--    void backTabulate(int n);
-+    void Tabulate    ();
-     //
-     // Editing
-     //
-Index: konsole/konsole/TEWidget.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEWidget.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/TEWidget.cpp	1 Oct 2002 02:37:01 -0000	1.1.1.4
-+++ konsole/konsole/TEWidget.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -309,7 +309,6 @@
- ,hasBlinkingCursor(false)
- ,ctrldrag(false)
- ,cuttobeginningofline(false)
--,isBlinkEvent(false)
- ,m_drop(0)
- ,possibleTripleClick(false)
- ,mResizeWidget(0)
-@@ -373,64 +372,58 @@
- void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
-                            QString& str, ca attr, bool pm, bool clear)
- {
--  int a = font_a + m_lineSpacing / 2;
--  QColor fColor = color_table[attr.f].color;
-+  QColor fColor=(((attr.r & RE_CURSOR) && hasFocus() && (!hasBlinkingCursor || !cursorBlinking)) ? color_table[attr.b].color : color_table[attr.f].color);
-+  QColor bColor=(((attr.r & RE_CURSOR) && hasFocus() && (!hasBlinkingCursor || !cursorBlinking)) ? color_table[attr.f].color : color_table[attr.b].color);
- 
-   if (attr.r & RE_CURSOR)
-     cursorRect = rect;
- 
--  // Paint background
--  if (color_table[attr.b].transparent)
-+  if (pm && color_table[attr.b].transparent && (!(attr.r & RE_CURSOR) || cursorBlinking))
-   {
--    if (pm)
--       paint.setBackgroundMode( TransparentMode );
--    if (clear || (blinking && (attr.r & RE_BLINK))) 
--       erase(rect);
-+    paint.setBackgroundMode( TransparentMode );
-+    if (clear) erase(rect);
-   }
-   else
-   {
--    paint.fillRect(rect, color_table[attr.b].color);
--  }
--
--  // Paint cursor
--  if ((attr.r & RE_CURSOR)) {
--    paint.setBackgroundMode( TransparentMode );
--    int h = font_h - m_lineSpacing;
--    QRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
--    if (hasFocus())
--    {
--       if (!cursorBlinking)
--       {
--          paint.fillRect(r, color_table[attr.f].color);
--          fColor = color_table[attr.b].color;
--       }
--    }
-+    if (blinking)
-+      paint.fillRect(rect, bColor);
-     else
-     {
--       paint.setPen(fColor);
--       paint.drawRect(r);
-+      paint.setBackgroundMode( OpaqueMode );
-+      paint.setBackgroundColor( bColor );
-     }
-   }
--
--  // Paint text
-   if (!(blinking && (attr.r & RE_BLINK)))
-   {
-+    if ((attr.r && RE_CURSOR) && cursorBlinking)
-+      erase(rect);
-     paint.setPen(fColor);
--    paint.drawText(rect.x(),rect.y()+a, str, -1, QPainter::LTR);
-+    paint.drawText(rect.x(),rect.y()+font_a, str, -1, QPainter::LTR);
-     if ((attr.r & RE_UNDERLINE) || color_table[attr.f].bold)
-     {
-       paint.setClipRect(rect);
-       if (color_table[attr.f].bold)
-       {
-         paint.setBackgroundMode( TransparentMode );
--        paint.drawText(rect.x()+1,rect.y()+a, str, -1, QPainter::LTR); // second stroke
-+        paint.drawText(rect.x()+1,rect.y()+font_a, str, -1, QPainter::LTR); // second stroke
-       }
-       if (attr.r & RE_UNDERLINE)
--        paint.drawLine(rect.left(), rect.y()+a+1,
--                       rect.right(),rect.y()+a+1 );
-+        paint.drawLine(rect.left(), rect.y()+font_a+1,
-+                       rect.right(),rect.y()+font_a+1 );
-       paint.setClipping(false);
-     }
-   }
-+  if ((attr.r & RE_CURSOR) && !hasFocus()) {
-+    if (pm && color_table[attr.b].transparent)
-+    {
-+      erase(rect);
-+      paint.setBackgroundMode( TransparentMode );
-+      paint.drawText(rect.x(),rect.y()+font_a, str, -1, QPainter::LTR);
-+    }
-+    paint.setClipRect(rect);
-+    paint.drawRect(rect.x(),rect.y(),rect.width(),rect.height()-m_lineSpacing);
-+    paint.setClipping(false);
-+  }
- }
- 
- /*!
-@@ -535,8 +528,8 @@
-      if (!mResizeWidget)
-      {
-         mResizeWidget = new QFrame(this);
--        QFont f = KGlobalSettings::generalFont();
--        f.setPointSize((f.pointSize()*3)/2);
-+        QFont f = mResizeWidget->font();
-+        f.setPointSize(f.pointSize()*2);
-         f.setBold(true);
-         mResizeWidget->setFont(f);
-         mResizeWidget->setFrameShape((QFrame::Shape) (QFrame::Box|QFrame::Raised));
-@@ -582,6 +575,8 @@
- 
- void TEWidget::paintEvent( QPaintEvent* pe )
- {
-+
-+//{ static int cnt = 0; printf("paint %d\n",cnt++); }
-   const QPixmap* pm = backgroundPixmap();
-   QPainter paint;
-   setUpdatesEnabled(false);
-@@ -606,6 +601,10 @@
-   int rlx = QMIN(columns-1, QMAX(0,(rect.right()  - tLx - bX ) / font_w));
-   int rly = QMIN(lines-1,   QMAX(0,(rect.bottom() - tLy - bY  ) / font_h));
- 
-+  //  if (pm != NULL && color_table[image->b].transparent)
-+  //  erase(rect);
-+  // BL: I have no idea why we need this, and it breaks the refresh.
-+
-   QChar *disstrU = new QChar[columns];
-   for (int y = luy; y <= rly; y++)
-   {
-@@ -636,13 +635,10 @@
-       if ((x+len < columns) && (!image[loc(x+len,y)].c))
-         len++; // Adjust for trailing part of multi-column char
- 
--      if (!isBlinkEvent || (cr & RE_BLINK))
--      {
--         QString unistr(disstrU,p);
--         drawAttrStr(paint,
-+      QString unistr(disstrU,p);
-+      drawAttrStr(paint,
-                 QRect(bX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
-                 unistr, image[loc(x,y)], pm != NULL, false);
--      }
-       x += len - 1;
-     }
-   }
-@@ -655,15 +651,13 @@
- void TEWidget::blinkEvent()
- {
-   blinking = !blinking;
--  isBlinkEvent = true;
-   repaint(false);
--  isBlinkEvent = false;
- }
- 
- void TEWidget::blinkCursorEvent()
- {
-   cursorBlinking = !cursorBlinking;
--  repaint(cursorRect, true);
-+  repaint(cursorRect, false);
- }
- 
- /* ------------------------------------------------------------------------- */
-@@ -1145,18 +1139,6 @@
-   QTimer::singleShot(QApplication::doubleClickInterval(),this,SLOT(tripleClickTimeout()));
- }
- 
--void TEWidget::wheelEvent( QWheelEvent* ev )
--{
--  if (!mouse_marks)
--  {
--    QPoint tL  = contentsRect().topLeft();
--    int    tLx = tL.x();
--    int    tLy = tL.y();
--    QPoint pos = QPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
--    emit mouseSignal( ev->delta() > 0 ? 4 : 5, pos.x() + 1, pos.y() + 1 );
--  }
--}
--
- void TEWidget::tripleClickTimeout()
- {
-   possibleTripleClick=false;
-@@ -1209,7 +1191,7 @@
- 
- void TEWidget::focusOutEvent( QFocusEvent * )
- {
--  repaint(cursorRect, true);  // don't erase area
-+  repaint(cursorRect, false);  // don't erase area
- }
- 
- bool TEWidget::focusNextPrevChild( bool next )
-@@ -1659,7 +1641,7 @@
-       setActiveWindow();
-       break;
-    case 1: // cd ...
--     emit sendStringToEmu("\001\013cd ");
-+     emit sendStringToEmu("cd ");
-       struct stat statbuf;
-       if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
-       {
-@@ -1676,13 +1658,13 @@
-       setActiveWindow();
-       break;
-    case 2: // copy
--     emit sendStringToEmu("\001\013cp -i ");
-+     emit sendStringToEmu("cp -i ");
-      break;
-    case 3: // link
--     emit sendStringToEmu("\001\013ln -s ");
-+     emit sendStringToEmu("ln -s ");
-      break;
-    case 4: // move
--     emit sendStringToEmu("\001\013mv -i ");
-+     emit sendStringToEmu("mv -i ");
-      break;
-    }
-    if (item>1 && item<5) {
-Index: konsole/konsole/TEWidget.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEWidget.h,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/TEWidget.h	1 Oct 2002 02:37:01 -0000	1.1.1.4
-+++ konsole/konsole/TEWidget.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -143,7 +143,6 @@
-     void mousePressEvent( QMouseEvent* );
-     void mouseReleaseEvent( QMouseEvent* );
-     void mouseMoveEvent( QMouseEvent* );
--    void wheelEvent( QWheelEvent* );
- 
-     void focusInEvent( QFocusEvent * );
-     void focusOutEvent( QFocusEvent * );
-@@ -217,7 +216,6 @@
-     bool hasBlinkingCursor;  // has blinking cursor enabled
-     bool ctrldrag;           // require Ctrl key for drag
-     bool cuttobeginningofline; // triple click only selects forward
--    bool isBlinkEvent; // paintEvent due to blinking.
-     QTimer* blinkT;  // active when hasBlinker
-     QTimer* blinkCursorT;  // active when hasBlinkingCursor
-     
-Index: konsole/konsole/TEmuVt102.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEmuVt102.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/TEmuVt102.cpp	1 Oct 2002 02:37:00 -0000	1.1.1.4
-+++ konsole/konsole/TEmuVt102.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -183,7 +183,6 @@
-    - CSI_PN     - Escape codes of the form <ESC>'['     {Pn} ';' {Pn} C
-    - CSI_PS     - Escape codes of the form <ESC>'['     {Pn} ';' ...  C
-    - CSI_PR     - Escape codes of the form <ESC>'[' '?' {Pn} ';' ...  C
--   - CSI_PE     - Escape codes of the form <ESC>'[' '!' {Pn} ';' ...  C
-    - VT52       - VT52 escape codes
-                   - <ESC><Chr>
-                   - <ESC>'Y'{Pc}{Pc}
-@@ -213,8 +212,6 @@
- 
- #define TY_CSI_PG(A  )  TY_CONSTR(9,A,0)
- 
--#define TY_CSI_PE(A  )  TY_CONSTR(10,A,0)
--
- // Tokenizer --------------------------------------------------------------- --
- 
- /* The tokenizers state
-@@ -257,13 +254,13 @@
- 
- void TEmuVt102::initTokenizer()
- { int i; UINT8* s;
--  for(i =  0;                      i < 256; i++) tbl[ i]  = 0;
--  for(i =  0;                      i <  32; i++) tbl[ i] |= CTL;
--  for(i = 32;                      i < 256; i++) tbl[ i] |= CHR;
--  for(s = (UINT8*)"@ABCDGHILMPXZcdfry"; *s; s++) tbl[*s] |= CPN;
--  for(s = (UINT8*)"0123456789"        ; *s; s++) tbl[*s] |= DIG;
--  for(s = (UINT8*)"()+*%"             ; *s; s++) tbl[*s] |= SCS;
--  for(s = (UINT8*)"()+*#[]%"          ; *s; s++) tbl[*s] |= GRP;
-+  for(i =  0;                    i < 256; i++) tbl[ i]  = 0;
-+  for(i =  0;                    i <  32; i++) tbl[ i] |= CTL;
-+  for(i = 32;                    i < 256; i++) tbl[ i] |= CHR;
-+  for(s = (UINT8*)"@ABCDGHLMPXcdfry"; *s; s++) tbl[*s] |= CPN;
-+  for(s = (UINT8*)"0123456789"      ; *s; s++) tbl[*s] |= DIG;
-+  for(s = (UINT8*)"()+*%"           ; *s; s++) tbl[*s] |= SCS;
-+  for(s = (UINT8*)"()+*#[]%"        ; *s; s++) tbl[*s] |= GRP;
-   resetToken();
- }
- 
-@@ -287,9 +284,8 @@
- #define les(P,L,C) (p == (P) && s[L] < 256  && (tbl[s[(L)]] & (C)) == (C))
- #define eec(C)     (p >=  3  &&        cc                          == (C))
- #define ees(C)     (p >=  3  && cc < 256 &&    (tbl[  cc  ] & (C)) == (C))
--#define eps(C)     (p >=  3  && s[2] != '?' && s[2] != '!' && s[2] != '>' && cc < 256 && (tbl[  cc  ] & (C)) == (C))
-+#define eps(C)     (p >=  3  && s[2] != '?' && s[2] != '>' && cc < 256 && (tbl[  cc  ] & (C)) == (C))
- #define epp( )     (p >=  3  && s[2] == '?'                              )
--#define epe( )     (p >=  3  && s[2] == '!'                              )
- #define egt(     ) (p >=  3  && s[2] == '>'                              )
- #define Xpe        (ppos>=2  && pbuf[1] == ']'                           )
- #define Xte        (Xpe                        &&     cc           ==  7 )
-@@ -321,19 +317,16 @@
-   if (getMode(MODE_Ansi)) // decide on proper action
-   {
-     if (lec(1,0,ESC)) {                                                       return; }
--    if (lec(1,0,ESC+128)) { s[0] = ESC; onRcvChar('[');                       return; }
-     if (les(2,1,GRP)) {                                                       return; }
-     if (Xte         ) { XtermHack();                            resetToken(); return; }
-     if (Xpe         ) {                                                       return; }
-     if (lec(3,2,'?')) {                                                       return; }
-     if (lec(3,2,'>')) {                                                       return; }
--    if (lec(3,2,'!')) {                                                       return; }
-     if (lun(       )) { tau( TY_CHR___(), applyCharset(cc), 0); resetToken(); return; }
-     if (lec(2,0,ESC)) { tau( TY_ESC___(s[1]),    0,   0);       resetToken(); return; }
-     if (les(3,1,SCS)) { tau( TY_ESC_CS(s[1],s[2]),    0,   0);  resetToken(); return; }
-     if (lec(3,1,'#')) { tau( TY_ESC_DE(s[2]),    0,   0);       resetToken(); return; }
-     if (eps(    CPN)) { tau( TY_CSI_PN(cc), argv[0],argv[1]);   resetToken(); return; }
--    if (epe(       )) { tau( TY_CSI_PE(cc),      0,   0);       resetToken(); return; }
-     if (ees(    DIG)) { addDigit(cc-'0');                                     return; }
-     if (eec(    ';')) { addArgument();                                        return; }
-     for (i=0;i<=argc;i++)
-@@ -560,12 +553,10 @@
-     case TY_CSI_PN('D'      ) : scr->cursorLeft           (p         ); break; //VT100
-     case TY_CSI_PN('G'      ) : scr->setCursorX           (p         ); break; //LINUX
-     case TY_CSI_PN('H'      ) : scr->setCursorYX          (p,       q); break; //VT100
--    case TY_CSI_PN('I'      ) : scr->Tabulate             (p         ); break;
-     case TY_CSI_PN('L'      ) : scr->insertLines          (p         ); break;
-     case TY_CSI_PN('M'      ) : scr->deleteLines          (p         ); break;
-     case TY_CSI_PN('P'      ) : scr->deleteChars          (p         ); break;
-     case TY_CSI_PN('X'      ) : scr->eraseChars           (p         ); break;
--    case TY_CSI_PN('Z'      ) : scr->backTabulate         (p         ); break;
-     case TY_CSI_PN('c'      ) :      reportTerminalType   (          ); break; //VT100
-     case TY_CSI_PN('d'      ) : scr->setCursorY           (p         ); break; //LINUX
-     case TY_CSI_PN('f'      ) : scr->setCursorYX          (p,       q); break; //VT100
-@@ -579,8 +570,8 @@
- 
-     case TY_CSI_PR('l',    2) :        resetMode      (MODE_Ansi     ); break; //VT100
- 
--    case TY_CSI_PR('h',    3) : /* IGNORED:  setColumns (       132) */ break; //VT100
--    case TY_CSI_PR('l',    3) : /* IGNORED:  setColumns (        80) */ break; //VT100
-+    case TY_CSI_PR('h',    3) :      setColumns           (       132); break; //VT100
-+    case TY_CSI_PR('l',    3) :      setColumns           (        80); break; //VT100
- 
-     case TY_CSI_PR('h',    4) : /* IGNORED: soft scrolling           */ break; //VT100
-     case TY_CSI_PR('l',    4) : /* IGNORED: soft scrolling           */ break; //VT100
-@@ -617,11 +608,6 @@
-     case TY_CSI_PR('s',   47) :         saveMode      (MODE_AppScreen); break; //XTERM
-     case TY_CSI_PR('r',   47) :      restoreMode      (MODE_AppScreen); break; //XTERM
- 
--    case TY_CSI_PR('h',   67) : /* IGNORED: DECBKM                   */ break; //XTERM
--    case TY_CSI_PR('l',   67) : /* IGNORED: DECBKM                   */ break; //XTERM
--    case TY_CSI_PR('s',   67) : /* IGNORED: DECBKM                   */ break; //XTERM
--    case TY_CSI_PR('r',   67) : /* IGNORED: DECBKM                   */ break; //XTERM
--
-     // XTerm defines the following modes:
-     // SET_VT200_MOUSE             1000
-     // SET_VT200_HIGHLIGHT_MOUSE   1001
-@@ -667,9 +653,6 @@
-     case TY_CSI_PR('h', 1049) : saveCursor(); screen[1]->clearEntireScreen(); setMode(MODE_AppScreen); break; //XTERM
-     case TY_CSI_PR('l', 1049) : resetMode(MODE_AppScreen); restoreCursor(); break; //XTERM
- 
--    //FIXME: weird DEC reset sequence
--    case TY_CSI_PE('p'      ) : /* IGNORED: reset         (        ) */ break;
--
-     //FIXME: when changing between vt52 and ansi mode evtl do some resetting.
-     case TY_VT52__('A'      ) : scr->cursorUp             (         1); break; //VT52
-     case TY_VT52__('B'      ) : scr->cursorDown           (         1); break; //VT52
-@@ -803,9 +786,6 @@
- void TEmuVt102::onMouse( int cb, int cx, int cy )
- { char tmp[20];
-   if (!connected) return;
--  // normal buttons are passed as 0x20 + button,
--  // mouse wheel (buttons 4,5) as 0x60 + button
--  if (cb >= 4) cb += 0x40;
-   sprintf(tmp,"\033[M%c%c%c",cb+040,cx+040,cy+040);
-   sendString(tmp);
- }
-Index: konsole/konsole/TEmulation.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/TEmulation.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/TEmulation.cpp	1 Oct 2002 02:37:00 -0000	1.1.1.4
-+++ konsole/konsole/TEmulation.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -420,7 +420,7 @@
- 
- // Refreshing -------------------------------------------------------------- --
- 
--#define BULK_TIMEOUT 10
-+#define BULK_TIMEOUT 20
- 
- /*!
-    called when \n comes in. Evtl. triggers showBulk at endBulk
-@@ -475,8 +475,14 @@
-   if ( connected)
-   {
-     //kdDebug(1211)<<"TEmulation::setConnect() onImageSize..."<<endl;
--    onImageSizeChange(gui->Lines(), gui->Columns());  // calls showBulk();
-+    onImageSizeChange(gui->Lines(), gui->Columns());
-+    //kdDebug(1211)<<"TEmulation::setConnect() showBulk()"<<endl;
-+    showBulk();
-     //kdDebug(1211)<<"TEmulation::setConnect() done"<<endl;
-+  }
-+  else
-+  {
-+    scr->clearSelection();
-   }
- }
- 
-Index: konsole/konsole/konsole.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/konsole.cpp	1 Oct 2002 02:36:58 -0000	1.1.1.4
-+++ konsole/konsole/konsole.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -235,7 +235,6 @@
- ,b_warnQuit(false)
- ,b_allowResize(true)
- ,b_addToUtmp(true)
--,b_xonXoff(false)
- ,b_fullScripting(false)
- ,m_histSize(DEFAULT_HISTORY_SIZE)
- {
-@@ -321,7 +320,6 @@
-   kapp->dcopClient()->setDefaultObject( "konsole" );
- }
- 
--
- Konsole::~Konsole()
- {
-     while (detached.count()) {
-@@ -333,7 +331,7 @@
-     sessions.first();
-     while(sessions.current())
-     {
--      sessions.current()->closeSession();
-+      sessions.current()->sendSignal(SIGHUP);
-       sessions.next();
-     }
- 
-@@ -364,12 +362,6 @@
-    connect( kWinModule,SIGNAL(currentDesktopChanged(int)), this,SLOT(currentDesktopChanged(int)) );
- }
- 
--void Konsole::setAutoClose(bool on)
--{
--    if (sessions.first())
--       sessions.first()->setAutoClose(on);
--}
--
- void Konsole::showTip()
- {
-    KTipDialog::showTip(this,QString::null,true);
-@@ -394,8 +386,7 @@
- {
-    if (m_menuCreated) return;
-    //not longer needed
--   if (m_toolbarSessionsCommands)
--      disconnect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-+   disconnect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-    disconnect(m_session,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-    disconnect(m_options,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-    disconnect(m_help,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-@@ -405,15 +396,14 @@
-    disconnect(m_bookmarks,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-    disconnect(m_bookmarksSession,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-    //KONSOLEDEBUG<<"Konsole::makeGUI()"<<endl;
--   if (m_toolbarSessionsCommands)
--      connect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(loadScreenSessions()));
-+   connect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(loadScreenSessions()));
-    connect(m_session,SIGNAL(aboutToShow()),this,SLOT(loadScreenSessions()));
-    m_menuCreated=true;
- 
-    // Remove the empty separator Qt inserts if the menu is empty on popup,
-    // not sure if this will be "fixed" in Qt, for now use this hack (malte)
-    if(!(isRestored)) {
--     if (sender() && sender()->inherits("QPopupMenu") &&
-+     if (sender()->inherits("QPopupMenu") &&
-        static_cast<const QPopupMenu *>(sender())->count() == 1)
-        const_cast<QPopupMenu *>(static_cast<const QPopupMenu *>(sender()))->removeItemAt(0);
-        }
-@@ -593,8 +583,15 @@
-    m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day..."), 
-             this, SLOT(showTip()), 0, -1, 2);
- 
--   //the different session menus
--   buildSessionMenus();
-+   //the different session types
-+   loadSessionCommands();
-+   loadScreenSessions();
-+
-+   m_session->insertSeparator();
-+   m_closeSession->plug(m_session);
-+
-+   m_session->insertSeparator();
-+   m_quit->plug(m_session);
- 
-    connect(m_session, SIGNAL(activated(int)), SLOT(newSession(int)));
- 
-@@ -607,8 +604,7 @@
-    m_rightButton->insertItem(i18n("&Send Signal"), m_signals);
- 
-    m_rightButton->insertSeparator();
--   if (m_toolbarSessionsCommands)
--       m_rightButton->insertItem( i18n("New Sess&ion"), m_toolbarSessionsCommands );
-+   m_rightButton->insertItem( i18n("New Sess&ion"), m_toolbarSessionsCommands );
-    m_detachSession->plug(m_rightButton);
-    m_renameSession->plug(m_rightButton);
- 
-@@ -681,15 +677,12 @@
- void Konsole::makeBasicGUI()
- {
-   //KONSOLEDEBUG<<"Konsole::makeBasicGUI()"<<endl;
--  if (kapp->authorize("shell_access"))
--  {
--     KToolBarPopupAction *newsession = new KToolBarPopupAction(i18n("&New"), "filenew",
-+  KToolBarPopupAction *newsession = new KToolBarPopupAction(i18n("&New"), "filenew",
-                 0 , this, SLOT(newSession()),this, KStdAction::stdName(KStdAction::New));
--    newsession->plug(toolBar());
--    toolBar()->insertLineSeparator();
--    m_toolbarSessionsCommands = newsession->popupMenu();
--    connect(m_toolbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSessionToolbar(int)));
--  }
-+  newsession->plug(toolBar());
-+  toolBar()->insertLineSeparator();
-+  m_toolbarSessionsCommands = newsession->popupMenu();
-+  connect(m_toolbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSessionToolbar(int)));
- 
-   toolBar()->setFullSize( true );
- 
-@@ -715,8 +708,7 @@
-   // activating shortcuts here means deactivating them in the other
-   // programs.
- 
--  if (m_toolbarSessionsCommands)
--     connect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-+  connect(m_toolbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-   connect(m_session,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-   connect(m_options,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-   connect(m_help,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
-@@ -794,7 +786,7 @@
-   //help menu
-   m_help->setAccel(QKeySequence(),m_help->idAt(0));
- 
--  m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, this,
-+  m_closeSession = new KAction(i18n("&Close Session"), "fileclose", 0, this,
-                                SLOT(closeCurrentSession()), m_shortcuts, "close_session");
-   m_quit = new KAction(i18n("&Quit"), "exit", 0, this, SLOT( close() ), m_shortcuts, "quit");
- 
-@@ -856,13 +848,24 @@
-     // WABA: Don't close if there are any sessions left.
-     // Tell them to go away.
-     sessions.first();
-+    bool allOK=true;
-     while(sessions.current())
-     {
--      sessions.current()->closeSession();
-+      if (!sessions.current()->sendSignal(SIGHUP))
-+        allOK=false;
-       sessions.next();
-     }
- 
--    m_closeTimeout.start(1500, true);
-+    if (!allOK)
-+    {
-+      KMessageBox::information( this, i18n("Not all sessions could be closed. "
-+                                           "Please end all sessions running under other user IDs. "
-+                                           "In most cases typing 'exit' at the prompt will end them.") );
-+    }
-+    else
-+    {
-+      m_closeTimeout.start(1500, true);
-+    }
-     return false;
- }
- 
-@@ -877,7 +880,7 @@
-     {
-         while(sessions.first())
-         {
--            doneSession(sessions.current());
-+            doneSession(sessions.current(), 0);
-         }
-     }
- }
-@@ -1037,21 +1040,19 @@
-      s_word_seps= config->readEntry("wordseps",":@-./_~");
-      te->setWordCharacters(s_word_seps);
- 
--     te->setTerminalSizeHint( config->readBoolEntry("TerminalSizeHint",true) );
--     
-      b_framevis = config->readBoolEntry("has frame",true);
-      te->setFrameStyle( b_framevis?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame );
- 
-      te->setBlinkingCursor(config->readBoolEntry("BlinkingCursor",false));
-      te->setCtrlDrag(config->readBoolEntry("CtrlDrag",false));
--     te->setCutToBeginningOfLine(config->readBoolEntry("CutToBeginningOfLine",false));     
-+     te->setCutToBeginningOfLine(config->readBoolEntry("CutToBeginningOfLine",false));
-+     te->setTerminalSizeHint( config->readBoolEntry("TerminalSizeHint",true) );
-      te->setLineSpacing( config->readUnsignedNumEntry( "LineSpacing", 0 ) );
- 
-      monitorSilenceSeconds=config->readUnsignedNumEntry("SilenceSeconds", 10);
-      for (TESession *ses = sessions.first(); ses; ses = sessions.next())
-        ses->setMonitorSilenceSeconds(monitorSilenceSeconds);
-        
--     b_xonXoff = config->readBoolEntry("XonXoff",false);
-      config->setGroup("UTMP");
-      b_addToUtmp = config->readBoolEntry("AddToUtmp",true);
-      config->setDesktopGroup();
-@@ -1091,6 +1092,7 @@
-          //KONSOLEDEBUG << "Setting up transparency" << endl;
-          rootxpm->setFadeEffect(sch->tr_x(), QColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
-          rootxpm->start();
-+         rootxpm->repaint(true);
-       }
-       else
-       {
-@@ -1374,7 +1376,6 @@
- {
-   KGlobal::config()->reparseConfiguration();
-   readProperties(KGlobal::config(), QString::null, true);
--  buildSessionMenus();
- }
- 
- // --| color selection |-------------------------------------------------------
-@@ -1537,7 +1538,7 @@
-   if (URL.startsWith("file:")) {
-     newtext=URL.mid(5);
-     KRun::shellQuote(newtext);
--    te->emitText("\001\013cd "+newtext+"\r");
-+    te->emitText("cd "+newtext+"\r");
-   }
-   else if (URL.contains("://", true)) {
-     i = URL.find("://", 0);
-@@ -1915,8 +1916,8 @@
-   s->setMonitorSilenceSeconds(monitorSilenceSeconds);
-   s->enableFullScripting(b_fullScripting);
-   // If you add any new signal-slot connection below, think about doing it in konsolePart too
--  connect( s,SIGNAL(done(TESession*)),
--           this,SLOT(doneSession(TESession*)) );
-+  connect( s,SIGNAL(done(TESession*,int)),
-+           this,SLOT(doneSession(TESession*,int)) );
-   connect( te, SIGNAL(configureRequest(TEWidget*, int, int, int)),
-            this, SLOT(configureRequest(TEWidget*,int,int,int)) );
-   connect( s, SIGNAL( updateTitle() ),
-@@ -1943,7 +1944,6 @@
-   s->setTitle(txt);
-   s->setIconName(icon);
-   s->setAddToUtmp(b_addToUtmp);
--  s->setXonXoff(b_xonXoff);
- 
-   if (b_histEnabled && m_histSize)
-     s->setHistory(HistoryTypeBuffer(m_histSize));
-@@ -1996,7 +1996,7 @@
- 
- void Konsole::closeCurrentSession()
- {
--  se->closeSession();
-+  se->sendSignal(SIGHUP);
- }
- 
- void Konsole::doneChild(KonsoleChild* child, TESession* session)
-@@ -2010,7 +2010,7 @@
- //       this routine might be called before
- //       session swap is completed.
- 
--void Konsole::doneSession(TESession* s)
-+void Konsole::doneSession(TESession* s, int)
- {
- // qWarning("Konsole::doneSession(): Exited:%d ExitStatus:%d\n", WIFEXITED(status),WEXITSTATUS(status));
- #if 0 // die silently
-@@ -2239,28 +2239,6 @@
-   }
- }
- 
--void Konsole::buildSessionMenus()
--{
--   m_session->clear();
--   m_toolbarSessionsCommands->clear();
--
--   no2command.clear();
--   no2tempFile.clear();
--   no2filename.clear();
--
--   cmd_serial = 0;
--   cmd_first_screen = -1;
--
--   loadSessionCommands();
--   loadScreenSessions();
--
--   m_session->insertSeparator();
--   m_closeSession->plug(m_session);
--
--   m_session->insertSeparator();
--   m_quit->plug(m_session);
--}
--
- void Konsole::addSessionCommand(const QString &path)
- {
-   KSimpleConfig* co;
-@@ -2294,11 +2272,8 @@
-   no2filename.insert(cmd_serial,new QString(filename));
- }
- 
--
- void Konsole::loadSessionCommands()
- {
--  if (!kapp->authorize("shell_access"))
--     return;
-   addSessionCommand(QString::null);
-   m_session->insertSeparator();
-   m_toolbarSessionsCommands->insertSeparator();
-@@ -2338,8 +2313,6 @@
- 
- void Konsole::loadScreenSessions()
- {
--  if (!kapp->authorize("shell_access"))
--     return;
-   QCString screenDir = getenv("SCREENDIR");
-   if (screenDir.isEmpty())
-     screenDir = QFile::encodeName(QDir::homeDirPath()) + "/.screen/";
-@@ -2380,8 +2353,7 @@
-     for (int i = cmd_first_screen; i <= cmd_serial; ++i)
-     {
-       m_session->removeItem(i);
--      if (m_toolbarSessionsCommands)
--         m_toolbarSessionsCommands->removeItem(i);
-+      m_toolbarSessionsCommands->removeItem(i);
-       no2command.remove(i);
-       no2tempFile.remove(i);
-       no2filename.remove(i);
-@@ -2448,6 +2420,7 @@
- //        KONSOLEDEBUG << "Setting up transparency" << endl;
-     rootxpm->setFadeEffect(s->tr_x(), QColor(s->tr_r(), s->tr_g(), s->tr_b()));
-     rootxpm->start();
-+    rootxpm->repaint(true);
-   } else {
- //        KONSOLEDEBUG << "Stopping transparency" << endl;
-     rootxpm->stop();
-@@ -2469,8 +2442,8 @@
-   sessions.remove(se);
-   delete ra;
- 
--  disconnect( se,SIGNAL(done(TESession*)),
--              this,SLOT(doneSession(TESession*)) );
-+  disconnect( se,SIGNAL(done(TESession*,int)),
-+              this,SLOT(doneSession(TESession*,int)) );
- 
-   disconnect( se->getEmulation(),SIGNAL(ImageSizeChanged(int,int)), this,SLOT(notifySize(int,int)));
-   disconnect( se->getEmulation(),SIGNAL(changeColumns(int)), this,SLOT(changeColumns(int)) );
-@@ -2531,8 +2504,8 @@
-   connect(ktb,SIGNAL(doubleClicked(int)), this,SLOT(slotRenameSession(int)));
-   session2button.insert(session,ktb);
- 
--  connect( session,SIGNAL(done(TESession*)),
--           this,SLOT(doneSession(TESession*)) );
-+  connect( session,SIGNAL(done(TESession*,int)),
-+           this,SLOT(doneSession(TESession*,int)) );
- 
-   connect( session,SIGNAL(updateTitle()), this,SLOT(updateTitle()) );
-   connect( session,SIGNAL(notifySessionState(TESession*,int)), this,SLOT(notifySessionState(TESession*,int)) );
-Index: konsole/konsole/konsole.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole.h,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsole/konsole.h	1 Oct 2002 02:36:58 -0000	1.1.1.5
-+++ konsole/konsole/konsole.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -44,7 +44,7 @@
- #undef PACKAGE
- #undef VERSION
- #define PACKAGE "konsole"
--#define VERSION "1.2 Beta2"
-+#define VERSION "1.2 Beta"
- 
- class KRootPixmap;
- class QCheckBox;
-@@ -66,7 +66,6 @@
-   ~Konsole();
-   void setColLin(int columns, int lines);
-   void setFullScreen(bool on);
--  void setAutoClose(bool on);
-   void initFullScreen();
-   void initSessionFont(int fontNo);
-   void initSessionTitle(const QString &_title);
-@@ -121,7 +120,7 @@
-   void activateSession(TESession*);
-   void closeCurrentSession();
-   void doneChild(KonsoleChild*, TESession*);
--  void doneSession(TESession*);
-+  void doneSession(TESession*,int);
-   void slotCouldNotClose();
-   void slotToggleFullscreen();
-   void schema_menu_activated(int item);
-@@ -218,7 +217,6 @@
-   void setFont(int fontno);
- 
-   void clearSessionHistory(TESession & session);
--  void buildSessionMenus();
-   void addSessionCommand(const QString & path);
-   void loadSessionCommands();
-   void addScreenSession(const QString & socket);
-@@ -337,7 +335,6 @@
-   bool        isRestored:1;
-   bool        b_allowResize:1;
-   bool        b_addToUtmp:1;
--  bool        b_xonXoff:1;
- 
-   bool        b_histEnabled:1;
-   bool        b_fullScripting:1;
-Index: konsole/konsole/konsole_child.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole_child.cpp,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
---- konsole/konsole/konsole_child.cpp	1 Oct 2002 02:36:58 -0000	1.1.1.3
-+++ konsole/konsole/konsole_child.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -59,6 +59,7 @@
-     if (schema->useTransparency()) {
-       rootxpm->setFadeEffect(schema->tr_x(), QColor(schema->tr_r(), schema->tr_g(), schema->tr_b()));
-       rootxpm->start();
-+      rootxpm->repaint(true);
-       session_transparent=true;
-     } else {
-       rootxpm->stop();
-@@ -69,8 +70,8 @@
- 
-   updateTitle();
- 
--  connect( se,SIGNAL(done(TESession*)),
--           this,SLOT(doneSession(TESession*)) );
-+  connect( se,SIGNAL(done(TESession*,int)),
-+           this,SLOT(doneSession(TESession*,int)) );
-   connect( te, SIGNAL(configureRequest(TEWidget*, int, int, int)),
-            this, SLOT(configureRequest(TEWidget*, int, int, int)) );
- 
-@@ -114,7 +115,7 @@
-   renameSession->plug(m_rightButton);
- 
-   m_rightButton->insertSeparator();
--  KAction *closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, this,
-+  KAction *closeSession = new KAction(i18n("&Close Session"), "fileclose", 0, this,
-                                       SLOT(closeSession()), actions);
-   closeSession->plug(m_rightButton );
-   if (KGlobalSettings::insertTearOffHandle())
-@@ -181,7 +182,7 @@
-   m_rightButton->popup(te->mapToGlobal(QPoint(x,y)));
- }
- 
--void KonsoleChild::doneSession(TESession*)
-+void KonsoleChild::doneSession(TESession*,int)
- {
-   se->setConnect(false);
-   session_terminated=true;
-@@ -210,7 +211,7 @@
- 
- void KonsoleChild::closeSession()
- {
--  se->closeSession();
-+  se->sendSignal(SIGHUP);
- }
- 
- void KonsoleChild::pixmap_menu_activated(int item,QString pmPath)
-Index: konsole/konsole/konsole_child.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole_child.h,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- konsole/konsole/konsole_child.h	1 Oct 2002 02:36:58 -0000	1.1.1.2
-+++ konsole/konsole/konsole_child.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -44,7 +44,7 @@
- 
- private slots:
-   void configureRequest(TEWidget*,int,int,int);
--  void doneSession(TESession*);
-+  void doneSession(TESession*,int);
-   void updateTitle();
-   void slotRenameSession(TESession* ses, const QString &name);
-   void restoreAllListenToKeyPress();
-Index: konsole/konsole/konsole_grantpty.c
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole_grantpty.c,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
---- konsole/konsole/konsole_grantpty.c	1 Oct 2002 02:36:59 -0000	1.1.1.3
-+++ konsole/konsole/konsole_grantpty.c	16 Oct 2002 21:58:59 -0000	1.2
-@@ -175,12 +175,5 @@
-     return 1; /* FAIL */
-   }
- 
--  if (revoke(tty) < 0)
--  {
--    fprintf(stderr,"%s: cannot revoke %s.\n",argv[0],tty); perror("Reason");
--    return 1; /* FAIL */
--  }
--
--
-   return 0; /* OK */
- }
-Index: konsole/konsole/konsole_part.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole_part.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/konsole_part.cpp	1 Oct 2002 02:36:59 -0000	1.1.1.4
-+++ konsole/konsole/konsole_part.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -166,8 +166,8 @@
- 
-   setWidget(te);
-   se = new TESession(te,shell,eargs,"xterm");
--  connect( se,SIGNAL(done(TESession*)),
--           this,SLOT(doneSession(TESession*)) );
-+  connect( se,SIGNAL(done(TESession*,int)),
-+           this,SLOT(doneSession(TESession*,int)) );
-   connect( se,SIGNAL(openURLRequest(const QString &)),
-            this,SLOT(emitOpenURLRequest(const QString &)) );
-   connect( te,SIGNAL(configureRequest(TEWidget*,int,int,int)),
-@@ -222,14 +222,14 @@
-   connect( se, SIGNAL( destroyed() ), this, SLOT( sessionDestroyed() ) );
- }
- 
--void konsolePart::doneSession(TESession*)
-+void konsolePart::doneSession(TESession*,int)
- {
-   // see doneSession in konsole.cpp
-   if (se)
-   {
-     kdDebug(1211) << "doneSession - disconnecting done" << endl;;
--    disconnect( se,SIGNAL(done(TESession*)),
--                this,SLOT(doneSession(TESession*)) );
-+    disconnect( se,SIGNAL(done(TESession*,int)),
-+                this,SLOT(doneSession(TESession*,int)) );
-     se->setConnect(false);
-     //QTimer::singleShot(100,se,SLOT(terminate()));
-     kdDebug(1211) << "se->terminate()" << endl;;
-@@ -285,7 +285,7 @@
-       stat( QFile::encodeName( url.path() ), &buff );
-       QString text = ( S_ISDIR( buff.st_mode ) ? url.path() : url.directory() );
-       KRun::shellQuote(text);
--      text = QString::fromLatin1("\001\013cd ") + text + '\n';
-+      text = QString::fromLatin1("cd ") + text + '\n';
-       te->emitText( text );
-   }
- 
-@@ -498,6 +498,7 @@
-     //KONSOLEDEBUG << "Setting up transparency" << endl;
-     rootxpm->setFadeEffect(sch->tr_x(), QColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
-     rootxpm->start();
-+    rootxpm->repaint(true);
-   }
-   else {
-     rootxpm->stop();
-@@ -558,7 +559,7 @@
- 
- void konsolePart::closeCurrentSession()
- {
--  se->closeSession();
-+  sendSignal(SIGHUP);
- }
- 
- void konsolePart::slotToggleFrame()
-@@ -695,6 +696,7 @@
-   if (s->useTransparency()) {
-     rootxpm->setFadeEffect(s->tr_x(), QColor(s->tr_r(), s->tr_g(), s->tr_b()));
-     rootxpm->start();
-+    rootxpm->repaint(true);
-   }
-   else {
-     rootxpm->stop();
-Index: konsole/konsole/konsole_part.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/konsole_part.h,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/konsole_part.h	1 Oct 2002 02:36:59 -0000	1.1.1.4
-+++ konsole/konsole/konsole_part.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -77,7 +77,7 @@
-     virtual void guiActivateEvent( KParts::GUIActivateEvent * event );
- 
-  protected slots:
--    void doneSession(TESession*);
-+    void doneSession(TESession*,int);
-     void sessionDestroyed();
-     void configureRequest(TEWidget*,int,int x,int y);
-     void updateTitle();
-Index: konsole/konsole/main.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/main.cpp,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsole/main.cpp	1 Oct 2002 02:36:59 -0000	1.1.1.5
-+++ konsole/konsole/main.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -42,7 +42,6 @@
-    { "T <title>",       I18N_NOOP("Set the window title"), 0 },
-    { "tn <terminal>",   I18N_NOOP("Specify terminal type as set in the TERM\nenvironment variable"), "xterm" },
-    { "xwin",            I18N_NOOP("ignored"), 0 },
--   { "noclose",         I18N_NOOP("Do not close Konsole when command exits"), 0 },
-    { "nohist",          I18N_NOOP("Do not save lines in history"), 0 },
-    { "nomenubar",       I18N_NOOP("Do not display menubar"), 0 },
-    { "notoolbar",       I18N_NOOP("Do not display toolbar"), 0 },
-@@ -65,7 +64,6 @@
- static bool has_noxft = false;
- static bool login_shell = false;
- static bool full_script = false;
--static bool auto_close = true;
- 
- const char *konsole_shell(QStrList &args)
- {
-@@ -114,8 +112,6 @@
-             restartCommand.append("--ls");
-         if (full_script) 
-             restartCommand.append("--script");
--        if (!auto_close) 
--            restartCommand.append("--noclose");
-         sm.setRestartCommand(restartCommand);
-         return true;
-     }
-@@ -206,8 +202,10 @@
-   has_noxft = !args->isSet("xft");
-   TEWidget::setAntialias( !has_noxft );
- 
-+
-   KApplication a;
-   KImageIO::registerFormats(); // add io for additional image formats
-+  a.dcopClient()->setQtBridgeEnabled(false);
-   //2.1 secs
- 
-   QString title;
-@@ -252,10 +250,6 @@
-   scrollbaron = args->isSet("scrollbar");
-   wname = qtargs->getOption("name");
-   full_script = args->isSet("script");
--  auto_close = args->isSet("close");
--
--  if (!full_script)
--	a.dcopClient()->setQtBridgeEnabled(false);
- 
-   QCString type = "";
- 
-@@ -385,25 +379,21 @@
-           m->initMonitorSilence(sessionconfig->readBoolEntry(key,false));
-           key = QString("MasterMode%1").arg(counter);
-           m->initMasterMode(sessionconfig->readBoolEntry(key,false));
--                  counter++;
-+          counter++;
-         }
-+        m->activateSession( sessionconfig->readNumEntry("ActiveSession",0)+1 );
-         m->setDefaultSession( sessionconfig->readEntry("DefaultSession","shell.desktop") );
- 
-         ksm->konsole = m;
--        ksm->konsole->initFullScreen();
-         if ( !profile.isEmpty() ) {
-           ksm->konsole->setName( "konsole-mainwindow#1" );
-           ksm->konsole->applyMainWindowSettings(sessionconfig);
-           profile = "";
--          // Hack to work-around sessions initialized with minimum size
--          for (int i=1;i<=counter;i++)
--            m->activateSession( i );
-         }
-+	ksm->konsole->initFullScreen();
- 	// works only for the first one, but there won't be more.
-         n++;
--        m->activateSession( sessionconfig->readNumEntry("ActiveSession",0)+1 );
--        m->run();
--        m->setAutoClose(auto_close);
-+	m->run();
-     }
-   }
-   else
-@@ -429,11 +419,10 @@
-     m->show();
-     m->run();
-     m->showTipOnStart();
--    m->setAutoClose(auto_close);
-   }
- 
-   int ret = a.exec();
--
-+  
-  //// Temporary code, waiting for Qt to do this properly
- 
-   // Delete all toplevel widgets that have WDestructiveClose
-@@ -444,7 +433,7 @@
-      ++it;
-      if ( w->testWFlags( Qt::WDestructiveClose ) )
-           delete w;
--  }
-+  }  
- 
--  return ret;
-+  return ret;  
- }
-Index: konsole/konsole/session.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/session.cpp,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/session.cpp	1 Oct 2002 02:36:59 -0000	1.1.1.4
-+++ konsole/konsole/session.cpp	16 Oct 2002 21:58:59 -0000	1.2
-@@ -1,8 +1,6 @@
- #include "session.h"
- #include <kdebug.h>
- #include <dcopclient.h>
--#include <kmessagebox.h>
--#include <klocale.h>
- 
- #include <stdlib.h>
- #include <qfile.h>
-@@ -23,17 +21,15 @@
-     of the abilities of the framework - multible sessions.
- */
- 
--TESession::TESession(TEWidget* _te, const QString &_pgm, const QStrList & _args, const QString &_term,const QString &_sessionId, const QString &_initial_cwd)
-+TESession::TESession(TEWidget* _te, const QString &_pgm, QStrList & _args, const QString &_term,const QString &_sessionId, const QString &_initial_cwd)
-    : DCOPObject( _sessionId.latin1() )
-    , monitorActivity(false)
-    , monitorSilence(false)
-    , masterMode(false)
--   , autoClose(true)
-    , schema_no(0)
-    , font_no(3)
-    , silence_seconds(10)
-    , add_to_utmp(true)
--   , xon_xoff(false)
-    , pgm(_pgm)
-    , args(_args)
-    , sessionId(_sessionId)
-@@ -67,16 +63,8 @@
-   monitorTimer = new QTimer(this);
-   connect(monitorTimer, SIGNAL(timeout()), this, SLOT(monitorTimerDone()));
- 
--  connect( sh,SIGNAL(done(int)), this,SLOT(done()) );
-+  connect( sh,SIGNAL(done(int)), this,SLOT(done(int)) );
-   //kdDebug(1211)<<"TESession ctor() done"<<endl;
--  if (!sh->error().isEmpty())
--     QTimer::singleShot(0, this, SLOT(ptyError()));
--}
--
--void TESession::ptyError()
--{
--  KMessageBox::error(te->topLevelWidget(), sh->error());
--  emit done(this);
- }
- 
- void TESession::changeWidget(TEWidget* w)
-@@ -94,7 +82,6 @@
-   QString cwd_save = QDir::currentDirPath();
-   if (!initial_cwd.isEmpty())
-      QDir::setCurrent(initial_cwd);
--  sh->setXonXoff(xon_xoff);
-   sh->run(QFile::encodeName(pgm),args,term.latin1(), add_to_utmp,
-           ("DCOPRef("+appId+",konsole)").latin1(),
-           ("DCOPRef("+appId+","+sessionId+")").latin1());
-@@ -158,13 +145,7 @@
- 
- bool TESession::closeSession()
- {
--  autoClose = true;
--  if (!sh->isRunning() || !sendSignal(SIGHUP))
--  {
--     // Forced close.
--     QTimer::singleShot(0, this, SLOT(done()));
--  }
--  return true;
-+  return sendSignal(SIGHUP);
- }
- 
- void TESession::feedSession(const QString &text)
-@@ -192,8 +173,8 @@
- TESession::~TESession()
- {
-  //kdDebug(1211) << "disconnnecting..." << endl;
--  QObject::disconnect( sh, SIGNAL( done(int) ),
--                       this, SLOT( done() ) );
-+ QObject::disconnect( sh, SIGNAL( done( int ) ),
-+		      this, SLOT( done( int ) ) );
-   delete em;
-   delete sh;
- }
-@@ -209,15 +190,9 @@
-   em->setListenToKeyPress(l);
- }
- 
--void TESession::done()
-+void TESession::done(int status)
- {
--  if (!autoClose)
--  {
--    userTitle = i18n("<Finished>");
--    emit updateTitle();
--    return;
--  }
--  emit done(this);
-+  emit done(this,status);
- }
- 
- void TESession::terminate()
-@@ -392,11 +367,6 @@
-   add_to_utmp = set;
- }
- 
--void TESession::setXonXoff(bool set)
--{
--  xon_xoff = set;
--}
--
- bool TESession::processDynamic(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData)
- {
-     if (fullScripting)
-@@ -406,7 +376,7 @@
-         QString arg0;
-         QDataStream arg( data, IO_ReadOnly );
-         arg >> arg0;
--        feedSession(arg0);
-+        feedSession(arg0);         
-         replyType = "void";
-         return true;
-       }
-@@ -415,7 +385,7 @@
-         QString arg0;
-         QDataStream arg( data, IO_ReadOnly );
-         arg >> arg0;
--        sendSession(arg0);
-+        sendSession(arg0);         
-         replyType = "void";
-         return true;
-       }
-Index: konsole/konsole/session.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/session.h,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- konsole/konsole/session.h	1 Oct 2002 02:36:59 -0000	1.1.1.4
-+++ konsole/konsole/session.h	16 Oct 2002 21:58:59 -0000	1.2
-@@ -29,7 +29,7 @@
- public:
- 
-   TESession(TEWidget* w,
--            const QString &pgm, const QStrList & _args,
-+            const QString &pgm, QStrList & _args,
- 	    const QString &term, const QString &sessionId="session-1",
- 	    const QString &initial_cwd = QString::null);
-   void changeWidget(TEWidget* w);
-@@ -73,12 +73,9 @@
-   void setIconName(const QString& _iconName);
-   void setIconText(const QString& _iconText);
-   void setAddToUtmp(bool);
--  void setXonXoff(bool);
-   bool testAndSetStateIconName (const QString& newname);
-   bool sendSignal(int signal);
- 
--  void setAutoClose(bool b) { autoClose = b; }
--
-   // Additional functions for DCOP
-   bool closeSession();
-   void feedSession(const QString &text);
-@@ -92,14 +89,13 @@
- public slots:
- 
-   void run();
--  void done();
-+  void done(int status);
-   void terminate();
-   void setUserTitle( int, const QString &caption );
--  void ptyError();
- 
- signals:
- 
--  void done(TESession*);
-+  void done(TESession*, int);
-   void updateTitle();
-   void notifySessionState(TESession* session, int state);
- 
-@@ -122,7 +118,6 @@
-   bool           monitorActivity;
-   bool           monitorSilence;
-   bool           masterMode;
--  bool           autoClose;
-   QTimer*        monitorTimer;
- 
-   //FIXME: using the indices here
-@@ -137,7 +132,6 @@
-   QString        iconName;
-   QString        iconText; // as set by: echo -en '\033]1;IconText\007
-   bool           add_to_utmp;
--  bool           xon_xoff;
-   bool           fullScripting;
- 
-   QString	 stateIconName;
-Index: konsole/konsole/x-konsole.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/konsole/x-konsole.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/konsole/x-konsole.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/konsole/x-konsole.desktop	16 Oct 2002 21:58:59 -0000	1.2
-@@ -6,7 +6,7 @@
- Icon=konsole
- Patterns=*.shell;
- Comment=File to open a shell
--Comment[af]=lêer na open 'n tolk
-+Comment[af]=lêer aan open 'n tolk
- Comment[ar]=ملف لفتح سطر الأوامر
- Comment[az]=Qabığı açacaq fayl
- Comment[bg]=Файл за shell
-@@ -58,5 +58,5 @@
- Comment[xh]=Ifayile yokuvula iqokobhe
- Comment[xx]=xx
- Comment[zh_CN]=要打开 shell 的文件
--Comment[zh_TW]=要打開 shell 的檔案
-+Comment[zh_TW]=要打開 shell 的文件
- Comment[zu]=Ifayile yokuvula igobolodo
-Index: konsole/other/linux.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/linux.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/linux.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/linux.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -16,7 +16,6 @@
- Name[es]=Consola de Linux
- Name[et]=Linuxi konsool
- Name[eu]=Linux Konsola
--Name[fa]=کنسول لینوکس
- Name[fi]=Linux-konsoli
- Name[fr]=Console Linux
- Name[he]=מסוף לינוקס
-@@ -27,7 +26,6 @@
- Name[lt]=Linux konsolė
- Name[lv]=Linux Konsole
- Name[mt]=Konsol tal-Linux
--Name[nb]=Linux-konsoll
- Name[nn]=Linux-konsoll
- Name[pl]=Konsola linuksowa
- Name[pt]=Consola do Linux
-@@ -59,7 +57,6 @@
- Comment[es]=Nueva consola de Linux
- Comment[et]=Uus Linuxi konsool
- Comment[eu]=Linux Konsola Berria
--Comment[fa]=کنسول لینوکس جدید
- Comment[fi]=Uusi Linux-konsoli
- Comment[fr]=Nouvelle console Linux
- Comment[he]=מסוף לינוקס חדש
-@@ -70,7 +67,6 @@
- Comment[lt]=Nauja Linux konsolė
- Comment[lv]=Jauna Linux Konsole
- Comment[mt]=Konsol ġdid tal-Linux
--Comment[nb]=Ny Linux-konsoll
- Comment[nl]=Nieuwe linuxconsole
- Comment[nn]=Ny Linux-konsoll
- Comment[pl]=Konsola linuksowa (nowa)
-Index: konsole/other/mc.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/mc.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/mc.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/mc.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -35,7 +35,6 @@
- Comment[lt]=Naujas Midnight Commander
- Comment[lv]=Jauns Pusnakts Komandieris
- Comment[mt]=Midnight Commander ġdid
--Comment[nb]=Ny Midnight Commander
- Comment[nl]=nieuwe Midnight Commander
- Comment[nn]=Ny Midnight Commander
- Comment[pl]=Midnight Commander
-Index: konsole/other/screen.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/screen.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/screen.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/screen.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -10,7 +10,7 @@
- Name[cs]=Sezení
- Name[da]=Skærmsession
- Name[de]=Screen-Sitzung
--Name[el]=Σύνοδος screen
-+Name[el]=Σύνοδος Οθόνης
- Name[eo]=Seanco de komandinterpretilo "Screen"
- Name[et]=Screen'i seanss
- Name[eu]=Pantaila Sesioa
-@@ -24,7 +24,6 @@
- Name[lt]=Screen sesija
- Name[lv]=Ekrāna Sesija
- Name[mt]=Sessjoni ta' skrin
--Name[nb]=Skjermsesjon
- Name[nl]=Screen sessie
- Name[nn]=Skjermøkt
- Name[pl]=Sesja screena
-@@ -52,7 +51,7 @@
- Comment[cs]=Nové sezení
- Comment[da]=Ny skærmsession
- Comment[de]=Neue Sitzung des Terminal-Programms Screen
--Comment[el]=Νέα σύνοδος screen
-+Comment[el]=Νέα Σύνοδος Οθόνης
- Comment[eo]=Nova seanco de programo "Screen"
- Comment[es]=Nueva sesión de pantalla
- Comment[et]=Uus screen'i seanss
-@@ -67,7 +66,6 @@
- Comment[lt]=Nauja Screen sesija
- Comment[lv]=Jauna Ekrāna Sesija
- Comment[mt]=Sessjoni ġdida ta' skrin
--Comment[nb]=Ny skjermsesjon
- Comment[nl]=nieuwe screen sessie
- Comment[nn]=Ny skjermøkt
- Comment[pl]=Nowa sesja programu "screen"
-Index: konsole/other/shell.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/shell.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/shell.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/shell.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -9,8 +9,7 @@
- Name[da]=Skal
- Name[de]=Befehlsfenster
- Name[el]=Κέλυφος
--Name[es]=Terminal
--Name[fa]=پوسته
-+Name[es]=Intérprete de comandos
- Name[fi]=Komentotulkki
- Name[fr]=Terminal
- Name[he]=מעטפת
-@@ -50,7 +49,6 @@
- Comment[es]=Nuevo intérprete
- Comment[et]=Uus shell
- Comment[eu]=Shell Berria
--Comment[fa]=پوسته‌ی جدید
- Comment[fi]=Uusi komentotulkki
- Comment[fr]=Nouveau shell
- Comment[he]=מעטפת חדשה
-@@ -61,7 +59,6 @@
- Comment[lt]=Naujas apvalkalas
- Comment[lv]=Jauna Čaula
- Comment[mt]=Shell ġdid
--Comment[nb]=Nytt skall
- Comment[nl]=Nieuwe shell
- Comment[nn]=Nytt skal
- Comment[pl]=Powłoka
-Index: konsole/other/su.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/su.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/su.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/su.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -14,7 +14,6 @@
- Name[es]=Consola de root
- Name[et]=Administraatori konsool
- Name[eu]=Root Konsola
--Name[fa]=کنسول ریشه
- Name[fi]=Pääkäyttäjän konsoli
- Name[fr]=Console superutilisateur
- Name[he]=מסוף Root
-@@ -25,11 +24,10 @@
- Name[lt]=Root konsolė
- Name[lv]=Root Konsole
- Name[mt]=Konsol tar-root
--Name[nb]=Root-konsoll
- Name[nn]=Rotkonsoll
- Name[pl]=Konsola administratora
- Name[pt]=Consola como Root
--Name[pt_BR]=Console - Root
-+Name[pt_BR]=Console raiz
- Name[ro]=Consolă "root"
- Name[ru]=Root-консоль
- Name[sk]=Root konzola
-@@ -52,12 +50,11 @@
- Comment[cs]=Nová konzole superuživatele
- Comment[da]=Ny root-konsol
- Comment[de]=Neue Konsole für Benutzer root
--Comment[el]=Νέα κονσόλα Root
-+Comment[el]=Νέα Κονσόλα Root
- Comment[eo]=Nova sistemestro-konzolo
- Comment[es]=Nueva consola de root
- Comment[et]=Uus administraatori konsool
- Comment[eu]=Root Konsola Berria
--Comment[fa]=کنسول ریشه‌ی جدید
- Comment[fi]=Uusi pääkäyttäjän konsoli
- Comment[fr]=Nouvelle console superutilisateur
- Comment[he]=מסוף Root חדש
-@@ -68,12 +65,11 @@
- Comment[lt]=Nauja Root konsolė
- Comment[lv]=Jauna Superlietotāja Konsole
- Comment[mt]=Konsol ġdid root
--Comment[nb]=Ny Root-konsoll
- Comment[nl]=Nieuwe rootconsole
- Comment[nn]=Ny rotkonsoll
- Comment[pl]=Nowa konsola administratora
- Comment[pt]=Nova Consola como Root
--Comment[pt_BR]=Novo Console - Root
-+Comment[pt_BR]=Novo Console Raiz
- Comment[ro]=Consolă "root" nouă
- Comment[ru]=Новая root-консоль
- Comment[sk]=Nová rootovská konzola
-Index: konsole/other/su.kdelnk
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/su.kdelnk,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/su.kdelnk	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/su.kdelnk	16 Oct 2002 21:59:00 -0000	1.2
-@@ -16,7 +16,6 @@
- Name[es]=Administrador
- Name[et]=Administraator
- Name[eu]=Arduraduna
--Name[fa]=گرداننده
- Name[fi]=Pääkäyttäjä
- Name[fr]=Super-utilisateur
- Name[gl]=Administrador
-@@ -64,7 +63,6 @@
- Comment[es]=Consola del superusuario
- Comment[et]=Administraatori konsool
- Comment[eu]=Root Konsola
--Comment[fa]=کنسول ریشه
- Comment[fi]=Pääkäyttäjän konsoli
- Comment[fr]=Console superutilisateur
- Comment[gl]=Consola de Root
-@@ -86,7 +84,7 @@
- Comment[oc]=Consola arrel
- Comment[pl]=Konsola administratora
- Comment[pt]=Consola como root
--Comment[pt_BR]=Console - Root
-+Comment[pt_BR]=Console Raiz
- Comment[ro]=Consolă "root"
- Comment[ru]=Root-консоль
- Comment[sk]=Rootovská konzola
-Index: konsole/other/sumc.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/konsole/other/sumc.desktop,v
-retrieving revision 1.1.1.5
-retrieving revision 1.2
-diff -u -u -r1.1.1.5 -r1.2
---- konsole/other/sumc.desktop	1 Oct 2002 02:37:01 -0000	1.1.1.5
-+++ konsole/other/sumc.desktop	16 Oct 2002 21:59:00 -0000	1.2
-@@ -21,7 +21,7 @@
- Name[nn]=Midnight Commander for root
- Name[pl]=Midnight Commander  - tryb administratora
- Name[pt]=Midnight Commander como Root
--Name[pt_BR]=Midnight Commander - Root
-+Name[pt_BR]=Midnight Commander - raiz
- Name[ro]=Midnight Commander "root"
- Name[ru]=Root MC
- Name[sl]=Midnight Commander za root
-@@ -56,12 +56,11 @@
- Comment[lt]=Naujas Root Midnight Commander
- Comment[lv]=Jauns Root Pusnakts Komandieris
- Comment[mt]=Midnight Commander ġdid bħala root
--Comment[nb]=Ny Root Midnight Commander
- Comment[nl]=Nieuwe root Midnight Commander
- Comment[nn]=Ny Midnight Commander for root
- Comment[pl]=Midnight Commander - tryb administratora
- Comment[pt]=Novo Midnight Commander como Root
--Comment[pt_BR]=Nova Janela do Midnight Commander- Root
-+Comment[pt_BR]=Nova Janela Raiz para o Midnight Commander
- Comment[ro]=Midnight Commander "root" nouă
- Comment[ru]=Новое окно root MC
- Comment[sk]=Nový root Midnight Commander
-Index: kscreensaver/configure.in.in
-===================================================================
-RCS file: kscreensaver/configure.in.in
-diff -N kscreensaver/configure.in.in
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ kscreensaver/configure.in.in	7 Oct 2002 02:30:18 -0000	1.1
-@@ -0,0 +1 @@
-+DO_NOT_COMPILE="$DO_NOT_COMPILE kscreensaver"
-Index: ksmserver/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/ksmserver/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- ksmserver/Makefile.am	10 Jul 2002 03:24:29 -0000	1.1.1.2
-+++ ksmserver/Makefile.am	10 Jul 2002 03:42:59 -0000	1.3
-@@ -28,9 +28,9 @@
- ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel
- ksmserver_SOURCES = dummy.cpp
- 
--ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
-+ksmserver_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -avoid-version -module
- ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--ksmserver_la_LIBADD = $(LIB_KDEUI)
-+ksmserver_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP) $(LIBSM)
- ksmserver_LDADD = ksmserver.la
- 
- picsdir = $(kde_datadir)/ksmserver/pics
-Index: ksysguard/CContLib/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/ksysguard/CContLib/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -u -r1.1.1.2 -r1.2
---- ksysguard/CContLib/Makefile.am	10 Jul 2002 03:24:36 -0000	1.1.1.2
-+++ ksysguard/CContLib/Makefile.am	16 Sep 2002 14:31:34 -0000	1.2
-@@ -4,5 +4,3 @@
- include_HEADERS = ccont.h
- 
- libccont_a_SOURCES = ccont.c
--
--AM_CFLAGS = -ggdb
-Index: ksysguard/gui/SensorDisplayLib/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/ksysguard/gui/SensorDisplayLib/Makefile.am,v
-retrieving revision 1.1.1.3
-retrieving revision 1.2
-diff -u -u -r1.1.1.3 -r1.2
---- ksysguard/gui/SensorDisplayLib/Makefile.am	14 Aug 2002 14:27:16 -0000	1.1.1.3
-+++ ksysguard/gui/SensorDisplayLib/Makefile.am	16 Sep 2002 14:31:34 -0000	1.2
-@@ -4,8 +4,9 @@
-  
- lib_LTLIBRARIES = libsensordisplays.la
- 
--libsensordisplays_la_LDFLAGS = $(all_libraries)
--libsensordisplays_la_LIBADD = $(LIB_KDEUI)
-+libsensordisplays_la_LDFLAGS = $(all_libraries) -fno-common
-+libsensordisplays_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) \
-+	$(top_builddir)/ksysguard/gui/ksgrd/libksgrd.la
- 
- # Which sources should be compiled for the sensor display lib.
- libsensordisplays_la_SOURCES = \
-Index: ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc,v
-retrieving revision 1.1.1.4
-retrieving revision 1.3
-diff -u -u -r1.1.1.4 -r1.3
---- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc	1 Oct 2002 02:37:23 -0000	1.1.1.4
-+++ ksysguard/gui/SensorDisplayLib/SensorDisplay.cc	1 Oct 2002 03:01:48 -0000	1.3
-@@ -62,7 +62,6 @@
- 	pausedWhileHidden = false;
- 
- 	timerOn();
--	QWhatsThis::add(this, "dummy");
- 
- 	frame = new QGroupBox(2, Qt::Vertical, "", this, "displayFrame"); 
- 	Q_CHECK_PTR(frame);
-Index: ksysguard/gui/ksgrd/StyleEngine.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/ksysguard/gui/ksgrd/StyleEngine.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- ksysguard/gui/ksgrd/StyleEngine.h	25 Jun 2002 02:03:54 -0000	1.1.1.1
-+++ ksysguard/gui/ksgrd/StyleEngine.h	16 Sep 2002 14:31:34 -0000	1.2
-@@ -68,11 +68,12 @@
- 	}
- 	const QColor& getSensorColor(uint i)
- 	{
--		static QColor dummy;
--		if (i < sensorColors.count())
-+		if (i < sensorColors.count()) {
- 			return *(sensorColors.at(i));
--		else
-+		} else {
-+			QColor dummy;
- 			return dummy;
-+		}
- 	}
- 	uint getSensorColorCount() const
- 	{
-Index: kwin/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kwin/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- kwin/Makefile.am	10 Jul 2002 03:24:51 -0000	1.1.1.2
-+++ kwin/Makefile.am	10 Jul 2002 03:42:59 -0000	1.3
-@@ -9,7 +9,7 @@
- kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp  client.cpp main.cpp \
- 	popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
- 	killwindow.cpp kwinbutton.cpp
--kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
-+kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) $(LIB_KDECORE) $(LIB_X11) $(LIB_XEXT) $(LIB_DCOP) $(LIB_QT)
- kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- include_HEADERS = KWinInterface.h
-Index: kwin/kcmkwin/kwinoptions/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kwin/kcmkwin/kwinoptions/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.2
-diff -u -u -r1.1.1.4 -r1.2
---- kwin/kcmkwin/kwinoptions/Makefile.am	1 Oct 2002 02:37:36 -0000	1.1.1.4
-+++ kwin/kcmkwin/kwinoptions/Makefile.am	1 Oct 2002 12:06:42 -0000	1.2
-@@ -10,7 +10,7 @@
- kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
- 
--noinst_HEADERS = windows.h mouse.h 
-+noinst_HEADERS = windows.h mouse.h main.h
- 
- messages:
- 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
-Index: kwin/kcmkwin/kwinoptions/kwinoptions.desktop
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kwin/kcmkwin/kwinoptions/kwinoptions.desktop,v
-retrieving revision 1.1.1.3
-retrieving revision 1.3
-diff -u -u -r1.1.1.3 -r1.3
-Index: kwin/kcmkwin/kwinoptions/main.h
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kwin/kcmkwin/kwinoptions/main.h,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
-Index: kxkb/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/kxkb/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.6
-diff -u -u -r1.1.1.4 -r1.6
---- kxkb/Makefile.am	1 Oct 2002 02:37:38 -0000	1.1.1.4
-+++ kxkb/Makefile.am	1 Oct 2002 03:01:48 -0000	1.6
-@@ -19,8 +19,8 @@
- kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile
- 
- kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp
--kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile
-+kxkb_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -module -avoid-version
-+kxkb_la_LIBADD = -lX11 -lXext -lxkbfile $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_DCOP)
- 
- data_DATA = keyboard.desktop
- datadir = $(kde_appsdir)/Settings/Peripherals
-Index: legacyimport/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/legacyimport/Makefile.am,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- legacyimport/Makefile.am	14 Aug 2002 14:27:42 -0000	1.1.1.2
-+++ legacyimport/Makefile.am	14 Aug 2002 15:35:44 -0000	1.3
-@@ -4,8 +4,8 @@
- lib_LTLIBRARIES = klegacyimport.la
- 
- klegacyimport_la_SOURCES = legacyimport.cpp
--klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
--klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_KDECORE) $(LIB_QT)
-+klegacyimport_la_LDFLAGS = $(all_libraries) $(QT_LDFLAGS) -module -avoid-version
- 
- klegacyimport_SOURCES = dummy.cpp
- klegacyimport_LDADD   = klegacyimport.la
-Index: libkonq/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/libkonq/Makefile.am,v
-retrieving revision 1.1.1.4
-retrieving revision 1.5
-diff -u -u -r1.1.1.4 -r1.5
---- libkonq/Makefile.am	1 Oct 2002 02:37:43 -0000	1.1.1.4
-+++ libkonq/Makefile.am	1 Oct 2002 03:01:48 -0000	1.5
-@@ -20,8 +20,8 @@
- SUBDIRS = pics favicons
- 
- lib_LTLIBRARIES = libkonq.la
--libkonq_la_LDFLAGS = $(all_libraries) -version-info 5:0:1 -no-undefined
--libkonq_la_LIBADD = $(LIB_KPARTS)
-+libkonq_la_LDFLAGS = $(all_libraries) -version-info 5:0:1 -no-undefined $(QT_LDFLAGS)
-+libkonq_la_LIBADD = $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_QT) $(LIB_MCOP) $(LIB_KDEUI) $(LIB_KIO) $(LIB_DCOP) $(LIB_KDEFX)
- 
- libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
-    konq_xmlguiclient.cc\
-@@ -59,7 +59,7 @@
- kde_module_LTLIBRARIES = konq_sound.la
- konq_sound_la_SOURCES = konq_sound.cc
- konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--konq_sound_la_LIBADD = -lsoundserver_idl -lartskde
-+konq_sound_la_LIBADD = -lsoundserver_idl -lartskde $(LIB_KDECORE) $(LIB_QT) $(LIB_MCOP)
- 
- noinst_HEADERS = konq_sound.h
- 
-Index: libkonq/favicons/Makefile.am
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/libkonq/favicons/Makefile.am,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -u -r1.1.1.1 -r1.2
---- libkonq/favicons/Makefile.am	25 Jun 2002 02:03:55 -0000	1.1.1.1
-+++ libkonq/favicons/Makefile.am	25 Jun 2002 02:06:14 -0000	1.2
-@@ -2,8 +2,8 @@
- 
- INCLUDES = $(all_includes)
- kded_favicons_la_SOURCES = favicons.cpp favicons.skel
--kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kded_favicons_la_LIBADD = $(LIB_KSYCOCA)
-+kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
-+kded_favicons_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_DCOP) $(LIB_KDED)
- 
- METASOURCES = AUTO
- 
-Index: nsplugins/pluginscan.cpp
-===================================================================
-RCS file: /Volumes/src/cvs/od/proj/KDE-Darwin/kdebase/nsplugins/pluginscan.cpp,v
-retrieving revision 1.1.1.2
-retrieving revision 1.3
-diff -u -u -r1.1.1.2 -r1.3
---- nsplugins/pluginscan.cpp	14 Aug 2002 14:27:53 -0000	1.1.1.2
-+++ nsplugins/pluginscan.cpp	14 Aug 2002 15:35:44 -0000	1.3
-@@ -442,6 +442,7 @@
-         paths.append("/usr/lib/netscape/plugins");
-         paths.append("/usr/lib/netscape/plugins-libc5");
-         paths.append("/usr/lib/netscape/plugins-libc6");
-+        paths.append("@PREFIX@/lib/mozilla/plugins");
-         paths.append("/usr/lib/mozilla/plugins");
-         paths.append("$MOZILLA_HOME/plugins");
-         config->writeEntry( "scanPaths", paths );
Index: trunk/dports/x11/kdebase3/files/patch-kdebase3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdebase3/files/patch-kdebase3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdebase3/files/patch-kdebase3-3.1.darwin	(revision 1900)
@@ -0,0 +1,2329 @@
+
+--- startkde	1 Dec 2002 15:20:59 -0000	1.1.1.6
++++ startkde	12 Jan 2003 18:00:02 -0000	1.9
+@@ -34,6 +34,9 @@
+ # people's heads. We use colours from the standard KDE palette for those with
+ # palettised displays.
+ 
++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
++unset DYLD_FORCE_FLAT_NAMESPACE
++
+ test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
+ xsetroot -cursor_name left_ptr $bkg
+ 
+@@ -110,6 +113,11 @@
+     export GS_LIB
+ fi
+ 
++# if we're in Apple's X11 and the native window manager is available, use that
++if test -z "$KDEWM" && test -x /usr/X11R6/bin/quartz-wm; then
++    KDEWM="/usr/X11R6/bin/quartz-wm"
++fi
++
+ # Link "tmp" resource to directory in /tmp
+ # Creates a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
+ lnusertemp tmp >/dev/null
+@@ -128,7 +136,11 @@
+     # start only dcopserver, don't start whole kdeinit (takes too long)
+     echo 'startkde: Running kpersonalizer...'  1>&2
+     dcopserver
+-    kwin &
++    if test -n "$KDEWM"; then
++        $KDEWM &
++    else
++        kwin &
++    fi
+     kpersonalizer --before-session
+     # handle kpersonalizer restarts (language change)
+     while test $? -eq 1; do
+@@ -139,7 +151,6 @@
+     sleep 1
+ fi
+ 
+-# the splashscreen and progress indicator
+ ksplash
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+RCS file: debian/konsole.links
+diff -N debian/konsole.links
+RCS file: doc/kaddressbook/index.cache.bz2
+diff -N doc/kaddressbook/index.cache.bz2
+Binary files /dev/null and /tmp/cvs0AeqNE differ
+--- kate/app/Makefile.am	12 Nov 2002 04:16:41 -0000	1.1.1.4
++++ kate/app/Makefile.am	26 Nov 2002 21:00:50 -0000	1.10
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la
++lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la libkwrite_main.la
+ bin_PROGRAMS = kate kwrite
+ 
+ libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \
+@@ -7,34 +7,35 @@
+ 	kateviewmanager.cpp kateviewspace.cpp \
+ 	kateIface.skel kategrepdialog.cpp katefiledialog.cpp katemailfilesdialog.cpp \
+         kbookmarkhandler.cpp kactionselector.cpp katedockcontainer.cpp
++libkateinterfaces_la_LIBADD   = $(top_builddir)/kate/interfaces/libkateinterfacesprivate.la -lkscript $(top_builddir)/kate/lib/libkmultitabbar.la
++libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
+ 
+-libkateinterfaces_la_LIBADD   = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la
+-libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+-kate_la_SOURCES = katemain.cpp
+-kate_la_LIBADD = libkateinterfaces.la
+-kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version 
+-
+-kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp
+-kwrite_la_LIBADD   = -lktexteditor
+-kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kate_la_SOURCES = kate_la_main.cpp
++kate_la_LIBADD  = libkateinterfaces.la
++kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version -module
+ 
+-kate_SOURCES = dummy_kate.cpp
+-kate_LDADD = kate.la
+-kate_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++kate_la_main.cpp: katemain.cpp
++	cat katemain.cpp > kate_la_main.cpp
+ 
+-kwrite_SOURCES = dummy_kwrite.cpp
+-kwrite_LDADD = kwrite.la
+-kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp
++libkwrite_main_la_LIBADD  = -lktexteditor $(LIB_QT) -lkdecore -lDCOP -lkdeui -lkio -lkparts
++libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
++
++kwrite_la_SOURCES = kwrite_la_main.cpp
++kwrite_la_LIBADD  = libkwrite_main.la
++kwrite_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version -module
+ 
+-dummy_kate_la.cpp:
+-	echo > dummy_kate_la.cpp
++kwrite_la_main.cpp: kwrite_main.cpp
++	cat kwrite_main.cpp > kwrite_la_main.cpp
+ 
+-dummy_kate.cpp:
+-	echo > dummy_kate.cpp
++kate_SOURCES = katemain.cpp
++kate_LDADD = libkateinterfaces.la
++kate_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++
++kwrite_SOURCES = kwrite_main.cpp
++kwrite_LDADD = libkwrite_main.la
++kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+-dummy_kwrite.cpp:
+-	echo > dummy_kwrite.cpp
+-                         
+ METASOURCES = AUTO  
+   
+ INCLUDES= -I../interfaces -I$(srcdir)/../lib $(all_includes)
+RCS file: kate/app/kwrite_main.cpp
+diff -N kate/app/kwrite_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kate/app/kwrite_main.cpp	26 Nov 2002 21:00:50 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- kate/app/kwritemain.cpp	29 Oct 2002 03:02:50 -0000	1.1.1.5
++++ kate/app/kwritemain.cpp	26 Nov 2002 21:00:50 -0000	1.2
+@@ -538,7 +538,9 @@
+   { 0, 0, 0}
+ };
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+   KLocale::setMainCatalogue("kate");         //lukas: set this to have the kwritepart translated using kate message catalog
+ 
+--- kate/lib/Makefile.am	14 Aug 2002 14:26:30 -0000	1.1.1.2
++++ kate/lib/Makefile.am	26 Nov 2002 21:00:51 -0000	1.2
+@@ -5,7 +5,7 @@
+ lib_LTLIBRARIES = libkmultitabbar.la 
+ 
+ libkmultitabbar_la_SOURCES=kmultitabbar.cpp
+-libkmultitabbar_la_LDFLAGS = $(all_libraries) -no-undefined
++libkmultitabbar_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
+ libkmultitabbar_la_LIBADD = $(LIB_KPARTS)
+ 
+ METASOURCES = AUTO
+--- kcheckpass/checkpass_pam.c	25 Jun 2002 02:03:44 -0000	1.1.1.1
++++ kcheckpass/checkpass_pam.c	21 Nov 2002 21:28:36 -0000	1.2
+@@ -26,7 +26,12 @@
+  *****************************************************************/
+ #include <stdlib.h>
+ #include <string.h>
++
++#ifdef HAVE_PAM_PAM_APPL_H
++#include <pam/pam_appl.h>
++#else
+ #include <security/pam_appl.h>
++#endif
+ 
+ static const char *PAM_username;
+ static const char *PAM_password;
+--- kcontrol/access/Makefile.am	1 Oct 2002 02:33:58 -0000	1.1.1.3
++++ kcontrol/access/Makefile.am	26 Nov 2002 21:00:51 -0000	1.7
+@@ -4,16 +4,23 @@
+ 
+ bin_PROGRAMS = kaccess
+ 
+-kaccess_SOURCES = dummy.cpp
++kaccess_SOURCES = main.cpp
+ kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kaccess_LDADD = kaccess.la
++kaccess_LDADD = libkaccess_main.la
+ 
+ kde_module_LTLIBRARIES = kcm_access.la
+-lib_LTLIBRARIES = kaccess.la
++lib_LTLIBRARIES = kaccess.la libkaccess_main.la
+ 
+-kaccess_la_SOURCES = kaccess.cpp main.cpp
+-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kaccess_la_LIBADD = $(LIB_KDEUI)
++libkaccess_main_la_SOURCES = kaccess.cpp
++libkaccess_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkaccess_main_la_LIBADD  = $(LIB_KDEUI) $(LIB_QT) -lkdecore -lDCOP
++
++kaccess_la_SOURCES = kaccess_la_main.cpp
++kaccess_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kaccess_la_LIBADD = libkaccess_main.la
++
++kaccess_la_main.cpp: main.cpp
++	cat main.cpp > kaccess_la_main.cpp
+ 
+ kcm_access_la_SOURCES = kcmaccess.cpp 
+ kcm_access_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+@@ -32,6 +39,3 @@
+ messages:
+ 	$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
+ 	$(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kcontrol/info/Makefile.am	25 Jun 2002 02:03:45 -0000	1.1.1.1
++++ kcontrol/info/Makefile.am	24 Nov 2002 07:11:28 -0000	1.4
+@@ -2,7 +2,7 @@
+ 
+ kcm_info_la_SOURCES = main.cpp memory.cpp
+ 
+-kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
++kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO)
+ kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO)
+ 
+ INCLUDES= $(all_includes)
+--- kcontrol/info/info.cpp	14 Jan 2003 20:08:39 -0000	1.1.1.4
++++ kcontrol/info/info.cpp	14 Jan 2003 20:44:11 -0000	1.5
+@@ -472,6 +472,8 @@
+ #include "info_svr4.cpp"
+ #elif _AIX
+ #include "info_aix.cpp"
++#elif defined(__APPLE__)
++#include "info_osx.cpp"
+ #else
+ #include "info_generic.cpp"	/* Default for unsupportet systems.... */
+ #endif
+RCS file: kcontrol/info/info_osx.cpp
+diff -N kcontrol/info/info_osx.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kcontrol/info/info_osx.cpp	25 Jun 2002 02:06:13 -0000	1.1
+@@ -0,0 +1,163 @@
++/*
++ * kdebase3-3.0.1-3.patch,v 1.2 2002/06/24 01:48:12 ranger Exp
++ *
++ * info_fbsd.cpp is part of the KDE program kcminfo.  This displays
++ * various information about the system (hopefully a FreeBSD system)
++ * it's running on.
++ */
++
++#define INFO_CPU_AVAILABLE
++//#define INFO_IRQ_AVAILABLE
++//#define INFO_DMA_AVAILABLE
++//#define INFO_PCI_AVAILABLE
++//#define INFO_IOPORTS_AVAILABLE
++#define INFO_SOUND_AVAILABLE
++#define INFO_DEVICES_AVAILABLE
++#define INFO_SCSI_AVAILABLE
++#define INFO_PARTITIONS_AVAILABLE
++#define INFO_XSERVER_AVAILABLE
++
++/*
++ * all following functions should return TRUE, when the Information
++ * was filled into the lBox-Widget. Returning FALSE indicates that
++ * information was not available.
++ */
++
++#include <sys/types.h>
++#include <sys/sysctl.h>
++
++#include <fstab.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#include <iostream.h>
++
++#include <qdict.h>
++#include <qfile.h>
++#include <qfontmetrics.h>
++#include <qptrlist.h>
++#include <qstring.h>
++#include <qtextstream.h>
++
++#include <kdebug.h>
++
++#include <mach/mach.h>
++#include <mach-o/arch.h>
++
++#ifdef HAVE_COREAUDIO
++#include <CoreAudio/CoreAudio.h>
++#endif
++
++#include <machine/limits.h>
++
++bool GetInfo_CPU (QListView *lBox)
++{
++
++	QString cpustring;
++
++        kern_return_t ret;
++        struct host_basic_info basic_info;
++        unsigned int count=HOST_BASIC_INFO_COUNT;
++
++        ret=host_info(mach_host_self(), HOST_BASIC_INFO, 
++                (host_info_t)&basic_info, &count);
++        if (ret != KERN_SUCCESS) {
++		kdDebug() << "unable to get host information from mach" << endl;
++		return false;
++        } else {
++		kdDebug() << "got Host Info: (" << basic_info.avail_cpus << ") CPUs available" << endl;
++        	const NXArchInfo *archinfo;
++        	archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type, basic_info.cpu_subtype);
++		new QListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus));
++		for (int i = 1; i <= basic_info.avail_cpus; i++) {
++			cpustring = i18n("CPU %1: %2").arg(i).arg(archinfo->description);
++			new QListViewItem(lBox, cpustring);
++		}
++		return true;
++	}
++	return false;
++}
++
++bool GetInfo_IRQ (QListView *)
++{
++	return false;
++}
++
++bool GetInfo_DMA (QListView *)
++{
++	return false;
++}
++
++bool GetInfo_PCI (QListView *)
++{
++	return false;
++}
++
++bool GetInfo_IO_Ports (QListView *)
++{
++	return false;
++}
++
++bool GetInfo_Sound (QListView *lBox)
++{
++#ifdef HAVE_COREAUDIO
++#define kMaxStringSize 1024
++	OSStatus status;
++	AudioDeviceID gOutputDeviceID;
++	unsigned long propertySize;
++	char deviceName[kMaxStringSize];
++	char manufacturer[kMaxStringSize];
++	propertySize = sizeof(gOutputDeviceID);
++	status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &gOutputDeviceID);
++	if (status) {
++		kdDebug() << "get default output device failed, status = " << (int)status << endl;
++		return false;
++	}
++
++	if (gOutputDeviceID != kAudioDeviceUnknown) {
++
++		propertySize = kMaxStringSize;
++
++		/* Device Name */
++		status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceName, &propertySize, deviceName);
++		if (status) {
++			kdDebug() << "get device name failed, status = " << (int)status << endl;
++			return false;
++		}
++		new QListViewItem(lBox, i18n("Device Name: %1").arg(deviceName));
++
++		/* Manufacturer */
++		status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer);
++		if (status) {
++			kdDebug() << "get manufacturer failed, status = " << (int)status << endl;
++			return false;
++		}
++		new QListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer));
++		return true;
++	} else {
++		return false;
++	}
++#else
++	return false;
++#endif
++}
++
++bool GetInfo_SCSI (QListView *lbox)
++{
++	return false;
++}
++
++bool GetInfo_Partitions (QListView *lbox)
++{
++	return false;
++}
++
++bool GetInfo_XServer_and_Video (QListView *lBox)
++{
++	return GetInfo_XServer_Generic( lBox );
++}
++
++bool GetInfo_Devices (QListView *lbox)
++{
++	return false;
++}
+--- kcontrol/info/memory.cpp	1 Oct 2002 02:34:08 -0000	1.1.1.4
++++ kcontrol/info/memory.cpp	1 Oct 2002 03:01:46 -0000	1.5
+@@ -431,6 +431,8 @@
+ 
+ #ifdef __linux__
+ #include "memory_linux.cpp"
++#elif defined(__APPLE__)
++#include "memory_osx.cpp"
+ #elif sgi
+ #include "memory_sgi.cpp"
+ #elif defined(__svr4__) && defined(sun)
+RCS file: kcontrol/info/memory_osx.cpp
+diff -N kcontrol/info/memory_osx.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kcontrol/info/memory_osx.cpp	25 Jun 2002 02:06:13 -0000	1.1
+@@ -0,0 +1,72 @@
++#include <unistd.h>
++#include <stdlib.h>
++#include <qfile.h>
++#include <mach/mach_init.h>
++#include <mach/mach_host.h>
++#include <mach/host_info.h>
++#include <sys/stat.h>
++#include <dirent.h>
++#include <kdebug.h>
++
++void KMemoryWidget::update()
++{
++
++	vm_statistics_data_t vm_info;
++	mach_msg_type_number_t info_count;
++	DIR *dirp;
++	struct dirent *dp;
++	off_t total;
++
++	info_count = HOST_VM_INFO_COUNT;
++	if (host_statistics(mach_host_self (), HOST_VM_INFO, (host_info_t)&vm_info, &info_count)) {
++		kdDebug() << "could not get memory statistics" << endl;
++		return;
++	}
++
++	Memory_Info[TOTAL_MEM]    = (vm_info.active_count + vm_info.inactive_count +
++		vm_info.free_count + vm_info.wire_count) * vm_page_size;
++	Memory_Info[FREE_MEM]     = vm_info.free_count * vm_page_size;
++	Memory_Info[SHARED_MEM]   = NO_MEMORY_INFO;
++	Memory_Info[BUFFER_MEM]   = NO_MEMORY_INFO;
++	Memory_Info[CACHED_MEM]   = NO_MEMORY_INFO;
++
++	dirp = opendir("/private/var/vm");
++	if (!dirp) {
++		kdDebug() << "unable to open /private/var/vm" << endl;
++		return;
++	}
++
++	total = 0;
++
++	while ((dp = readdir (dirp)) != NULL) {
++		struct stat sb;
++		char fname [MAXNAMLEN];
++
++		if (strncmp (dp->d_name, "swapfile", 8))
++			continue;
++
++		strcpy (fname, "/private/var/vm/");
++		strcat (fname, dp->d_name);
++		if (stat (fname, &sb) < 0)
++			continue;
++
++		total += sb.st_size;
++	}
++	closedir (dirp);
++
++	info_count = HOST_VM_INFO_COUNT;
++	if (host_statistics (mach_host_self (), HOST_VM_INFO,
++		(host_info_t) &vm_info, &info_count)) {
++			kdDebug() << "unable to get VM info" << endl;
++	}
++
++	Memory_Info[SWAP_MEM]     = total;
++	// off_t used = (vm_info.pageouts - vm_info.pageins) * vm_page_size;
++	Memory_Info[FREESWAP_MEM] = NO_MEMORY_INFO;
++
++	/* free = vm_info.free_count * vm_page_size;
++	   used = vm_info.active_count * vm_page_size;
++	   total = (vm_info.active_count + vm_info.inactive_count +
++		vm_info.free_count + vm_info.wire_count) * vm_page_size; */
++
++}
+--- kcontrol/kcontrol/Makefile.am	4 Jan 2003 04:47:31 -0000	1.1.1.6
++++ kcontrol/kcontrol/Makefile.am	4 Jan 2003 05:34:12 -0000	1.10
+@@ -22,43 +22,69 @@
+ 
+ SUBDIRS = . pics
+ 
+-CLEANFILES = dummy.cpp
+-
+ bin_PROGRAMS = kcontrol kcmshell kcminit
+-lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
++lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la kcmshell.la libkcminit_main.la kcminit.la
+ 
+-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
++libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
+ 	helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \
+ 	modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
+ 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+ 	kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel
++libkcontrol_main_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP -lkdefx
++libkcontrol_main_la_LDFLAGS = $(all_libraries) -avoid-version
++
++kcontrol_la_SOURCES = kcontrol_la_main.cpp
++kcontrol_la_LIBADD  = libkcontrol_main.la
++kcontrol_la_LDFLAGS = $(all_libraries) -avoid-version -module
+ 
+-kcontrol_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
+-kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kcontrol_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcontrol_la_main.cpp
+ 
+-kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
++libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
+ 			proxywidget.cpp kcdialog.cpp global.cpp \
+ 			kcdialog.skel
+-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+-kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP
++libkcmshell_main_la_LDFLAGS = $(all_libraries) -avoid-version
++
++kcmshell_la_SOURCES = kcmshell_la_main.cpp
++kcmshell_la_LIBADD = libkcmshell_main.la
++kcmshell_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++kcmshell_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcmshell_la_main.cpp
++
++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp
++libkcminit_main_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP
++libkcminit_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
++kcminit_la_SOURCES = kcminit_la_main.cpp
++kcminit_la_LIBADD  = libkcminit_main.la
++kcminit_la_LDFLAGS = $(all_libraries) -avoid-version -module
+ 
+-kcminit_la_SOURCES = kcminit.cpp global.cpp
+-kcminit_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
+-kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kcminit_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcminit_la_main.cpp
+ 
+-kcontrol_SOURCES = dummy.cpp
+-kcontrol_LDADD = kcontrol.la
++kcontrol_SOURCES = kcontrol_main.cpp
++kcontrol_LDADD = libkcontrol_main.la
+ kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcmshell_SOURCES = dummy.cpp
+-kcmshell_LDADD = kcmshell.la
++kcontrol_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcontrol_main.cpp
++
++kcmshell_SOURCES = kcmshell_main.cpp
++kcmshell_LDADD = libkcmshell_main.la
+ kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcminit_SOURCES = dummy.cpp
+-kcminit_LDADD = kcminit.la
++kcmshell_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcmshell_main.cpp
++
++kcminit_SOURCES = kcminit_main.cpp
++kcminit_LDADD = libkcminit_main.la
+ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
++kcminit_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcminit_main.cpp
++
+ rccontroldir = $(kde_datadir)/kcontrol
+ rccontrol_DATA = kcontrolui.rc
+ rcinfodir = $(kde_datadir)/kinfocenter
+@@ -81,6 +107,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kcontrol/kcontrol/kcminit.cpp	25 Jun 2002 02:03:45 -0000	1.1.1.1
++++ kcontrol/kcontrol/kcminit.cpp	26 Nov 2002 21:00:51 -0000	1.2
+@@ -59,7 +59,9 @@
+     return false;
+ }
+ 
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char *argv[])
+ {
+   KLocale::setMainCatalogue("kcontrol");
+   KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
+--- kcontrol/kcontrol/kcmshell.cpp	14 Aug 2002 14:29:19 -0000	1.1.1.2
++++ kcontrol/kcontrol/kcmshell.cpp	26 Nov 2002 21:00:51 -0000	1.2
+@@ -129,8 +129,9 @@
+         quit();
+ }
+ 
++extern "C" int kdemain(int, char**);
+ 
+-int main(int _argc, char *_argv[])
++int kdemain(int _argc, char *_argv[])
+ {
+     KAboutData aboutData( "kcmshell", I18N_NOOP("KDE Control Module"),
+                           KCONTROL_VERSION,
+--- kcontrol/kcontrol/main.cpp	1 Oct 2002 02:34:11 -0000	1.1.1.4
++++ kcontrol/kcontrol/main.cpp	26 Nov 2002 21:00:51 -0000	1.2
+@@ -86,7 +86,9 @@
+   delete toplevel;
+ }
+ 
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+   KLocale::setMainCatalogue("kcontrol");
+   KAboutData aboutKControl( "kcontrol", I18N_NOOP("KDE Control Center"),
+RCS file: kcontrol/kcontrol/stub_main.cpp
+diff -N kcontrol/kcontrol/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kcontrol/kcontrol/stub_main.cpp	26 Nov 2002 21:00:51 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kcontrol/kfontinst/kfontinst/FontEngine.cpp	10 Dec 2002 16:41:01 -0000	1.1.1.5
++++ kcontrol/kfontinst/kfontinst/FontEngine.cpp	10 Dec 2002 18:10:21 -0000	1.6
+@@ -26,6 +26,8 @@
+ // (C) Craig Drummond, 2001
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#include "config.h"
++
+ #include "FontEngine.h"
+ #if !defined KFI_THUMBNAIL && !defined KFI_METAINFO
+ #include "KfiGlobal.h"
+--- kdeprint/kjobviewer/Makefile.am	25 Jun 2002 02:03:49 -0000	1.1.1.1
++++ kdeprint/kjobviewer/Makefile.am	26 Nov 2002 21:00:51 -0000	1.5
+@@ -4,13 +4,13 @@
+ lib_LTLIBRARIES = kjobviewer.la
+ 
+ kjobviewer_SOURCES = dummy.cpp
+-kjobviewer_LDADD = kjobviewer.la
++kjobviewer_LDADD = -lkdeprint_management $(LIB_KDEUI) $(LIB_QT) -lkdecore -lDCOP -lkdeprint
+ kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
+ kjobviewer_la_METASOURCES = AUTO
+-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+-kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
++kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) $(LIB_QT) -lkdecore -lDCOP -lkdeprint
++kjobviewer_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -module
+ 
+ noinst_HEADERS = kjobviewer.h
+ 
+@@ -22,8 +22,8 @@
+ desktop_DATA = kjobviewer.desktop
+ desktopdir = $(kde_appsdir)/Utilities
+ 
+-dummy.cpp:
+-	echo > dummy.cpp
++dummy.cpp: main.cpp
++	cat main.cpp > dummy.cpp
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot
+--- kdeprint/kprinter/Makefile.am	10 Jul 2002 03:20:23 -0000	1.1.1.2
++++ kdeprint/kprinter/Makefile.am	26 Nov 2002 21:00:51 -0000	1.5
+@@ -4,12 +4,12 @@
+ lib_LTLIBRARIES = kprinter.la
+ 
+ kprinter_SOURCES = dummy.cpp
+-kprinter_LDADD = kprinter.la
++kprinter_LDADD = -lkdeprint $(LIB_QT) -lkdecore -lDCOP -lkdeui -lkio
+ kprinter_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ kprinter_la_SOURCES = main.cpp printwrapper.cpp
+-kprinter_la_LIBADD = -lkdeprint
+-kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
++kprinter_la_LIBADD = -lkdeprint $(LIB_QT) -lkdecore -lDCOP -lkdeui -lkio
++kprinter_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -module
+ kprinter_METASOURCES = AUTO
+ 
+ noinst_HEADERS = printwrapper.h
+@@ -17,5 +17,5 @@
+ messages:
+ 	$(XGETTEXT) *.cpp -o $(podir)/kprinter.pot
+ 
+-dummy.cpp:
+-	echo > dummy.cpp
++dummy.cpp: main.cpp
++	cat main.cpp > dummy.cpp
+--- kdesktop/Makefile.am	1 Oct 2002 02:35:37 -0000	1.1.1.3
++++ kdesktop/Makefile.am	26 Nov 2002 21:00:51 -0000	1.3
+@@ -1,10 +1,6 @@
+ ## Makefile.am of kdebase/kdesktop
+ 
+ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
+-kdesktop_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kdesktop_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
+-kdesktop_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+-kdesktop_LDADD    = kdesktop.la
+ 
+ SUBDIRS = . lock pics patterns programs init kwebdesktop
+ 
+@@ -12,15 +8,29 @@
+ 
+ bin_PROGRAMS = kdesktop
+ bin_SCRIPTS = kdeeject
+-lib_LTLIBRARIES = kdesktop.la
++lib_LTLIBRARIES = kdesktop.la libkdesktop_main.la
+ 
+-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
++libkdesktop_main_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) -avoid-version
++libkdesktop_main_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
++libkdesktop_main_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
+ 	lockeng.cc KDesktopIface.skel \
+ 	bgmanager.cc init.cc KScreensaverIface.skel \
+ 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+ 	startupid.cpp
+ 
+-kdesktop_SOURCES = dummy.cc
++kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version -module
++kdesktop_la_LIBADD  = libkdesktop_main.la
++kdesktop_la_SOURCES = kdesktop_la_main.cpp
++
++kdesktop_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kdesktop_la_main.cpp
++
++kdesktop_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
++kdesktop_LDADD    = libkdesktop_main.la
++kdesktop_SOURCES  = kdesktop_main.cpp
++
++kdesktop_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kdesktop_main.cpp
+ 
+ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
+ 
+--- kdesktop/main.cc	1 Dec 2002 15:24:10 -0000	1.1.1.4
++++ kdesktop/main.cc	1 Dec 2002 15:43:46 -0000	1.3
+@@ -77,7 +77,9 @@
+         kapp->quit(); // turn catchable signals into clean shutdown
+ }
+ 
+-int main( int argc, char **argv )
++extern "C" int kdemain(int, char**);
++
++int kdemain( int argc, char **argv )
+ {
+     //setup signal handling
+     signal(SIGTERM, signalHandler);
+RCS file: kdesktop/stub_main.cpp
+diff -N kdesktop/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kdesktop/stub_main.cpp	26 Nov 2002 21:00:51 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kdm/backend/client.c	29 Oct 2002 03:04:57 -0000	1.1.1.3
++++ kdm/backend/client.c	21 Nov 2002 21:28:42 -0000	1.2
+@@ -38,6 +38,7 @@
+  * user verification and session initiation.
+  */
+ 
++#include <config.h>
+ #include "dm.h"
+ #include "dm_auth.h"
+ #include "dm_error.h"
+@@ -59,7 +60,11 @@
+ # endif
+ #endif
+ #ifdef USE_PAM
+-# include <security/pam_appl.h>
++#ifdef HAVE_PAM_PAM_APPL_H
++#include <pam/pam_appl.h>
++#else
++#include <security/pam_appl.h>
++#endif
+ #elif defined(AIXV3) /* USE_PAM */
+ # include <login.h>
+ # include <usersec.h>
+--- kdm/backend/dm.h	29 Oct 2002 03:04:57 -0000	1.1.1.4
++++ kdm/backend/dm.h	29 Oct 2002 03:39:31 -0000	1.4
+@@ -41,6 +41,10 @@
+ #ifndef _DM_H_
+ #define _DM_H_ 1
+ 
++#ifdef __APPLE__
++#define CSRG_BASED
++#endif
++
+ #include "greet.h"
+ 
+ #include <X11/Xos.h>
+--- khotkeys/khotkeys/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ khotkeys/khotkeys/Makefile.am	26 Nov 2002 21:00:52 -0000	1.5
+@@ -1,15 +1,25 @@
+ # $Id: Makefile.am,v 1.12 2002/02/12 14:32:08 ellis Exp $
+ 
+ bin_PROGRAMS = khotkeys
+-lib_LTLIBRARIES = khotkeys.la
++lib_LTLIBRARIES = khotkeys.la libkhotkeys_main.la
+ 
+-khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
+-khotkeys_la_LIBADD   = ../shared/libshared.la $(LIB_KSYCOCA)
+-khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
++libkhotkeys_main_la_LIBADD  = ../shared/libshared.la $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP
++libkhotkeys_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
+-khotkeys_SOURCES = dummy.cpp
+-khotkeys_LDADD   = khotkeys.la
++khotkeys_la_SOURCES = khotkeys_la_main.cpp
++khotkeys_la_LIBADD  = libkhotkeys_main.la
++khotkeys_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++khotkeys_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > khotkeys_la_main.cpp
++
++khotkeys_SOURCES = khotkeys_main.cpp
++khotkeys_LDADD = libkhotkeys_main.la
+ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++khotkeys_main.cpp: stub_main.cpp
++	cat stub_main.cpp > khotkeys_main.cpp
+ 
+ autostart_DATA = khotkeys.desktop
+ autostartdir = $(prefix)/share/autostart
+--- khotkeys/khotkeys/main.cpp	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ khotkeys/khotkeys/main.cpp	26 Nov 2002 21:00:52 -0000	1.2
+@@ -28,8 +28,9 @@
+ // for multihead
+ int khotkeys_screen_number = 0;
+ 
++extern "C" int kdemain(int, char**);
+ 
+-int main( int argc, char** argv )
++int kdemain( int argc, char** argv )
+ {                             // no need to i18n these, no GUI
+     {
+ 	// multiheaded hotkeys
+RCS file: khotkeys/khotkeys/stub_main.cpp
+diff -N khotkeys/khotkeys/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ khotkeys/khotkeys/stub_main.cpp	26 Nov 2002 21:00:52 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kicker/Makefile.am	10 Jul 2002 03:21:29 -0000	1.1.1.2
++++ kicker/Makefile.am	29 Nov 2002 18:19:36 -0000	1.6
+@@ -3,18 +3,22 @@
+ SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data
+ 
+ bin_PROGRAMS = kicker
+-lib_LTLIBRARIES = kicker.la
++lib_LTLIBRARIES = kicker.la libkicker_shared.la
+ 
+-CLEANFILES = dummy.cpp dummy_la.cpp
++CLEANFILES = libkicker_shared_la_dummy.cpp kicker_la_dummy.cpp kicker_dummy.cpp
+ 
+-kicker_la_LIBADD = core/libkicker_core.la  buttons/libkicker_buttons.la \
++libkicker_shared_la_LIBADD = core/libkicker_core.la  buttons/libkicker_buttons.la \
+ 	ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO) 
+ 
+-kicker_la_SOURCES = dummy.cpp
+-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries)
++libkicker_shared_la_SOURCES = libkicker_shared_la_dummy.cpp
++libkicker_shared_la_LDFLAGS = $(KDE_RPATH) -no-undefined -avoid-version $(all_libraries)
+ 
+-kicker_LDADD = kicker.la
+-kicker_SOURCES = dummy_la.cpp
++kicker_la_LIBADD  = libkicker_shared.la
++kicker_la_SOURCES = kicker_la_dummy.cpp
++kicker_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++
++kicker_LDADD = libkicker_shared.la
++kicker_SOURCES = kicker_dummy.cpp
+ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ autostart_DATA = panel.desktop
+@@ -26,7 +30,7 @@
+ messages:
+ 	$(XGETTEXT) share/*.cpp buttons/*.cpp core/*.cpp ui/*.cpp -o $(podir)/kicker.pot
+ 
+-dummy.cpp dummy_la.cpp:
++libkicker_shared_la_dummy.cpp kicker_la_dummy.cpp kicker_dummy.cpp:
+ 	echo > $@
+         
+ updatedir = $(kde_datadir)/kconf_update
+--- kicker/applets/launcher/Makefile.am	4 Jan 2003 04:50:34 -0000	1.1.1.3
++++ kicker/applets/launcher/Makefile.am	4 Jan 2003 05:34:15 -0000	1.3
+@@ -13,8 +13,8 @@
+ 
+ EXTRA_DIST = $(lnk_DATA)
+ 
+-launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI)
++launcher_panelapplet_la_LDFLAGS = $(all_libraries) -module  $(KDE_PLUGIN)
++launcher_panelapplet_la_LIBADD = ../../libkicker_shared.la $(LIB_KSYCOCA) $(LIB_KDEUI) 
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
+--- kicker/applets/lockout/Makefile.am	4 Jan 2003 04:50:34 -0000	1.1.1.2
++++ kicker/applets/lockout/Makefile.am	4 Jan 2003 05:34:16 -0000	1.3
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = lockout_panelapplet.la
+ 
+ lockout_panelapplet_la_SOURCES = lockout.cpp
+-lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
++lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined
+ lockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
+ 
+ noinst_HEADERS = lockout.h
+--- kicker/extensions/childpanel/Makefile.am	4 Jan 2003 04:50:50 -0000	1.1.1.2
++++ kicker/extensions/childpanel/Makefile.am	4 Jan 2003 05:34:17 -0000	1.3
+@@ -5,7 +5,7 @@
+ childpanel_panelextension_la_SOURCES = childpanelextension.cpp childpanelextension.skel
+ childpanel_panelextension_la_METASOURCES = AUTO
+ childpanel_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la
++childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker_shared.la
+ 
+ noinst_HEADERS = childpanelextension.h
+ 
+--- kicker/menuext/kdeprint/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ kicker/menuext/kdeprint/Makefile.am	24 Nov 2002 07:11:30 -0000	1.4
+@@ -4,7 +4,7 @@
+ 
+ kickermenu_kdeprint_la_SOURCES = print_mnu.cpp
+ kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint
++kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint $(LIB_QT) -lkdecore
+ 
+ kickermenu_kdeprint_la_METASOURCES = AUTO
+ 
+--- kicker/menuext/konsole/Makefile.am	14 Aug 2002 14:30:12 -0000	1.1.1.1
++++ kicker/menuext/konsole/Makefile.am	24 Nov 2002 07:11:31 -0000	1.4
+@@ -4,7 +4,7 @@
+ 
+ kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
+ kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
++kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lkdecore
+ 
+ kickermenu_konsole_la_METASOURCES = AUTO
+ 
+--- kicker/menuext/prefmenu/Makefile.am	10 Jul 2002 03:22:41 -0000	1.1.1.1
++++ kicker/menuext/prefmenu/Makefile.am	24 Nov 2002 07:11:31 -0000	1.4
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kickermenu_prefmenu.la
+ 
+ kickermenu_prefmenu_la_SOURCES = prefmenu.cpp
+-kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -undefined suppress -flat_namespace
+ kickermenu_prefmenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la
+ 
+ kickermenu_prefmenu_la_METASOURCES = AUTO
+--- kicker/menuext/recentdocs/Makefile.am	10 Jul 2002 03:22:42 -0000	1.1.1.1
++++ kicker/menuext/recentdocs/Makefile.am	24 Nov 2002 07:11:31 -0000	1.4
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kickermenu_recentdocs.la
+ 
+ kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp
+-kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -undefined suppress -flat_namespace
+ kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/ui/libkicker_ui.la
+ 
+ kickermenu_recentdocs_la_METASOURCES = AUTO
+--- kicker/proxy/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ kicker/proxy/Makefile.am	26 Nov 2002 21:00:52 -0000	1.3
+@@ -3,32 +3,48 @@
+ CLEANFILES = dummy.cpp
+ 
+ bin_PROGRAMS = appletproxy extensionproxy
+-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
++lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la libextensionproxy_main.la extensionproxy.la
+ 
+-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+-appletproxy_la_SOURCES = appletproxy.cpp
+-appletproxy_la_METASOURCES = appletproxy.moc
+-appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
++libappletproxy_main_la_SOURCES = appletproxy.cpp
++libappletproxy_main_la_METASOURCES = appletproxy.moc
++libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
++
++appletproxy_la_LIBADD  = libappletproxy_main.la
++appletproxy_la_SOURCES = appletproxy_la_main.cpp
++appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version -module
+ 
+-appletproxy_LDADD = appletproxy.la
+-appletproxy_SOURCES = dummy.cpp
++appletproxy_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > appletproxy_la_main.cpp
++
++appletproxy_LDADD = libappletproxy_main.la
++appletproxy_SOURCES = appletproxy_main.cpp
+ appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+-extensionproxy_la_SOURCES = extensionproxy.cpp
+-extensionproxy_la_METASOURCES = extensionproxy.moc
+-extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++appletproxy_main.cpp: stub_main.cpp
++	cat stub_main.cpp > appletproxy_main.cpp
++
++libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
++libextensionproxy_main_la_SOURCES = extensionproxy.cpp
++libextensionproxy_main_la_METASOURCES = extensionproxy.moc
++libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
++
++extensionproxy_la_LIBADD = libextensionproxy_main.la
++extensionproxy_la_SOURCES = extensionproxy_la_main.cpp
++extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version -module
++
++extensionproxy_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > extensionproxy_la_main.cpp
+ 
+-extensionproxy_LDADD = extensionproxy.la
+-extensionproxy_SOURCES = dummy.cpp
++extensionproxy_LDADD = libextensionproxy_main.la
++extensionproxy_SOURCES = extensionproxy_main.cpp
+ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++extensionproxy_main.cpp: stub_main.cpp
++	cat stub_main.cpp > extensionproxy_main.cpp
++
+ noinst_HEADERS = appletproxy.h extensionproxy.h
+ 
+ messages:
+ 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
+ 	$(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+--- kicker/proxy/appletproxy.cpp	10 Jul 2002 03:22:43 -0000	1.1.1.2
++++ kicker/proxy/appletproxy.cpp	26 Nov 2002 21:00:52 -0000	1.2
+@@ -67,7 +67,9 @@
+   { 0, 0, 0}
+ };
+ 
+-int main( int argc, char ** argv )
++extern "C" int kdemain(int, char**);
++
++int kdemain( int argc, char ** argv )
+ {
+     KAboutData aboutData( "appletproxy", I18N_NOOP("Panel applet proxy.")
+                           , "v0.1.0"
+--- kicker/proxy/extensionproxy.cpp	10 Jul 2002 03:22:44 -0000	1.1.1.2
++++ kicker/proxy/extensionproxy.cpp	26 Nov 2002 21:00:52 -0000	1.2
+@@ -54,7 +54,9 @@
+   { 0, 0, 0}
+ };
+ 
+-int main( int argc, char ** argv )
++extern "C" int kdemain(int, char**);
++
++int kdemain( int argc, char ** argv )
+ {
+     KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.")
+                           , "v0.1.0"
+RCS file: kicker/proxy/stub_main.cpp
+diff -N kicker/proxy/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kicker/proxy/stub_main.cpp	26 Nov 2002 21:00:52 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kicker/share/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ kicker/share/Makefile.am	24 Nov 2002 07:11:32 -0000	1.2
+@@ -5,7 +5,7 @@
+ libkickermain_la_SOURCES = pluginloader.cpp appletinfo.cpp panner.cpp fittslawframe.cpp menuinfo.cpp
+ libkickermain_la_METASOURCES = AUTO
+ 
+-libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module -no-undefined
++libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkickermain_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/libkonq/libkonq.la
+ 
+ messages:
+--- kicker/taskmanager/Makefile.am	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ kicker/taskmanager/Makefile.am	24 Nov 2002 07:11:32 -0000	1.2
+@@ -4,7 +4,7 @@
+ libtaskmanager_la_SOURCES = tasklmbmenu.cpp taskrmbmenu.cpp taskmanager.cpp
+ libtaskmanager_la_METASOURCES = AUTO
+ 
+-libtaskmanager_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module -no-undefined
++libtaskmanager_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ libtaskmanager_la_LIBADD = $(LIB_KDECORE)
+ 
+ messages:
+--- kioslave/Makefile.am	29 Oct 2002 03:05:23 -0000	1.1.1.4
++++ kioslave/Makefile.am	29 Oct 2002 03:39:31 -0000	1.6
+@@ -8,10 +8,14 @@
+ SMB_SUBDIR=smb
+ endif
+ 
++if include_kioslave_nfs
++NFS_SUBDIR=nfs
++endif
++
+ if include_devicesdir
+ DEVICES_SUBDIR=devices
+ endif
+ 
+-
+-SUBDIRS = about cgi floppy filter fish info mac man nfs nntp pop3 imap4 smtp \
+-  smbro sftp tar zip finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) $(DEVICES_SUBDIR)
++SUBDIRS = about cgi floppy filter fish info mac man nntp pop3 imap4 smtp \
++	smbro sftp tar zip finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) \
++	$(NFS_SUBDIR) $(DEVICES_SUBDIR)
+--- kioslave/devices/configure.in.in	29 Oct 2002 03:05:23 -0000	1.1.1.2
++++ kioslave/devices/configure.in.in	11 Nov 2002 20:56:20 -0000	1.2
+@@ -7,6 +7,9 @@
+     Linux)
+         DEVICESDIR=devices
+         ;;
++    Darwin)
++        DEVICESDIR=devices
++        ;;
+     *)
+         DEVICESDIR=
+         ;;
+--- kioslave/devices/kdedmodule/Makefile.am	29 Oct 2002 03:05:23 -0000	1.1.1.2
++++ kioslave/devices/kdedmodule/Makefile.am	24 Nov 2002 07:11:33 -0000	1.5
+@@ -3,7 +3,7 @@
+ INCLUDES = $(all_includes)
+ kded_mountwatcher_la_SOURCES = mountwatcher.cpp mountwatcher.skel disklist.cpp disks.cpp
+ kded_mountwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_mountwatcher_la_LIBADD = $(LIB_KSYCOCA)
++kded_mountwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) -lDCOP -lkdecore $(LIB_KDED)
+ 
+ METASOURCES = AUTO
+ 
+--- kioslave/ldap/configure.in.in	14 Jan 2003 20:11:09 -0000	1.1.1.3
++++ kioslave/ldap/configure.in.in	14 Jan 2003 23:53:33 -0000	1.7
+@@ -19,7 +19,7 @@
+   fi
+   if test $with_ldap = FOUND ; then
+     with_ldap=NOTFOUND
+-    for ext in la so sl a ; do
++    for ext in la so sl a dylib ; do
+       AC_FIND_FILE(libldap.$ext, $kde_libraries /usr/lib /usr/local/lib,
+         ldap_libdir)
+       if test -r $ldap_libdir/libldap.$ext ; then
+--- kioslave/nfs/README	25 Jun 2002 02:03:52 -0000	1.1.1.1
++++ kioslave/nfs/README	16 Sep 2002 14:52:42 -0000	1.4
+@@ -1,3 +1,29 @@
+ this is an ioslave for KDE 2 for NFS, version 2.
+ 
+ Alex
++
++Darwin notes --
++
++It looks like there are C++ type issues with the Darwin headers
++(try building, you'll see the "too many arguments to function" stuff)
++
++The problem seems to be <rpc/clnt.h> having definitions that don't
++play nice with C++.  The client rpc handle does a bunch of void stuff
++in the struct which is fine in C but makes an empty arg list in C++.
++
++typedef struct {
++        AUTH    *cl_auth;                       /* authenticator */
++        struct clnt_ops {
++                enum clnt_stat  (*cl_call)();   /* call remote procedure */
++                void            (*cl_abort)();  /* abort a call */
++                void            (*cl_geterr)(); /* get specific error code */
++                bool_t          (*cl_freeres)(); /* frees results */
++                void            (*cl_destroy)();/* destroy this structure */
++                bool_t          (*cl_control)();/* the ioctl() of rpc */
++        } *cl_ops;
++        caddr_t                 cl_private;     /* private stuff */
++} CLIENT;
++
++
++The only solution is to probably reimplement clnt.h locally to fix
++these (wrapping the "#include <rpc/rpc.h>" in an extern "C" isn't enough).
+RCS file: kioslave/nfs/configure.in.in
+diff -N kioslave/nfs/configure.in.in
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kioslave/nfs/configure.in.in	18 Dec 2002 17:11:17 -0000	1.3
+@@ -0,0 +1,12 @@
++AC_MSG_CHECKING(whether to compile NFS support)
++AC_ARG_WITH(nfs,
++[  --without-nfs           Disable NFS kioslave [default=no]],
++	with_nfs=$withval, with_nfs=yes
++)dnl
++
++if test `uname -s` = "Darwin"; then
++	with_nfs=no
++fi
++
++AC_MSG_RESULT($withval)
++AM_CONDITIONAL(include_kioslave_nfs, test "$with_nfs" = "yes")
+--- klipper/Makefile.am	14 Jan 2003 20:11:15 -0000	1.1.1.5
++++ klipper/Makefile.am	14 Jan 2003 20:44:15 -0000	1.9
+@@ -1,23 +1,30 @@
+ INCLUDES= $(all_includes)
+ 
+ bin_PROGRAMS = klipper
+-lib_LTLIBRARIES = klipper.la
++lib_LTLIBRARIES = klipper.la libklipper_main.la
+ kde_module_LTLIBRARIES = klipper_panelapplet.la
+ 
+-CLEANFILES = dummy.cpp
++CLEANFILES = dummy.cpp klipper_main.cpp
+ 
+-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) 
+-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \
++libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP
++libklipper_main_la_SOURCES = toplevel.cpp urlgrabber.cpp configdialog.cpp \
+     toplevel.skel
+ 
+-klipper_la_METASOURCES = AUTO
+-klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libklipper_main_la_METASOURCES = AUTO
++libklipper_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
+-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
+-klipper_SOURCES = dummy.cpp
++klipper_la_LIBADD = libklipper_main.la
++klipper_la_SOURCES = main.cpp
++klipper_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++klipper_main.cpp: main.cpp
++	cat main.cpp > klipper_main.cpp
++
++klipper_LDADD = libklipper_main.la
++klipper_SOURCES = klipper_main.cpp
+ klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+-klipper_panelapplet_la_LIBADD = klipper.la
++klipper_panelapplet_la_LIBADD = libklipper_main.la
+ klipper_panelapplet_la_SOURCES = applet.cpp applet.skel
+ klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+--- kmenuedit/Makefile.am	14 Aug 2002 14:27:55 -0000	1.1.1.3
++++ kmenuedit/Makefile.am	26 Nov 2002 21:00:52 -0000	1.7
+@@ -1,18 +1,24 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = kmenuedit
+-lib_LTLIBRARIES = kmenuedit.la
++lib_LTLIBRARIES = kmenuedit.la libkmenuedit_main.la
+ 
+ CLEANFILES = dummy.cpp
+ 
+-kmenuedit_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
++libkmenuedit_main_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp khotkeys.cpp
++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lkdecore -lDCOP
++libkmenuedit_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
+-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+-kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kmenuedit_la_SOURCES = main.cpp
++kmenuedit_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version -module
++kmenuedit_la_LIBADD  = libkmenuedit_main.la
+ 
+-kmenuedit_SOURCES = dummy.cpp
+-kmenuedit_LDADD   = kmenuedit.la
++kmenuedit_SOURCES = kmenuedit_main.cpp
+ kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++kmenuedit_LDADD   = libkmenuedit_main.la
++
++kmenuedit_main.cpp: main.cpp
++	cat main.cpp > kmenuedit_main.cpp
+ 
+ noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h
+ 
+--- konqueror/Makefile.am	17 Jan 2003 15:03:12 -0000	1.1.1.5
++++ konqueror/Makefile.am	17 Jan 2003 15:46:03 -0000	1.4
+@@ -5,7 +5,7 @@
+ #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar
+ SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar
+ 
+-lib_LTLIBRARIES = konqueror.la
++lib_LTLIBRARIES = konqueror.la libkonqueror_main.la
+ 
+ konqdatadir = $(kde_datadir)/konqueror
+ konqdata_DATA = konqueror.rc
+@@ -22,8 +22,7 @@
+ 
+ bin_PROGRAMS = konqueror
+ 
+-konqueror_la_SOURCES = konq_main.cc \
+-	    KonquerorIface.cc KonquerorIface.skel \
++libkonqueror_main_la_SOURCES = KonquerorIface.cc KonquerorIface.skel \
+ 	    KonqMainWindowIface.cc KonqMainWindowIface.skel \
+ 	    KonqViewIface.cc KonqViewIface.skel \
+ 	    konq_mainwindow.cc konq_guiclients.cc \
+@@ -43,11 +42,18 @@
+ 	konq_misc.h konq_openurlrequest.h konq_profiledlg.h konq_run.h \
+ 	konq_view.h konq_viewmgr.h version.h
+ 
+-konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-konqueror_la_LIBADD = ../libkonq/libkonq.la
++libkonqueror_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la
+ 
+-konqueror_SOURCES = dummy.cc
+-konqueror_LDADD = konqueror.la
++konqueror_la_SOURCES = konq_la_main.cc
++konqueror_la_LDFLAGS = $(all_libraries) -avoid-version $(KDE_RPATH) -module
++konqueror_la_LIBADD  = libkonqueror_main.la
++
++konq_la_main.cc: konq_main.cc
++	cat konq_main.cc > konq_la_main.cc
++
++konqueror_SOURCES = konq_main.cc
++konqueror_LDADD = libkonqueror_main.la
+ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # Hmm, this experiment of a static konq failed, don't trust it...
+@@ -61,9 +67,6 @@
+ #konqueror_static_SOURCES = dummy.cc
+ #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la
+ #konqueror_static_LDFLAGS = $(all_libraries) -static
+-
+-dummy.cc:
+-	echo > dummy.cc
+ 
+ messages: rc.cpp
+ 	$(EXTRACTRC) *.rc */*.rc >> rc.cpp
+--- konqueror/client/Makefile.am	14 Aug 2002 14:30:59 -0000	1.1.1.2
++++ konqueror/client/Makefile.am	26 Nov 2002 21:00:53 -0000	1.7
+@@ -1,12 +1,12 @@
+ AM_CPPFLAGS = -DQT_NO_CAST_ASCII
+ 
+ bin_PROGRAMS = kfmclient
+-lib_LTLIBRARIES = kfmclient.la
++lib_LTLIBRARIES = kfmclient.la libkfmclient_main.la
+ 
+ INCLUDES= -I.. $(all_includes)
+-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kfmclient_la_LIBADD =  $(LIB_KIO)
+-kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
++libkfmclient_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkfmclient_main_la_LIBADD =  $(LIB_KIO) $(LIB_QT) -lkdecore -lDCOP -lkdeui
++libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+ 
+ noinst_HEADERS = kfmclient.h
+ METASOURCES = AUTO
+@@ -14,12 +14,19 @@
+ KonquerorIface_DIR =  $(srcdir)/..
+ KDesktopIface_DIR = $(top_srcdir)/kdesktop
+ 
+-kfmclient_SOURCES = dummy.cc
++kfmclient_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH)
++kfmclient_la_LIBADD  = libkfmclient_main.la
++kfmclient_la_SOURCES = kfmclient_la_main.cpp
++
++kfmclient_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kfmclient_la_main.cpp
++
++kfmclient_SOURCES = kfmclient_main.cpp
+ kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-kfmclient_LDADD = kfmclient.la
++kfmclient_LDADD   = libkfmclient_main.la
+ 
+-dummy.cc:
+-	echo > dummy.cc
++kfmclient_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kfmclient_main.cpp
+ 
+ messages:
+ 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
+--- konqueror/client/kfmclient.cc	4 Jan 2003 04:51:31 -0000	1.1.1.5
++++ konqueror/client/kfmclient.cc	4 Jan 2003 05:34:22 -0000	1.3
+@@ -59,7 +59,9 @@
+    {0,0,0}
+ };
+ 
+-int main( int argc, char **argv )
++extern "C" int kdemain(int, char**);
++
++int kdemain( int argc, char **argv )
+ {
+   KCmdLineArgs::init(argc, argv, appName, description, version, false);
+ 
+RCS file: konqueror/client/stub_main.cpp
+diff -N konqueror/client/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ konqueror/client/stub_main.cpp	26 Nov 2002 21:00:53 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- konqueror/keditbookmarks/Makefile.am	29 Oct 2002 03:05:50 -0000	1.1.1.3
++++ konqueror/keditbookmarks/Makefile.am	26 Nov 2002 21:00:53 -0000	1.5
+@@ -2,22 +2,29 @@
+ 
+ METASOURCES = AUTO
+ 
+-lib_LTLIBRARIES = keditbookmarks.la
++lib_LTLIBRARIES = keditbookmarks.la libkeditbookmarks_main.la
+ 
+-keditbookmarks_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp
++libkeditbookmarks_main_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp
+ kbookmarklistener_DIR = $(top_srcdir)/libkonq
+ 
+-keditbookmarks_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML)
+-keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkeditbookmarks_main_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML)
++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) -avoid-version
++
++keditbookmarks_la_SOURCES = keditbookmarks_la_main.cpp
++keditbookmarks_la_LIBADD  = libkeditbookmarks_main.la
++keditbookmarks_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++keditbookmarks_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > keditbookmarks_la_main.cpp
+ 
+ bin_PROGRAMS = keditbookmarks
+ 
+-keditbookmarks_SOURCES = dummy.cpp
+-keditbookmarks_LDADD = keditbookmarks.la
++keditbookmarks_SOURCES = keditbookmarks_main.cpp
++keditbookmarks_LDADD = libkeditbookmarks_main.la
+ keditbookmarks_LDFLAGS = $(all_libraries)
+ 
+-dummy.cpp:
+-	echo > dummy.cpp
++keditbookmarks_main.cpp: stub_main.cpp
++	cat stub_main.cpp > keditbookmarks_main.cpp
+ 
+ rcdir = $(kde_datadir)/keditbookmarks
+ rc_DATA = keditbookmarksui.rc  
+--- konqueror/keditbookmarks/main.cpp	5 Nov 2002 00:18:22 -0000	1.1.1.4
++++ konqueror/keditbookmarks/main.cpp	26 Nov 2002 21:00:53 -0000	1.2
+@@ -110,7 +110,9 @@
+   }
+ }
+ 
+-int main(int argc, char ** argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char ** argv)
+ {
+   KLocale::setMainCatalogue("konqueror");
+   KAboutData aboutData("keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.1",
+RCS file: konqueror/keditbookmarks/stub_main.cpp
+diff -N konqueror/keditbookmarks/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ konqueror/keditbookmarks/stub_main.cpp	26 Nov 2002 21:00:53 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- konqueror/sidebar/Makefile.am	14 Aug 2002 14:30:57 -0000	1.1.1.3
++++ konqueror/sidebar/Makefile.am	27 Nov 2002 16:09:11 -0000	1.2
+@@ -25,7 +25,7 @@
+ konq_sidebar_la_LIBADD  = $(LIB_KPARTS) $(LIB_KIO) ../../libkonq/libkonq.la ./libkonqsidebarplugin.la ../../kate/lib/libkmultitabbar.la
+ 
+ libkonqsidebarplugin_la_SOURCES=konqsidebarplugin.cpp
+-libkonqsidebarplugin_la_LDFLAGS = $(all_libraries) -no-undefined
++libkonqsidebarplugin_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
+ libkonqsidebarplugin_la_LIBADD = $(LIB_KPARTS)
+ 
+ # this is where the desktop file will go 
+--- konqueror/sidebar/trees/Makefile.am	10 Jul 2002 03:24:11 -0000	1.1.1.2
++++ konqueror/sidebar/trees/Makefile.am	26 Nov 2002 21:00:53 -0000	1.3
+@@ -8,10 +8,10 @@
+ METASOURCES = AUTO
+ 
+ libkonq_sidebar_tree_la_SOURCES = konq_sidebartree.cpp konq_sidebartreeitem.cpp konq_sidebartreetoplevelitem.cpp
+-libkonq_sidebar_tree_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-libkonq_sidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ../libkonqsidebarplugin.la
++libkonq_sidebar_tree_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
++libkonq_sidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/konqueror/sidebar/libkonqsidebarplugin.la
+ 
+ konqsidebar_tree_la_SOURCES = konqsidebar_tree.cpp
+ konqsidebar_tree_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-konqsidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ../libkonqsidebarplugin.la libkonq_sidebar_tree.la
++konqsidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/konqueror/sidebar/libkonqsidebarplugin.la libkonq_sidebar_tree.la
+ 
+--- konqueror/sidebar/trees/bookmark_module/Makefile.am	25 Jun 2002 02:03:53 -0000	1.1.1.1
++++ konqueror/sidebar/trees/bookmark_module/Makefile.am	26 Nov 2002 21:00:53 -0000	1.3
+@@ -6,5 +6,5 @@
+ 
+ konq_sidebartree_bookmarks_la_SOURCES = bookmark_module.cpp bookmark_item.cpp
+ konq_sidebartree_bookmarks_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-konq_sidebartree_bookmarks_la_LIBADD = ../../libkonqsidebarplugin.la ../libkonq_sidebar_tree.la
++konq_sidebartree_bookmarks_la_LIBADD = $(top_builddir)/konqueror/sidebar/libkonqsidebarplugin.la $(top_builddir)/konqueror/sidebar/trees/libkonq_sidebar_tree.la
+ 
+--- konqueror/sidebar/trees/dirtree_module/Makefile.am	25 Jun 2002 02:03:53 -0000	1.1.1.1
++++ konqueror/sidebar/trees/dirtree_module/Makefile.am	26 Nov 2002 21:00:53 -0000	1.3
+@@ -5,6 +5,6 @@
+ METASOURCES = AUTO
+ konq_sidebartree_dirtree_la_SOURCES = dirtree_module.cpp dirtree_item.cpp
+ konq_sidebartree_dirtree_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-konq_sidebartree_dirtree_la_LIBADD = ../../libkonqsidebarplugin.la ../libkonq_sidebar_tree.la
++konq_sidebartree_dirtree_la_LIBADD = $(top_builddir)/konqueror/sidebar/libkonqsidebarplugin.la $(top_builddir)/konqueror/sidebar/trees/libkonq_sidebar_tree.la
+ 
+ 
+--- konqueror/sidebar/trees/history_module/Makefile.am	1 Oct 2002 02:36:50 -0000	1.1.1.3
++++ konqueror/sidebar/trees/history_module/Makefile.am	26 Nov 2002 21:00:53 -0000	1.7
+@@ -7,7 +7,7 @@
+ konq_sidebartree_history_la_SOURCES = history_module.cpp history_item.cpp \
+ 	history_settings.cpp history_settings.skel
+ konq_sidebartree_history_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-konq_sidebartree_history_la_LIBADD =  ../../libkonqsidebarplugin.la ../libkonq_sidebar_tree.la
++konq_sidebartree_history_la_LIBADD =  $(top_builddir)/konqueror/sidebar/libkonqsidebarplugin.la $(top_builddir)/konqueror/sidebar/trees/libkonq_sidebar_tree.la
+ 
+ kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel
+ kcm_history_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+--- konqueror/sidebar/trees/history_module/history_module.h	14 Aug 2002 14:30:58 -0000	1.1.1.2
++++ konqueror/sidebar/trees/history_module/history_module.h	14 Aug 2002 15:35:44 -0000	1.3
+@@ -53,8 +53,7 @@
+     bool sortsByName() const { return m_sortsByName; }
+ 
+     static QString groupForURL( const KURL& url ) {
+-	static const QString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
+-	return url.host().isEmpty() ? misc : url.host();
++	return url.host().isEmpty() ? KGlobal::staticQString(i18n("Miscellaneous")) : url.host();
+     }
+ 
+ public slots:
+--- konsole/konsole/Makefile.am	4 Jan 2003 04:52:14 -0000	1.1.1.5
++++ konsole/konsole/Makefile.am	26 Nov 2002 21:00:53 -0000	1.7
+@@ -12,13 +12,12 @@
+ 
+ # you can add here more. This one gets installed
+ bin_PROGRAMS = 	konsole konsole_grantpty kwrited #kcmkonsole
+-lib_LTLIBRARIES = kwrited.la konsole.la
++lib_LTLIBRARIES = libkonsolepart_shared.la libkonsolepart.la libkwrited_main.la kwrited.la libkonsole_main.la konsole.la
+ 
+ # libkonsolepart is a part, but konsole.la links directly to it, so we can't
+ # install it under kde_module
+ 
+-kde_module_LTLIBRARIES = libkonsolepart.la
+-libkonsolepart_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \
++libkonsolepart_shared_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \
+ 	schema.cpp \
+ 	session.cpp \
+ 	TEWidget.cpp \
+@@ -29,33 +28,58 @@
+ 	keytrans.cpp \
+ 	konsoleiface.skel \
+         sessioniface.skel
++libkonsolepart_shared_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
++libkonsolepart_shared_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS) $(LIB_QT) -lkdecore -lDCOP -lkdeui -lkio
+ 
+-libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+-libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS)
++libkonsolepart_la_SOURCES = dummy.cpp
++libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++libkonsolepart_la_LIBADD  = libkonsolepart_shared.la
++
++dummy.cpp:
++	echo > dummy.cpp
+ 
+ # kwrited kdeinit module
+-kwrited_la_SOURCES = kwrited.cpp
+-kwrited_la_LIBADD  = libkonsolepart.la
+-kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkwrited_main_la_SOURCES = kwrited.cpp
++libkwrited_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkwrited_main_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lkdecore -lDCOP libkonsolepart_shared.la
++
++kwrited_la_SOURCES = kwrited_la_main.cpp
++kwrited_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kwrited_la_LIBADD  = libkwrited_main.la
++
++kwrited_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kwrited_la_main.cpp
+ 
+ # kwrited executable
+-kwrited_SOURCES	= dummy.cpp
+-kwrited_LDADD   = kwrited.la 
++kwrited_SOURCES	= kwrited_main.cpp
++kwrited_LDADD   = libkwrited_main.la
+ kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kwrited_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kwrited_main.cpp
+ 
+ # konsole kdeinit module
+-konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
++libkonsole_main_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
+      TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
+      konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp
+-konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB)
++libkonsole_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) $(LIB_QT) -lkdecore -lDCOP
++
++konsole_la_SOURCES = konsole_la_main.cpp
++konsole_la_LDFLAGS = $(all_libraries) -avoid-version -module
++konsole_la_LIBADD  = libkonsole_main.la
++
++konsole_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > konsole_la_main.cpp
+ 
+ # konsole executable
+-konsole_SOURCES = dummy.cpp
+-konsole_LDADD = konsole.la $(LIB_KIO)
++konsole_SOURCES = konsole_main.cpp
++konsole_LDADD = libkonsole_main.la
+ konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++konsole_main.cpp: stub_main.cpp
++	cat stub_main.cpp > konsole_main.cpp
++
+ # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
+ # kcmkonsole_LDADD   = $(LIB_KDEUI)
+ # kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+@@ -97,9 +121,6 @@
+ 	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot
+ 	rm -f schemas.cpp
+ 	rm -f tips.cpp
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+ # setting up x-application/konsole as a special mimetype
+ mimedir = $(kde_mimedir)/application
+--- konsole/konsole/konsole_grantpty.c	1 Oct 2002 02:36:59 -0000	1.1.1.3
++++ konsole/konsole/konsole_grantpty.c	22 Oct 2002 03:05:32 -0000	1.3
+@@ -45,6 +45,13 @@
+ 
+ int main (int argc, char *argv[])
+ {
++
++  if (strcmp(getenv("DEBUG_ME"), "sleepinmain") == 0)
++  {
++    fprintf(stderr, "My PID is %d\n", (int) getpid());
++    kill(getpid(), SIGSTOP);
++  }
++
+   char*         pty;
+   struct stat   st;
+   struct group* p;
+--- konsole/konsole/kwrited.cpp	29 Oct 2002 03:06:19 -0000	1.1.1.4
++++ konsole/konsole/kwrited.cpp	26 Nov 2002 21:00:53 -0000	1.2
+@@ -88,7 +88,9 @@
+     ::exit(0);
+ }
+ 
+-int main(int argc, char* argv[])
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char* argv[])
+ {
+   KLocale::setMainCatalogue("konsole");
+   KCmdLineArgs::init(argc, argv, "kwrited",
+--- konsole/konsole/main.cpp	1 Oct 2002 02:36:59 -0000	1.1.1.5
++++ konsole/konsole/main.cpp	26 Nov 2002 21:00:53 -0000	1.4
+@@ -125,7 +125,8 @@
+ 
+ 
+ /* --| main |------------------------------------------------------ */
+-int main(int argc, char* argv[])
++extern "C" kdemain(int, char**);
++int kdemain(int argc, char** argv)
+ {
+   setgid(getgid()); setuid(getuid()); // drop privileges
+ 
+RCS file: konsole/konsole/stub_main.cpp
+diff -N konsole/konsole/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ konsole/konsole/stub_main.cpp	26 Nov 2002 21:00:53 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- ksmserver/Makefile.am	10 Jul 2002 03:24:29 -0000	1.1.1.2
++++ ksmserver/Makefile.am	26 Nov 2002 21:00:54 -0000	1.6
+@@ -20,18 +20,28 @@
+ INCLUDES=  $(all_includes)
+ 
+ bin_PROGRAMS = ksmserver
+-lib_LTLIBRARIES = ksmserver.la
++lib_LTLIBRARIES = ksmserver.la libksmserver_main.la
+ noinst_HEADERS = global.h server.h shutdown.h
+ 
+-ksmserver_la_METASOURCES = AUTO
++libksmserver_main_la_METASOURCES = AUTO
+ # Order is important for --enable-final!
+-ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel
+-ksmserver_SOURCES = dummy.cpp
++libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel
++libksmserver_main_la_LDFLAGS = $(all_libraries) -avoid-version $(QT_LDFLAGS)
++libksmserver_main_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) -lkdecore -lDCOP
+ 
++ksmserver_la_SOURCES = ksmserver_la_main.cpp
+ ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
++ksmserver_la_LIBADD  = libksmserver_main.la
++
++ksmserver_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > ksmserver_la_main.cpp
++
++ksmserver_SOURCES = ksmserver_main.cpp
+ ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-ksmserver_la_LIBADD = $(LIB_KDEUI)
+-ksmserver_LDADD = ksmserver.la
++ksmserver_LDADD   = libksmserver_main.la
++
++ksmserver_main.cpp: stub_main.cpp
++	cat stub_main.cpp > ksmserver_main.cpp
+ 
+ picsdir = $(kde_datadir)/ksmserver/pics
+ pics_DATA = shutdownkonq.png
+@@ -47,6 +57,3 @@
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- ksmserver/main.cpp	14 Aug 2002 14:27:51 -0000	1.1.1.3
++++ ksmserver/main.cpp	26 Nov 2002 21:00:54 -0000	1.2
+@@ -159,7 +159,8 @@
+   }
+ }
+ 
+-int main( int argc, char* argv[] )
++extern "C" int kdemain(int, char**);
++int kdemain( int argc, char** argv )
+ {
+     sanity_check(argc, argv);
+ 
+RCS file: ksmserver/stub_main.cpp
+diff -N ksmserver/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ksmserver/stub_main.cpp	26 Nov 2002 21:00:54 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- ksysguard/configure.in.in	29 Oct 2002 03:06:45 -0000	1.1.1.4
++++ ksysguard/configure.in.in	11 Nov 2002 20:56:20 -0000	1.2
+@@ -1,3 +1,5 @@
++DO_NOT_COMPILE="$DO_NOT_COMPILE ksysguard"
++
+ dnl Check whether ksysguardd can run; 
+ AC_MSG_CHECKING([if ksysguardd can be compiled])
+ case "$host" in 
+--- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc	1 Oct 2002 02:37:23 -0000	1.1.1.4
++++ ksysguard/gui/SensorDisplayLib/SensorDisplay.cc	1 Oct 2002 03:01:48 -0000	1.3
+@@ -62,7 +62,6 @@
+ 	pausedWhileHidden = false;
+ 
+ 	timerOn();
+-	QWhatsThis::add(this, "dummy");
+ 
+ 	frame = new QGroupBox(2, Qt::Vertical, "", this, "displayFrame"); 
+ 	Q_CHECK_PTR(frame);
+--- ksysguard/gui/ksgrd/StyleEngine.h	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ ksysguard/gui/ksgrd/StyleEngine.h	16 Sep 2002 14:31:34 -0000	1.2
+@@ -68,11 +68,12 @@
+ 	}
+ 	const QColor& getSensorColor(uint i)
+ 	{
+-		static QColor dummy;
+-		if (i < sensorColors.count())
++		if (i < sensorColors.count()) {
+ 			return *(sensorColors.at(i));
+-		else
++		} else {
++			QColor dummy;
+ 			return dummy;
++		}
+ 	}
+ 	uint getSensorColorCount() const
+ 	{
+--- ktip/tips	29 Oct 2002 03:06:51 -0000	1.1.1.5
++++ ktip/tips	31 Oct 2002 19:19:37 -0000	1.2
+@@ -704,20 +704,6 @@
+ </tip>
+ 
+ 
+-<tip category="Win2Unix">
+-<html>
+-<p>
+-You might wonder why there are very few (if any) files whose
+-names end in <code>.exe</code> or <code>.bat</code> on UNIX
+-systems. This is because filenames on UNIX do not need an
+-extension. Executable files in KDE are represented by the gear icon
+-in Konqueror. In the Konsole window, they are often colored red 
+-(depending on your settings).
+-</p>
+-<p align="right"><em>Contributed by Carsten Niehaus</em></p>
+-</html>
+-</tip>
+-
+ <tip category="KDE|Win2Unix|General">
+ <html>
+ <p>
+--- kwin/Makefile.am	10 Jul 2002 03:24:51 -0000	1.1.1.2
++++ kwin/Makefile.am	26 Nov 2002 21:00:54 -0000	1.6
+@@ -3,14 +3,21 @@
+ SUBDIRS = . kcmkwin pics clients
+ 
+ bin_PROGRAMS = kwin
+-lib_LTLIBRARIES = kwin.la
++lib_LTLIBRARIES = kwin.la libkwin_main.la
+ 
+ # workspace.cpp has to be first in order not to break --enable-final
+-kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp  client.cpp main.cpp \
++libkwin_main_la_SOURCES = workspace.cpp placement.cpp atoms.cpp  client.cpp main.cpp \
+ 	popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
+ 	killwindow.cpp kwinbutton.cpp
+-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+-kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkwin_main_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) $(LIB_QT) -lkdecore -lDCOP
++libkwin_main_la_LDFLAGS = $(all_libraries) -avoid-version $(QT_LDFLAGS)
++
++kwin_la_SOURCES = kwin_la_main.cpp
++kwin_la_LIBADD  = libkwin_main.la
++kwin_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++kwin_la_main.cpp: kwin_main.cpp
++	cat kwin_main.cpp > kwin_la_main.cpp
+ 
+ include_HEADERS = KWinInterface.h
+ 
+@@ -18,7 +25,7 @@
+ kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
+ 
+ kwin_SOURCES = kwin_main.cpp
+-kwin_LDADD = kwin.la
++kwin_LDADD = libkwin_main.la
+ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ KDE_ICON = kwin
+--- kwin/clients/b2/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/b2/Makefile.am	26 Nov 2002 21:00:54 -0000	1.2
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = kwin_b2.la
+ 
+ kwin_b2_la_SOURCES = b2client.cpp
+-kwin_b2_la_LIBADD = ../../kwin.la
++kwin_b2_la_LIBADD = ../../libkwin_main.la
+ kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/default/Makefile.am	5 Nov 2002 00:19:26 -0000	1.1.1.3
++++ kwin/clients/default/Makefile.am	26 Nov 2002 21:00:54 -0000	1.2
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = kwin_default.la
+ 
+ kwin_default_la_SOURCES = kdedefault.cpp
+-kwin_default_la_LIBADD = ../../kwin.la
++kwin_default_la_LIBADD = ../../libkwin_main.la
+ kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/icewm/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/icewm/Makefile.am	26 Nov 2002 21:00:54 -0000	1.2
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = kwin_icewm.la
+ 
+ kwin_icewm_la_SOURCES = icewm.cpp 
+-kwin_icewm_la_LIBADD = ../../kwin.la
++kwin_icewm_la_LIBADD = ../../libkwin_main.la
+ kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/kde1/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/kde1/Makefile.am	26 Nov 2002 21:00:54 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_kde1.la
+ 
+ kwin_kde1_la_SOURCES = kde1client.cpp
+-kwin_kde1_la_LIBADD = ../../kwin.la
++kwin_kde1_la_LIBADD = ../../libkwin_main.la
+ kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/keramik/Makefile.am	1 Oct 2002 02:37:32 -0000	1.1.1.2
++++ kwin/clients/keramik/Makefile.am	26 Nov 2002 21:00:54 -0000	1.2
+@@ -13,7 +13,7 @@
+ kde_module_LTLIBRARIES    = kwin_keramik.la
+ 
+ kwin_keramik_la_SOURCES   = keramik.cpp
+-kwin_keramik_la_LIBADD    = ../../kwin.la
++kwin_keramik_la_LIBADD    = ../../libkwin_main.la
+ kwin_keramik_la_COMPILE_FIRST = tiles.h
+ kwin_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+--- kwin/clients/kstep/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/kstep/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_kstep.la
+ 
+ kwin_kstep_la_SOURCES = nextclient.cpp
+-kwin_kstep_la_LIBADD = ../../kwin.la
++kwin_kstep_la_LIBADD = ../../libkwin_main.la
+ kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/kwmtheme/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/kwmtheme/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_kwmtheme.la
+ 
+ kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+-kwin_kwmtheme_la_LIBADD = ../../kwin.la
++kwin_kwmtheme_la_LIBADD = ../../libkwin_main.la
+ kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/laptop/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/laptop/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_laptop.la
+ 
+ kwin_laptop_la_SOURCES = laptopclient.cpp
+-kwin_laptop_la_LIBADD = ../../kwin.la
++kwin_laptop_la_LIBADD = ../../libkwin_main.la
+ kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/modernsystem/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/modernsystem/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES = kwin_modernsys.la
+ 
+ kwin_modernsys_la_SOURCES = modernsys.cpp
+-kwin_modernsys_la_LIBADD = ../../kwin.la
++kwin_modernsys_la_LIBADD = ../../libkwin_main.la
+ kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/quartz/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/quartz/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = kwin_quartz.la
+ 
+ kwin_quartz_la_SOURCES = quartz.cpp
+-kwin_quartz_la_LIBADD = ../../kwin.la
++kwin_quartz_la_LIBADD = ../../libkwin_main.la
+ kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/redmond/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/redmond/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_redmond.la
+ 
+ kwin_redmond_la_SOURCES = redmond.cpp
+-kwin_redmond_la_LIBADD = ../../kwin.la
++kwin_redmond_la_LIBADD = ../../libkwin_main.la
+ kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/riscos/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/riscos/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -12,7 +12,7 @@
+ StickyButton.cpp \
+ HelpButton.cpp \
+ Static.cpp
+-kwin_riscos_la_LIBADD = ../../kwin.la
++kwin_riscos_la_LIBADD = ../../libkwin_main.la
+ kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/system/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/system/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kwin_system.la
+ 
+ kwin_system_la_SOURCES = systemclient.cpp
+-kwin_system_la_LIBADD = ../../kwin.la
++kwin_system_la_LIBADD = ../../libkwin_main.la
+ kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ METASOURCES = AUTO
+--- kwin/clients/web/Makefile.am	25 Jun 2002 02:03:54 -0000	1.1.1.1
++++ kwin/clients/web/Makefile.am	26 Nov 2002 21:00:55 -0000	1.2
+@@ -21,7 +21,7 @@
+   WebButtonMaximize.h \
+   WebButtonSticky.h
+ 
+-kwin_web_la_LIBADD      = ../../kwin.la
++kwin_web_la_LIBADD      = ../../libkwin_main.la
+ kwin_web_la_LDFLAGS     = $(all_libraries) $(KDE_PLUGIN) -module
+ METASOURCES               = AUTO
+ 
+--- kwin/kcmkwin/kwinoptions/Makefile.am	1 Oct 2002 02:37:36 -0000	1.1.1.4
++++ kwin/kcmkwin/kwinoptions/Makefile.am	1 Oct 2002 12:06:42 -0000	1.2
+@@ -10,7 +10,7 @@
+ kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+ kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
+ 
+-noinst_HEADERS = windows.h mouse.h 
++noinst_HEADERS = windows.h mouse.h main.h
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
+--- kxkb/Makefile.am	29 Oct 2002 03:07:04 -0000	1.1.1.5
++++ kxkb/Makefile.am	12 Jan 2003 18:00:03 -0000	1.11
+@@ -7,20 +7,30 @@
+ 
+ bin_PROGRAMS = kxkb
+ 
+-kxkb_SOURCES = dummy.cpp
++kxkb_SOURCES = kxkb_main.cpp
+ kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kxkb_LDADD = kxkb.la -lxkbfile
++kxkb_LDADD = libkxkb_main.la
+ 
+-lib_LTLIBRARIES = kxkb.la
++kxkb_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kxkb_main.cpp
++
++lib_LTLIBRARIES = kxkb.la libkxkb_main.la
+ kde_module_LTLIBRARIES = kcm_keyboard.la
+ 
+ kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui
+ kcm_keyboard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+ kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile
+ 
+-kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp
+-kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile
++libkxkb_main_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp
++libkxkb_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkxkb_main_la_LIBADD = $(LIB_X11) $(LIB_XEXT) $(LIB_KDEUI) -lxkbfile $(LIB_QT) -lDCOP -lkdecore
++
++kxkb_la_SOURCES = kxkb_la_main.cpp
++kxkb_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kxkb_la_LIBADD = libkxkb_main.la
++
++kxkb_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kxkb_la_main.cpp
+ 
+ data_DATA = keyboard.desktop
+ datadir = $(kde_appsdir)/Settings/Peripherals
+@@ -37,6 +47,3 @@
+ messages: rc.cpp
+ 	$(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot
+ 	$(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot 
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kxkb/kxkb.cpp	29 Oct 2002 03:07:03 -0000	1.1.1.5
++++ kxkb/kxkb.cpp	26 Nov 2002 21:00:56 -0000	1.2
+@@ -503,7 +503,8 @@
+ const char * DESCRIPTION =
+   I18N_NOOP("A utility to switch keyboard maps.");
+ 
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++int kdemain(int argc, char **argv)
+ {
+     KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.8",
+                      DESCRIPTION, KAboutData::License_LGPL,
+RCS file: kxkb/stub_main.cpp
+diff -N kxkb/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kxkb/stub_main.cpp	26 Nov 2002 21:00:56 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- libkonq/favicons/Makefile.am	25 Jun 2002 02:03:55 -0000	1.1.1.1
++++ libkonq/favicons/Makefile.am	24 Nov 2002 07:11:36 -0000	1.4
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = $(all_includes)
+ kded_favicons_la_SOURCES = favicons.cpp favicons.skel
+-kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS) -undefined suppress -flat_namespace
+ kded_favicons_la_LIBADD = $(LIB_KSYCOCA)
+ 
+ METASOURCES = AUTO
+--- nsplugins/pluginscan.cpp	29 Oct 2002 03:07:09 -0000	1.1.1.3
++++ nsplugins/pluginscan.cpp	29 Oct 2002 03:39:40 -0000	1.4
+@@ -443,6 +443,7 @@
+         paths.append("/usr/lib/netscape/plugins");
+         paths.append("/usr/lib/netscape/plugins-libc5");
+         paths.append("/usr/lib/netscape/plugins-libc6");
++        paths.append("@PREFIX@/lib/mozilla/plugins");
+         paths.append("/usr/lib/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
+         config->writeEntry( "scanPaths", paths );
Index: trunk/dports/x11/kdeedu3/Portfile
===================================================================
--- trunk/dports/x11/kdeedu3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdeedu3/Portfile	(revision 1900)
@@ -0,0 +1,41 @@
+PortSystem 1.0
+name		kdeedu3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	educational games and software
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdeedu-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libjpeg:jpeg lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 \
+		lib:libpng.3:libpng lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdeedu-${version}.tar.bz2 md5 ed587675e6b4a18a416c05e0a106e8a7 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdeedu3/files/patch-kdeedu3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdeedu3/files/patch-kdeedu3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdeedu3/files/patch-kdeedu3-3.1.darwin	(revision 1900)
@@ -0,0 +1,334 @@
+
+--- applnk/Makefile.am	5 Nov 2002 19:56:40 -0000	1.1.1.3
++++ applnk/Makefile.am	16 Aug 2002 23:49:20 -0000	1.2
+@@ -15,8 +15,8 @@
+ 	$(mkinstalldirs) $(edu_folder)/Tools
+ 	$(INSTALL_DATA) $(srcdir)/tools.desktop $(edu_folder)/Tools/.directory
+ 
+-	$(mkinstalldirs) $(edu_folder)/Miscellanous
+-	$(INSTALL_DATA) $(srcdir)/miscellanous.desktop $(edu_folder)/Miscellanous/.directory
++	$(mkinstalldirs) $(edu_folder)/Miscellaneous
++	$(INSTALL_DATA) $(srcdir)/miscellaneous.desktop $(edu_folder)/Miscellaneous/.directory
+ 
+ uninstall-local:
+ 	-rm -f $(DESTDIR)$(kde_appsdir)/Settings/Databases/.directory
+@@ -24,4 +24,4 @@
+ 	-rm -f $(edu_folder)/Mathematics/.directory
+ 	-rm -f $(edu_folder)/Sience/.directory
+ 	-rm -f $(edu_folder)/Tools/.directory
+-	-rm -f $(edu_folder)/Miscellanous/.directory
++	-rm -f $(edu_folder)/Miscellaneous/.directory
+RCS file: applnk/miscellaneous.desktop
+diff -N applnk/miscellaneous.desktop
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ applnk/miscellaneous.desktop	20 Jan 2003 02:50:02 -0000	1.5
+@@ -0,0 +1,35 @@
++[Desktop Entry]
++Icon=edu_miscellaneous
++Name=Miscellaneous
++Name[af]=Allerande
++Name[bg]=Разни
++Name[bs]=Razno
++Name[da]=Diverse
++Name[de]=Verschiedenes
++Name[el]=Διάφορα
++Name[es]=Varios
++Name[et]=Mitmesugust
++Name[fo]=Ymiskt
++Name[fr]=Divers
++Name[he]=שונות
++Name[hu]=Egyéb
++Name[it]=Miscellanea
++Name[ja]=その他
++Name[lt]=Įvairūs dalykai
++Name[lv]=Dažādi
++Name[nb]=Diverse
++Name[nl]=Diversen
++Name[nn]=Ymse
++Name[nso]=Hlakahlakanego
++Name[pt]=Vários
++Name[pt_BR]=Outros
++Name[ru]=Разное
++Name[sk]=Rôzne
++Name[sl]=Razno
++Name[sv]=Diverse
++Name[tr]=Çeşitli
++Name[ven]=Zwo tangananaho
++Name[xh]=Umxhube wezinto
++Name[zh_CN]=杂项
++Name[zh_TW]=雜項
++Name[zu]=Ingxubevange
+RCS file: applnk/miscellanous.desktop
+diff -N applnk/miscellanous.desktop
+--- applnk/miscellanous.desktop	20 Nov 2002 02:04:25 -0000	1.1.1.6
++++ /dev/null	1 Jan 1970 00:00:00 -0000
+@@ -1,35 +0,0 @@
+-[Desktop Entry]
+-Icon=edu_miscellanous
+-Name=Miscellanous
+-Name[af]=Allerande
+-Name[bg]=Разни
+-Name[bs]=Razno
+-Name[da]=Diverse
+-Name[de]=Verschiedenes
+-Name[el]=Διάφορα
+-Name[es]=Varios
+-Name[et]=Mitmesugust
+-Name[fo]=Ymiskt
+-Name[fr]=Divers
+-Name[he]=שונות
+-Name[hu]=Egyéb
+-Name[it]=Miscellanea
+-Name[ja]=その他
+-Name[lt]=Įvairūs dalykai
+-Name[lv]=Dažādi
+-Name[nb]=Diverse
+-Name[nl]=Diversen
+-Name[nn]=Ymse
+-Name[nso]=Hlakahlakanego
+-Name[pt]=Vários
+-Name[pt_BR]=Outros
+-Name[ru]=Разное
+-Name[sk]=Rôzne
+-Name[sl]=Razno
+-Name[sv]=Diverse
+-Name[tr]=Çeşitli
+-Name[ven]=Zwo tangananaho
+-Name[xh]=Umxhube wezinto
+-Name[zh_CN]=杂项
+-Name[zh_TW]=雜項
+-Name[zu]=Ingxubevange
+--- flashkard/flashkard.kdevprj	5 Nov 2002 19:57:32 -0000	1.1.1.5
++++ flashkard/flashkard.kdevprj	29 Oct 2002 15:19:05 -0000	1.3
+@@ -159,7 +159,7 @@
+ [flashkard/flashkard.desktop]
+ dist=true
+ install=true
+-install_location=$$(kde_appsdir)/Edutainment/Miscellanous/flashkard.desktop
++install_location=$$(kde_appsdir)/Edutainment/Miscellaneous/flashkard.desktop
+ type=DATA
+ 
+ [flashkard/flashkard.h]
+--- flashkard/flashkard/Makefile.am	5 Nov 2002 19:57:32 -0000	1.1.1.4
++++ flashkard/flashkard/Makefile.am	30 Oct 2002 00:55:20 -0000	1.5
+@@ -7,7 +7,7 @@
+ 
+ EXTRA_DIST = main.cpp flashkard.cpp flashkard.h flashkard.desktop datawidget.cpp datawidget.h flashkardui.rc quizwidget.cpp quizwidget.h guesswidget.cpp guesswidget.h flashcardswidget.cpp flashcardswidget.h card.cpp card.h xmlwriter.cpp xmlwriter.h 
+ 
+-appsdir = $(kde_appsdir)/Edutainment/Miscellanous
++appsdir = $(kde_appsdir)/Edutainment/Miscellaneous
+ apps_DATA = flashkard.desktop
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+--- kalzium/calculations/Makefile.am	5 Nov 2002 19:57:32 -0000	1.1.1.4
++++ kalzium/calculations/Makefile.am	2 Oct 2002 02:01:37 -0000	1.3
+@@ -1,9 +1,10 @@
+ noinst_LTLIBRARIES = libkmol.la
+ 
+ libkmol_la_SOURCES = kmolcalc.cpp kmolelements.cpp kmoledit.cpp 
+-
+-libkmol_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-
++libkmol_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
++libkmol_la_LDFLAGS = $(all_libraries) -module -avoid-version 1:1:0 $(QT_LDFLAGS)
++noinst_HEADERS = kmolcalc.h kmolelements.h kmoledit.h 
++ 
+ INCLUDES= $(all_includes)
+ 
+ METASOURCES = AUTO
+--- khangman/khangman/khangman.cpp	5 Nov 2002 19:57:40 -0000	1.1.1.5
++++ khangman/khangman/khangman.cpp	31 Oct 2002 19:19:39 -0000	1.2
+@@ -23,7 +23,7 @@
+ KHangMan::KHangMan(QWidget *parent, const char *name) : MainW(parent, name)
+ {
+ //set the usuall stuff...
+-	setIcon(locate("icon","hicolor/16x16/apps/khangman.png"));
++	setIcon(locate("icon","crystalsvg/16x16/apps/khangman.png"));
+ 	setCaption(i18n("KHangMan %1").arg(KHM_VERSION));
+ 	missedChar = 0;
+ 	modeAdult->hide();
+@@ -32,8 +32,8 @@
+ //plugs in the Help menu...
+ 	helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true);
+ 	helpMenu->menu()->insertSeparator(-1);
+-	helpMenu->menu()->insertItem(QPixmap( locate("icon","hicolor/16x16/actions/info.png") ), "&Info",this,SLOT(slotInfo()) );
+-	//kdDebug() << locate("icon","hicolor/16x16/actions/info.png") << endl;
++	helpMenu->menu()->insertItem(QPixmap( locate("icon","crystalsvg/16x16/actions/info.png") ), "&Info",this,SLOT(slotInfo()) );
++	//kdDebug() << locate("icon","crystalsvg/16x16/actions/info.png") << endl;
+ 	btnHelp->setPopup(helpMenu->menu());
+ 
+ //now we preload the pixmaps...
+--- kiten/Makefile.am	5 Nov 2002 19:59:22 -0000	1.1.1.4
++++ kiten/Makefile.am	29 Nov 2002 19:01:20 -0000	1.4
+@@ -2,27 +2,33 @@
+ 
+ SUBDIRS = pics
+ 
+-lib_LTLIBRARIES = kiten.la
++lib_LTLIBRARIES = kiten.la libkiten_main.la
+ 
+-kiten_la_SOURCES = 	main.cpp \
+-				dict.cpp \
+-				kiten.cpp \
+-				optiondialog.cpp \
+-				rad.cpp \
+-				deinf.cpp \
+-				kromajiedit.cpp \
+-				widgets.cpp \
+-				learn.cpp \
+-				kloader.cpp \
+-				ksaver.cpp
++libkiten_main_la_SOURCES = dict.cpp \
++	kiten.cpp \
++	optiondialog.cpp \
++	rad.cpp \
++	deinf.cpp \
++	kromajiedit.cpp \
++	widgets.cpp \
++	learn.cpp \
++	kloader.cpp \
++	ksaver.cpp
++libkiten_main_la_LIBADD = $(LIB_QT) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE) -lkdeprint
++libkiten_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
+ 
+-kiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kiten_la_SOURCES = kiten_la_main.cpp
++kiten_la_LIBADD  = libkiten_main.la
++kiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version -module
++
++kiten_la_main.cpp: main.cpp
++	cat main.cpp > kiten_la_main.cpp
+ 
+ bin_PROGRAMS = kiten kitengen
+ 
+-kiten_LDADD = kiten.la $(KDE_RPATH) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT)
++kiten_LDADD = libkiten_main.la
+ kiten_LDFLAGS = $(all_libraries)
+-kiten_SOURCES = dummy.cpp
++kiten_SOURCES = main.cpp
+ 
+ kitengen_SOURCES = xjdxgen.c
+ kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+--- klettres/klettres/pics/Makefile.am	5 Nov 2002 20:00:23 -0000	1.1.1.4
++++ klettres/klettres/pics/Makefile.am	31 Oct 2002 19:19:39 -0000	1.2
+@@ -10,19 +10,19 @@
+ 	$(INSTALL_DATA) $(srcdir)/klsplash.png $(kde_datadir)/klettres/pics/klsplash.jpeg
+ 	$(mkinstalldirs) $(kde_datadir)/klettres/pics/
+ 	$(INSTALL_DATA) $(srcdir)/background1.png $(kde_datadir)/klettres/pics/background1.png
+-	$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
+-	$(INSTALL_DATA) $(srcdir)/grownup.png $(kde_icondir)/hicolor/48x48/apps/grownup.png
+-	$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
+-	$(INSTALL_DATA) $(srcdir)/kids.png $(kde_icondir)/hicolor/48x48/apps/kids.png
+-	$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
+-	$(INSTALL_DATA) $(srcdir)/menubar.png $(kde_icondir)/hicolor/48x48/apps/menubar.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
++	$(INSTALL_DATA) $(srcdir)/grownup.png $(kde_icondir)/crystalsvg/48x48/apps/grownup.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
++	$(INSTALL_DATA) $(srcdir)/kids.png $(kde_icondir)/crystalsvg/48x48/apps/kids.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
++	$(INSTALL_DATA) $(srcdir)/menubar.png $(kde_icondir)/crystalsvg/48x48/apps/menubar.png
+ 
+ uninstall-local:
+ 	-rm -f $(kde_datadir)/klettres/pics/klettres_back.jpeg
+ 	-rm -f $(kde_datadir)/klettres/pics/klsplash.jpeg
+ 	-rm -f $(kde_datadir)/klettres/pics/background1.png
+-	-rm -f $(kde_icondir)/hicolor/48x48/apps/grownup.png
+-	-rm -f $(kde_icondir)/hicolor/48x48/apps/kids.png
+-	-rm -f $(kde_icondir)/hicolor/48x48/apps/menubar.png
++	-rm -f $(kde_icondir)/crystalsvg/48x48/apps/grownup.png
++	-rm -f $(kde_icondir)/crystalsvg/48x48/apps/kids.png
++	-rm -f $(kde_icondir)/crystalsvg/48x48/apps/menubar.png
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+RCS file: kmathtool/configure.in.in
+diff -N kmathtool/configure.in.in
+--- kmathtool/configure.in.in	2 Oct 2002 01:26:27 -0000	1.1.1.1
++++ /dev/null	1 Jan 1970 00:00:00 -0000
+@@ -1 +0,0 @@
+-DO_NOT_COMPILE="$DO_NOT_COMPILE kmathtool"
+--- kmplot/kmplot/diagr.cpp	4 Jan 2003 17:51:54 -0000	1.1.1.6
++++ kmplot/kmplot/diagr.cpp	4 Jan 2003 18:15:41 -0000	1.5
+@@ -27,6 +27,26 @@
+ #include "misc.h"
+ #include "diagr.h"
+ 
++/* ugly ugly ugly -- why o why does the compiler not find these
++ * friggin' functions in math.h?!?!
++ */
++
++#if !defined(isnan)
++# if defined(NAN)
++#  define isnan(x) (x)==NAN?1:0
++# else
++extern __pure int isnan __P((double));
++# endif
++#endif
++
++#if !defined(isinf)
++# if defined(INFINITY)
++#  define isinf(x) (x)==INFINITY?1:0
++# else
++extern __pure int isinf __P((double));
++# endif
++#endif
++
+ #ifdef __osf__
+ #include <nan.h>
+ #define isnan(x) IsNAN(x)
+--- kstars/kstars/modcalcdaylength.cpp	5 Nov 2002 20:00:51 -0000	1.1.1.6
++++ kstars/kstars/modcalcdaylength.cpp	29 Oct 2002 15:19:09 -0000	1.4
+@@ -320,4 +320,5 @@
+ 	delete num;
+ 
+ }
++
+ #include "modcalcdaylength.moc"
+--- kstars/kstars/data/Makefile.am	5 Nov 2002 20:01:24 -0000	1.1.1.5
++++ kstars/kstars/data/Makefile.am	31 Oct 2002 19:19:39 -0000	1.2
+@@ -627,9 +627,9 @@
+ 	-rm -f $(kde_datadir)/kstars/cnames.dat
+ 	-rm -f $(kde_datadir)/kstars/ngcic.dat
+ 	-rm -f $(kde_datadir)/kstars/sao.dat
+-	-rm -f $(kde_icondir)/hicolor/16x16/apps/kstars.png
+-	-rm -f $(kde_icondir)/hicolor/32x32/apps/kstars.png  
+-	-rm -f $(kde_icondir)/hicolor/48x48/apps/kstars.png
++	-rm -f $(kde_icondir)/crystalsvg/16x16/apps/kstars.png
++	-rm -f $(kde_icondir)/crystalsvg/32x32/apps/kstars.png  
++	-rm -f $(kde_icondir)/crystalsvg/48x48/apps/kstars.png
+ 	-rm -f $(kde_icondir)/locolor/16x16/apps/kstars.png 
+ 	-rm -f $(kde_icondir)/locolor/32x32/apps/kstars.png 
+ 	-rm -f $(kde_icondir)/locolor/48x48/apps/kstars.png 
+--- ktouch/Makefile.am	5 Nov 2002 20:02:34 -0000	1.1.1.4
++++ ktouch/Makefile.am	16 Aug 2002 23:49:20 -0000	1.2
+@@ -6,7 +6,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ # place KTouch in the start menu under utilities
+-kdelnkdir = $(kde_appsdir)/Edutainment/Miscellanous
++kdelnkdir = $(kde_appsdir)/Edutainment/Miscellaneous
+ kdelnk_DATA = ktouch.desktop
+ 
+ KDE_ICON = ktouch
+--- kvoctrain/kvoctrain/Makefile.am	27 Nov 2002 00:24:55 -0000	1.1.1.6
++++ kvoctrain/kvoctrain/Makefile.am	31 Oct 2002 19:19:39 -0000	1.2
+@@ -49,13 +49,14 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Edutainment/Languages/
+ 	$(INSTALL_DATA) $(srcdir)/kvoctrain.desktop $(DESTDIR)$(kde_appsdir)/Edutainment/Languages/kvoctrain.desktop
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/
++	$(INSTALL_DATA) $(srcdir)/pics/kvoctrain.xpm $(DESTDIR)$(kde_icondir)/kvoctrain.xpm
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/
+-	$(INSTALL_DATA) $(srcdir)/pics/48x48-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kvoctrain.xpm
+-	$(INSTALL_DATA) $(srcdir)/pics/32x32-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kvoctrain.xpm
+-	$(INSTALL_DATA) $(srcdir)/pics/22x22-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kvoctrain.xpm
++	$(INSTALL_DATA) $(srcdir)/pics/48x48-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvoctrain.xpm
++	$(INSTALL_DATA) $(srcdir)/pics/32x32-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvoctrain.xpm
++	$(INSTALL_DATA) $(srcdir)/pics/22x22-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvoctrain.xpm
+ 	$(INSTALL_DATA) $(srcdir)/pics/16x16-kvoctrain.xpm $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kvoctrain.xpm
+ 	$(mkinstalldirs) $(kde_datadir)/kvoctrain
+ 	for pic in $(APPS_FILES); do \
Index: trunk/dports/x11/kdegames3/Portfile
===================================================================
--- trunk/dports/x11/kdegames3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdegames3/Portfile	(revision 1900)
@@ -0,0 +1,43 @@
+PortSystem 1.0
+name		kdegames3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	KDE and Qt-based games
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdegames-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libaudiofile:audiofile lib:libart_lgpl_2:libart_lgpl \
+		lib:libdl.1:dlcompat lib:libjpeg:jpeg lib:libkdecore.4:kdelibs3 \
+		bin:startkde:kdebase3 lib:libmad:mad lib:libogg:libogg lib:libpng.3:libpng \
+		lib:libpoll:poll-emulator lib:libqt-mt.3.1:qt3 lib:libvorbis:libvorbis \
+		lib:libX11.6:XFree86
+
+checksums	kdegames-${version}.tar.bz2 md5 cfc3fef5f162dc7ecd9465a11bdf9b1b \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdegames3/files/patch-kdegames3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdegames3/files/patch-kdegames3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdegames3/files/patch-kdegames3-3.1.darwin	(revision 1900)
@@ -0,0 +1,141 @@
+
+--- kbackgammon/Makefile.am	10 Dec 2002 20:31:41 -0000	1.1.1.4
++++ kbackgammon/Makefile.am	10 Dec 2002 20:56:04 -0000	1.7
+@@ -9,6 +9,9 @@
+ 			kbgstatus.cpp
+ kbackgammon_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kbackgammon_main.cpp: main.cpp
++	cat main.cpp > kbackgammon_main.cpp
++
+ noinst_HEADERS = version.h kbg.h kbgboard.h kbgtextview.h kbgstatus.h
+ 
+ SUBDIRS = pics sounds icons engines
+@@ -22,9 +25,3 @@
+ messages: rc.cpp	
+ 	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+ 	$(XGETTEXT) $$LIST -o $(podir)/kbackgammon.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+-install-data-local:
+-	rm -rf $(DESTDIR)$(kde_appsdir)/Games/kbackgammon.desktop
+--- kbackgammon/engines/Makefile.am	25 Jun 2002 02:34:25 -0000	1.1.1.1
++++ kbackgammon/engines/Makefile.am	25 Jun 2002 02:35:57 -0000	1.2
+@@ -3,7 +3,7 @@
+ libkbgengines_la_SOURCES = dummy.cpp
+ libkbgengines_la_LIBADD  = offline/libkbgoffline.la gnubg/libkbggnubg.la \
+                            generic/libkbggeneric.la fibs/libkbgfibs.la   \
+-			   nextgen/libkbgnextgen.la
++			   nextgen/libkbgnextgen.la $(LIB_KDECORE) $(LIB_QT)
+ 
+ INCLUDES= $(all_includes)
+ 
+--- kolf/Makefile.am	29 Oct 2002 15:53:13 -0000	1.1.1.3
++++ kolf/Makefile.am	1 Dec 2002 17:02:07 -0000	1.7
+@@ -1,17 +1,17 @@
+ SUBDIRS = objects sounds courses pics graphics
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdegames $(all_includes)
+ 
+-lib_LTLIBRARIES = libkolf.la
++lib_LTLIBRARIES = libkolf_shared.la
+ bin_PROGRAMS = kolf
+ 
+-libkolf_la_SOURCES = \
++libkolf_shared_la_SOURCES = \
+ 	kolf.cpp game.cpp canvasitem.cpp ball.cpp newgame.cpp config.cpp \
+ 	scoreboard.cpp editor.cpp pluginloader.cpp object.cpp vector.cpp \
+ 	printdialogpage.cpp kcomboboxdialog.cpp kvolumecontrol.cpp \
+ 	floater.cpp slope.cpp
+ 
+-libkolf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+-libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde
++libkolf_shared_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic -avoid-version
++libkolf_shared_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -lsoundserver_idl -lmcop -lartsflow_idl -lkdeprint
+ 
+ # the installed header files
+ kolfinclude_HEADERS = \
+@@ -24,17 +24,16 @@
+ # kdeinited lib
+ kde_module_LTLIBRARIES = kolf.la
+ kolf_la_SOURCES = main.cpp
+-kolf_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kolf_la_LIBADD = libkolf.la
+-
++kolf_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version -module
++kolf_la_LIBADD = libkolf_shared.la
+ 
+ # the empty "stub" app that has nothing
+-kolf_SOURCES = dummy.cpp
++kolf_SOURCES = kolf_main.cpp
+ kolf_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kolf_LDADD   = kolf.la
++kolf_LDADD   = libkolf_shared.la
+ 
+-dummy.cpp:
+-	echo > dummy.cpp
++kolf_main.cpp: main.cpp
++	cat main.cpp > kolf_main.cpp
+ 
+ EXTRA_DIST = kolf.desktop
+ 
+--- kpat/freecell-solver/freecell.c	25 Jun 2002 02:34:26 -0000	1.1.1.1
++++ kpat/freecell-solver/freecell.c	25 Jun 2002 02:35:57 -0000	1.2
+@@ -12,7 +12,9 @@
+ #include <stdio.h>
+ #include <math.h>
+ #if FCS_STATE_STORAGE==FCS_STATE_STORAGE_LIBREDBLACK_TREE
++#ifndef __APPLE__
+ #include <search.h>
++#endif
+ #endif
+ 
+ 
+--- kpat/freecell-solver/intrface.c	25 Jun 2002 02:34:26 -0000	1.1.1.1
++++ kpat/freecell-solver/intrface.c	25 Jun 2002 02:35:57 -0000	1.2
+@@ -16,7 +16,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #if FCS_STATE_STORAGE==FCS_STATE_STORAGE_LIBREDBLACK_TREE
++#ifndef __APPLE__
+ #include <search.h>
++#endif
+ #endif
+ 
+ 
+--- kpat/freecell-solver/md5.h	14 Aug 2002 16:24:51 -0000	1.1.1.2
++++ kpat/freecell-solver/md5.h	14 Aug 2002 18:49:24 -0000	1.3
+@@ -14,7 +14,11 @@
+ #elif defined(__osf__)
+ typedef unsigned int u_int32_t;
+ #elif !defined(__linux__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
++# ifdef __APPLE__
++# include <sys/types.h>
++# else
+ typedef uint32_t u_int32_t;
++# endif
+ #endif  
+ 
+ 
+--- kpat/freecell-solver/scans.c	25 Jun 2002 02:34:26 -0000	1.1.1.1
++++ kpat/freecell-solver/scans.c	25 Jun 2002 02:35:57 -0000	1.2
+@@ -13,7 +13,9 @@
+ #include <stdio.h>
+ #include <math.h>
+ #if FCS_STATE_STORAGE==FCS_STATE_STORAGE_LIBREDBLACK_TREE
++#ifndef __APPLE__
+ #include <search.h>
++#endif
+ #endif
+ 
+ #include "config.h"
+--- libksirtet/lib/mp_interface.cpp	10 Jul 2002 04:33:13 -0000	1.1.1.1
++++ libksirtet/lib/mp_interface.cpp	13 Jul 2002 18:11:52 -0000	1.2
+@@ -1,5 +1,6 @@
+ #include "mp_interface.h"
+ #include "mp_interface.moc"
++#include "mp_board.moc"
+ 
+ #include <qpainter.h>
+ #include <qlayout.h>
Index: trunk/dports/x11/kdegraphics3/Portfile
===================================================================
--- trunk/dports/x11/kdegraphics3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdegraphics3/Portfile	(revision 1900)
@@ -0,0 +1,42 @@
+PortSystem 1.0
+name		kdegraphics3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	graphics manipulation programs
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdegraphics-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libImlib:imlib lib:libart_lgpl_2:libart_lgpl \
+		lib:libdl.1:dlcompat lib:libfreetype:freetype lib:libjpeg:jpeg \
+		lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 lib:libpng.3:libpng \
+		lib:libtiff:tiff lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdegraphics-${version}.tar.bz2 md5 1daa1a669131015db73a98f6ca26e232 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdegraphics3/files/patch-kdegraphics3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdegraphics3/files/patch-kdegraphics3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdegraphics3/files/patch-kdegraphics3-3.1.darwin	(revision 1900)
@@ -0,0 +1,313 @@
+
+--- kcoloredit/Makefile.am	10 Jul 2002 04:37:17 -0000	1.1.1.2
++++ kcoloredit/Makefile.am	5 Nov 2002 21:40:58 -0000	1.5
+@@ -17,6 +17,11 @@
+ kcolorchooser_LDADD = $(LIB_KDEUI)
+ kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++#lib_LTLIBRARIES = kcolorchooser.la
++#kcolorchooser_la_SOURCES = kcolorchooser.cpp
++#kcolorchooser_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
++#kcolorchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version
++
+ noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
+ 	gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
+ 	kcoloreditview.h kxycolorselector.h kzcolorselector.h \
+@@ -25,11 +30,6 @@
+ 
+ lnk_DATA = kcoloredit.desktop kcolorchooser.desktop
+ lnkdir = $(kde_appsdir)/Graphics/More
+-
+-install-data-local: uninstall.desktop
+-	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Graphics
+-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Graphics/kcoloredit.desktop 
+-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Graphics/kcolorchooser.desktop
+ 
+ KDE_ICON = kcoloredit kcolorchooser
+ 
+--- kdvi/font.cpp	2 Oct 2002 23:47:07 -0000	1.1.1.4
++++ kdvi/font.cpp	2 Oct 2002 23:55:44 -0000	1.6
+@@ -5,6 +5,7 @@
+ 
+ #include <kdebug.h>
+ #include <klocale.h>
++#include <sys/types.h>
+ #include <qapplication.h>
+ #include <qfile.h>
+ 
+--- kghostview/Makefile.am	2 Oct 2002 23:47:21 -0000	1.1.1.2
++++ kghostview/Makefile.am	29 Nov 2002 19:01:20 -0000	1.2
+@@ -7,8 +7,9 @@
+ 
+ bin_PROGRAMS = 	kghostview
+ kde_module_LTLIBRARIES = libkghostviewpart.la
++lib_LTLIBRARIES = libkghostview_shared.la kghostview.la
+ 
+-libkghostviewpart_la_SOURCES = dscparse.cpp kgv_miniwidget.cpp marklist.cpp \
++libkghostview_shared_la_SOURCES = dscparse.cpp kgv_miniwidget.cpp marklist.cpp \
+ 	messages.cpp infodialog.cpp gotodialog.cpp kgvshell.cpp kpswidget.cpp \
+ 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
+ 	kgvconfigdialog.cpp kgvmainwidget.cpp dscparse_adapter.cpp \
+@@ -19,12 +20,26 @@
+ 	kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h dscparse.h \
+ 	dscparse_adapter.h qttableview.h kdscerrordialog.h
+ 
++kghostview_la_SOURCES = kghostview_la_main.cpp
++kghostview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kghostview_la_LIBADD  = libkghostview_shared.la
++
++kghostview_la_main.cpp: main.cpp
++	cat main.cpp > kghostview_la_main.cpp
++
+ kghostview_SOURCES = main.cpp
+ kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kghostview_LDADD = libkghostviewpart.la
++kghostview_LDADD = libkghostview_shared.la
++
++libkghostviewpart_la_SOURCES = libkghostviewpart_la_dummy.cpp
++libkghostviewpart_la_LIBADD  = libkghostview_shared.la
++libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++
++libkghostviewpart_la_dummy.cpp:
++	echo > libkghostviewpart_la_dummy.cpp
+ 
+-libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++libkghostview_shared_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
++libkghostview_shared_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint $(LIB_QT) $(LIB_KDECORE) -lkdeui
+ 
+ METASOURCES = AUTO
+ EXTRA_DIST = kghostview.desktop 
+--- kmrml/kmrml/Makefile.am	2 Oct 2002 23:47:24 -0000	1.1.1.1
++++ kmrml/kmrml/Makefile.am	29 Nov 2002 19:01:20 -0000	1.2
+@@ -28,7 +28,7 @@
+ servicemenudir = $(kde_datadir)/konqueror/servicemenus
+ 
+ #############################################
+-CLEANFILES = dummy.cpp
++CLEANFILES = mrmlsearch_main.cpp
+ bin_PROGRAMS = mrmlsearch
+ lib_LTLIBRARIES = mrmlsearch.la
+ 
+@@ -36,9 +36,12 @@
+ mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ mrmlsearch_la_SOURCES = mrmlsearch.cpp
+ 
+-mrmlsearch_SOURCES = dummy.cpp
+-mrmlsearch_LDADD = mrmlsearch.la $(LIB_KDECORE)
++mrmlsearch_SOURCES = mrmlsearch_main.cpp
++mrmlsearch_LDADD   = $(LIB_KMRMLSTUFF) $(LIB_KDECORE)
+ mrmlsearch_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++mrmlsearch_main.cpp: mrmlsearch.cpp
++	cat mrmlsearch.cpp > mrmlsearch_main.cpp
+ 
+ messages:
+ 	$(EXTRACTRC) */*.ui > rc.cpp
+--- kmrml/kmrml/server/Makefile.am	2 Oct 2002 23:47:25 -0000	1.1.1.1
++++ kmrml/kmrml/server/Makefile.am	29 Nov 2002 19:01:21 -0000	1.4
+@@ -4,8 +4,8 @@
+ LDFLAGS =$(all_libraries)
+ kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel
+ # watcher.stub
+-kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA)
++kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version $(QT_LDFLAGS)
++kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) -lDCOP -lkded_main
+ 
+ METASOURCES = AUTO
+ 
+--- kpovmodeler/Makefile.am	29 Oct 2002 16:46:33 -0000	1.1.1.4
++++ kpovmodeler/Makefile.am	29 Nov 2002 19:01:21 -0000	1.6
+@@ -4,7 +4,7 @@
+ 
+ SUBDIRS = pics examples
+ 
+-kde_module_LTLIBRARIES = libkpovmodelerpart.la
++kde_module_LTLIBRARIES = libkpovmodelerpart.la libkpovmodeler_shared.la kpovmodeler.la
+ bin_PROGRAMS = kpovmodeler
+ 
+ 
+@@ -83,7 +83,7 @@
+ 	pmrendermode.cpp pmresourcelocator.cpp pmtruetypecache.cpp \
+ 	pmdocumentationmap.cpp
+ 
+-libkpovmodelerpart_la_SOURCES = $(pmallsources)
++libkpovmodeler_shared_la_SOURCES = $(pmallsources)
+ 
+ noinst_HEADERS = pmpart.h pmfactory.h pmview.h pmshell.h pmobjectdrag.h \
+ 	pmtreeview.h pmtreeviewitem.h pmerrordialog.h \
+@@ -159,13 +159,27 @@
+ 	\
+ 	version.h pmdocumentformat.h
+ 
+-libkpovmodelerpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) 
+-libkpovmodelerpart_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KPARTS) -lglut -lGLU -lGL -lXmu -lXi
+-libkpovmodelerpart_la_METASOURCES = AUTO
++libkpovmodeler_shared_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -avoid-version
++libkpovmodeler_shared_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KPARTS) -lglut -lGLU -lGL -lXmu -lXi $(LIB_QT) $(LIB_KDECORE) -lkio -lkdeui
++libkpovmodeler_shared_la_METASOURCES = AUTO
++
++libkpovmodelerpart_la_SOURCES = libkpovmodelerpart_la_dummy.cpp
++libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -avoid-version -module
++libkpovmodelerpart_la_LIBADD  = libkpovmodeler_shared.la
++
++libkpovmodelerpart_la_dummy.cpp:
++	echo > libkpovmodelerpart_la_dummy.cpp
++
++kpovmodeler_la_SOURCES = kpovmodeler_la_main.cpp
++kpovmodeler_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kpovmodeler_la_LIBADD  = libkpovmodeler_shared.la
++
++kpovmodeler_la_main.cpp: main.cpp
++	cat main.cpp > kpovmodeler_la_main.cpp
+ 
+ kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ kpovmodeler_SOURCES = main.cpp
+-kpovmodeler_LDADD = libkpovmodelerpart.la $(LIB_KFILE)
++kpovmodeler_LDADD = libkpovmodeler_shared.la
+ 
+ #kpovmodeler_SOURCES = $(pmallsources) main.cpp
+ #kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+--- kruler/Makefile.am	29 Oct 2002 16:46:52 -0000	1.1.1.3
++++ kruler/Makefile.am	5 Nov 2002 21:40:59 -0000	1.2
+@@ -11,10 +11,6 @@
+ lnkdir = $(kde_appsdir)/Graphics/More
+ lnk_DATA = kruler.desktop
+ 
+-install-data-local: uninstall.desktop
+-	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Graphics
+-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Graphics/kruler.desktop
+-
+ appdir = $(kde_datadir)/kruler
+ app_DATA = eventsrc
+ 
+--- ksnapshot/Makefile.am	10 Jul 2002 04:38:27 -0000	1.1.1.2
++++ ksnapshot/Makefile.am	5 Nov 2002 21:40:59 -0000	1.2
+@@ -12,10 +12,6 @@
+ lnkdir = $(kde_appsdir)/Graphics/More
+ lnk_DATA = ksnapshot.desktop
+ 
+-install-data-local: uninstall.desktop
+-	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Graphics
+-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Graphics/ksnapshot.desktop
+-
+ KDE_ICON = ksnapshot
+ 
+ EXTRA_DIST = $(lnk_DATA)
+--- kuickshow/configure.in.in	10 Jul 2002 04:38:27 -0000	1.1.1.2
++++ kuickshow/configure.in.in	19 Oct 2002 21:02:42 -0000	1.2
+@@ -26,6 +26,8 @@
+     AC_MSG_RESULT($ac_imlib_config)
+     LIB_IMLIB=`$ac_imlib_config --libs`
+     AC_SUBST(LIB_IMLIB)
++    IMLIB_CFLAGS=`$ac_imlib_config --cflags`
++    AC_SUBST(IMLIB_CFLAGS)
+   fi
+ else
+   ac_imlib_config=`which imlib-config 2>/dev/null`
+--- kuickshow/src/Makefile.am	10 Jul 2002 04:38:37 -0000	1.1.1.2
++++ kuickshow/src/Makefile.am	29 Nov 2002 19:01:21 -0000	1.4
+@@ -1,25 +1,33 @@
+ ## Makefile.am for kuickshow
+ 
+ bin_PROGRAMS = kuickshow
+-lib_LTLIBRARIES = kuickshow.la
++lib_LTLIBRARIES = kuickshow.la libkuickshow_main.la
+ 
+ # set the include path for X, qt and KDE
+ INCLUDES = $(all_includes)
+ KDE_CXXFLAGS = $(IMLIB_CFLAGS)
+-CLEANFILES = dummy.cpp
++CLEANFILES = kuickshow_la_main.cpp
+ METASOURCES = AUTO
+ 
+-kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB)
+-kuickshow_la_SOURCES =	kuickshow.cpp \
+-	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
++libkuickshow_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkuickshow_main_la_LIBADD  = -lkdeprint $(LIB_IMLIB) $(LIB_KDECORE) \
++	$(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDEFX)
++libkuickshow_main_la_SOURCES =	kuickshow.cpp \
++	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp \
+ 	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
+ 	imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp \
+ 	kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp
+ 
++kuickshow_la_SOURCES = kuickshow_la_main.cpp
++kuickshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kuickshow_la_LIBADD  = libkuickshow_main.la
++
++kuickshow_la_main.cpp: main.cpp
++	cat main.cpp > kuickshow_la_main.cpp
++
+ # now the kuickshow binary
+-kuickshow_LDADD = kuickshow.la $(LIB_KIO) $(LIB_IMLIB)
+-kuickshow_SOURCES = dummy.cpp
++kuickshow_LDADD = libkuickshow_main.la
++kuickshow_SOURCES = main.cpp
+ kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ 
+--- kview/Makefile.am	29 Oct 2002 16:46:58 -0000	1.1.1.4
++++ kview/Makefile.am	29 Nov 2002 19:01:21 -0000	1.5
+@@ -5,21 +5,28 @@
+ METASOURCES = AUTO
+ 
+ bin_PROGRAMS = kview
+-lib_LTLIBRARIES = kview.la libkviewsupport.la
++lib_LTLIBRARIES = kview.la libkview_main.la libkviewsupport.la
+ 
+ noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
+ 
+ libkviewsupport_la_SOURCES = kpreferencesdialog.cpp kpreferencesmodule.cpp kpluginselector.cpp
+-libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
++libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
+ libkviewsupport_la_LIBADD  = $(LIB_KDEUI)
+ 
+-kview_SOURCES = dummy.cpp
++libkview_main_la_SOURCES = kviewconfmodules.cpp kview.cpp
++libkview_main_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
++libkview_main_la_LIBADD  = libkviewsupport.la $(LIB_KPARTS) $(LIB_KIO)
++
++kview_SOURCES = kview_main.cpp
+ kview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kview_LDADD = kview.la
++kview_LDADD = libkview_main.la
++
++kview_main.cpp: main.cpp
++	cat main.cpp > kview_main.cpp
+ 
+-kview_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp
++kview_la_SOURCES = main.cpp
+ kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kview_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la
++kview_la_LIBADD = libkview_main.la
+ 
+ lnkdir = $(kde_appsdir)/Graphics
+ lnk_DATA = kview.desktop
+--- kview/kviewviewer/Makefile.am	2 Oct 2002 23:48:00 -0000	1.1.1.3
++++ kview/kviewviewer/Makefile.am	29 Nov 2002 19:01:21 -0000	1.2
+@@ -7,7 +7,7 @@
+ 
+ libkviewviewer_la_SOURCES = imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp generalconfigwidget.ui confmodules.cpp
+ libkviewviewer_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+-libkviewviewer_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) $(LIB_KDEPRINT) $(top_builddir)/kview/libkviewsupport.la
++libkviewviewer_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) -lkdeprint $(top_builddir)/kview/libkviewsupport.la
+ 
+ METASOURCES = AUTO
+ 
+--- kviewshell/Makefile.am	29 Oct 2002 16:46:59 -0000	1.1.1.4
++++ kviewshell/Makefile.am	1 Dec 2002 17:02:07 -0000	1.7
+@@ -19,8 +19,8 @@
+ kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts
+ 
+ libkmultipage_la_SOURCES = kmultipage.cpp centeringScrollview.cpp kmultipageInterface.skel
+-libkmultipage_la_LDFLAGS = $(all_libraries)
+-libkmultipage_la_LIBADD = $(LIB_KFILE) -lkparts
++libkmultipage_la_LDFLAGS = $(all_libraries) -avoid-version
++libkmultipage_la_LIBADD = $(LIB_KFILE) -lkparts -lDCOP $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ libkpagetest_la_SOURCES = kpagetest.cpp 
+ libkpagetest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: trunk/dports/x11/kdelibs3/Portfile
===================================================================
--- trunk/dports/x11/kdelibs3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdelibs3/Portfile	(revision 1900)
@@ -0,0 +1,45 @@
+PortSystem 1.0
+name		kdelibs3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	essential libraries for KDE applications
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdelibs-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+#FIXME: no way to depend on cups that gets the cups package for required headers
+depends_lib	lib:libart_lgpl_2:libart_lgpl lib:libartsflow.1:arts \
+		lib:libaudiofile.0:audiofile lib:libdl.1:dlcompat lib:libiconv.2:gettext \
+		lib:libjpeg.62:jpeg lib:libmad:mad lib:libogg:libogg lib:libpcre:pcre \
+		lib:libpng.3:libpng lib:libpoll.1:poll-emulator lib:libqt-mt.3.1:qt3 \
+		lib:libtiff.3:tiff lib:libvorbis.0:libvorbis lib:libxml2.2:libxml2 \
+		lib:libxslt:libxslt lib:libX11.6:XFree86 
+
+checksums	kdelibs-${version}.tar.bz2 md5 4b5cb94d5889134ba4e86749e6b5476c \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking --enable-cups --with-ldap
+build.env	${configure.env}
Index: trunk/dports/x11/kdelibs3/files/patch-kdelibs3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdelibs3/files/patch-kdelibs3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdelibs3/files/patch-kdelibs3-3.1.darwin	(revision 1900)
@@ -0,0 +1,1394 @@
+
+--- configure.in.in	4 Jan 2003 04:27:29 -0000	1.1.1.5
++++ configure.in.in	4 Jan 2003 04:43:31 -0000	1.7
+@@ -191,6 +191,18 @@
+ AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libkdeui.la')
+ AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
+ AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
++AC_SUBST(LIB_KFORMULA, '$(top_builddir)/kformula/libkformula.la')
++AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
++AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
++AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
++AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
++AC_SUBST(LIB_DCOP, '$(top_builddir)/dcop/libDCOP.la')
++AC_SUBST(LIB_KDESU, '$(top_builddir)/kdesu/libkdesu.la')
++AC_SUBST(LIB_KDEFX, '$(top_builddir)/kdefx/libkdefx.la')
++AC_SUBST(LIB_KSPELL, '$(top_builddir)/kspell/libkspell.la')
++AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libkdeprint.la')
++AC_SUBST(LIB_KDED, '$(top_builddir)/kded/libkded.la')
++AC_SUBST(LIB_KDEFAKES, '$(top_builddir)/kdecore/libkdefakes.la')
+ 
+ AC_SUBST(EXTRA_SUBDIRS)
+ 
+--- arts/kde/mcop-dcop/Makefile.am	10 Jul 2002 04:41:04 -0000	1.1.1.2
++++ arts/kde/mcop-dcop/Makefile.am	26 Nov 2002 21:00:48 -0000	1.2
+@@ -1,16 +1,23 @@
+ 
+ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes)
+ 
++lib_LTLIBRARIES = libkmcop_main.la kmcop.la
+ bin_PROGRAMS = kmcop
+-lib_LTLIBRARIES = kmcop.la
+ 
+-kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
+-kmcop_la_LIBADD	= ../libartskde.la
++libkmcop_main_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
++libkmcop_main_la_LIBADD  = ../libartskde.la
++libkmcop_main_la_LDFLAGS = $(all_libraries) -version-info 1:0
++
++kmcop_la_SOURCES = kmcop_la_main.cpp
++kmcop_la_LIBADD	= ../libartskde.la libkmcop_main.la
+ kmcop_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ kmcop_la_METASOURCES = AUTO
+ 
+-kmcop_SOURCES = dummy.cpp
+-kmcop_LDADD = kmcop.la
++kmcop_la_main.cpp: kmcop_main.cpp
++	cat kmcop_main.cpp > kmcop_la_main.cpp
++
++kmcop_SOURCES = kmcop_main.cpp
++kmcop_LDADD = libkmcop_main.la
+ kmcop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = kmcop.h
+@@ -20,6 +27,3 @@
+ 
+ messages:
+ 	$(XGETTEXT) kmcop.cpp -o $(podir)/kmcop.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- arts/kde/mcop-dcop/kmcop.cpp	25 Jun 2002 02:46:53 -0000	1.1.1.1
++++ arts/kde/mcop-dcop/kmcop.cpp	26 Nov 2002 21:00:48 -0000	1.2
+@@ -46,7 +46,9 @@
+ 	QPtrList<MCOPDCOPObject> list;
+ };
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+     KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
+                          "0.1", I18N_NOOP("KDE MCOP-DCOP Bridge"),
+RCS file: arts/kde/mcop-dcop/kmcop_main.cpp
+diff -N arts/kde/mcop-dcop/kmcop_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ arts/kde/mcop-dcop/kmcop_main.cpp	26 Nov 2002 21:00:48 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- arts/knotify/Makefile.am	10 Jul 2002 04:41:09 -0000	1.1.1.2
++++ arts/knotify/Makefile.am	26 Nov 2002 21:00:48 -0000	1.10
+@@ -3,18 +3,29 @@
+ 
+ ####### Files
+ 
++lib_LTLIBRARIES = libknotify_main.la knotify.la
+ bin_PROGRAMS	= knotify
+-lib_LTLIBRARIES = knotify.la
+ 
+-knotify_la_SOURCES	= knotify.cpp knotify.skel
+-knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI)
++libknotify_main_la_SOURCES     = knotify.cpp knotify.skel
++libknotify_main_la_LIBADD      = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE) -lmcop -lkmedia2_idl -lartsflow_idl
++libknotify_main_la_LDFLAGS     = $(all_libraries) -avoid-version
++libknotify_main_la_METASOURCES = AUTO
++
++knotify_la_SOURCES     = knotify_la_main.cpp
++knotify_la_LIBADD      = libknotify_main.la
+ knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ knotify_la_METASOURCES = AUTO
+ 
+-knotify_SOURCES = dummy.cpp
+-knotify_LDADD = knotify.la
++knotify_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > knotify_la_main.cpp
++
++knotify_SOURCES = knotify_main.cpp
++knotify_LDADD = libknotify_main.la
+ knotify_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+ 
++knotify_main.cpp: stub_main.cpp
++	cat stub_main.cpp > knotify_main.cpp
++
+ check_PROGRAMS		= knotifytest
+ knotifytest_SOURCES	= knotifytest.cpp
+ knotifytest_LDADD	= $(LIB_KDECORE)
+@@ -28,5 +39,3 @@
+ messages:
+ 	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
+ 
+-dummy.cpp:
+-	echo > dummy.cpp
+--- arts/knotify/knotify.cpp	20 Nov 2002 00:53:48 -0000	1.1.1.5
++++ arts/knotify/knotify.cpp	26 Nov 2002 21:00:48 -0000	1.2
+@@ -81,7 +81,9 @@
+ };
+ 
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+     KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
+                          "3.0", I18N_NOOP("KDE Notification Server"),
+RCS file: arts/knotify/stub_main.cpp
+diff -N arts/knotify/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ arts/knotify/stub_main.cpp	26 Nov 2002 21:00:48 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kdemain(argc, argv);
++}
+--- dcop/Makefile.am	1 Oct 2002 03:04:42 -0000	1.1.1.4
++++ dcop/Makefile.am	28 Nov 2002 00:06:58 -0000	1.6
+@@ -26,10 +26,10 @@
+ 
+ INCLUDES=  $(all_includes)
+ 
++lib_LTLIBRARIES  = libDCOP.la libdcopserver_main.la dcopserver.la
+ bin_PROGRAMS = dcopserver dcopserver_shutdown
+ check_PROGRAMS = testdcop testdcopc
+ 
+-lib_LTLIBRARIES  = libDCOP.la dcopserver.la
+ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
+ libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
+ 
+@@ -45,13 +45,20 @@
+ # dcopstub needs to go first for --enable-final to work
+ libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
+ 
+-dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
+-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD   = libDCOP.la
+-
+-dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-dcopserver_SOURCES = dummy.cpp
+-dcopserver_LDADD   = dcopserver.la
++libdcopserver_main_la_LDFLAGS = -avoid-version $(all_libraries)
++libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
++libdcopserver_main_la_LIBADD  = libDCOP.la
++
++dcopserver_la_LDFLAGS = -avoid-version $(all_libraries) -module
++dcopserver_la_SOURCES = dcopserver_la_main.cpp
++dcopserver_la_LIBADD  = libdcopserver_main.la
++
++dcopserver_la_main.cpp: dcopserver_main.cpp
++	cat dcopserver_main.cpp > dcopserver_la_main.cpp
++
++dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module
++dcopserver_SOURCES = dcopserver_main.cpp
++dcopserver_LDADD   = libdcopserver_main.la
+ 
+ dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
+ 
+@@ -64,9 +71,6 @@
+ testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
+ 
+ EXTRA_DIST = HOWTO ICE
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+ DOXYGEN_REFERENCES = kdecore
+ DOXYGEN_EXCLUDE = KDE-ICE/*
+--- dcop/dcopserver.cpp	4 Jan 2003 04:27:39 -0000	1.1.1.4
++++ dcop/dcopserver.cpp	4 Jan 2003 04:43:31 -0000	1.3
+@@ -1544,7 +1544,9 @@
+ "Copyright (C) 1999-2001, The KDE Developers <http://www.kde.org>\n"
+ ;
+ 
+-int main( int argc, char* argv[] )
++extern "C" int kdemain(int, char**);
++
++int kdemain( int argc, char* argv[] )
+ {
+     bool serverid = false;
+     bool nofork = false;
+RCS file: dcop/dcopserver_main.cpp
+diff -N dcop/dcopserver_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ dcop/dcopserver_main.cpp	26 Nov 2002 21:00:48 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kdemain(argc, argv);
++}
+--- interfaces/kmediaplayer/Makefile.am	10 Jul 2002 04:41:58 -0000	1.1.1.1
++++ interfaces/kmediaplayer/Makefile.am	24 Nov 2002 07:11:20 -0000	1.2
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libkmediaplayer.la
+ 
+ libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
++libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -avoid-version
+ libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
+ libkmediaplayer_la_METASOURCES = AUTO
+ 
+--- interfaces/kscript/Makefile.am	10 Jul 2002 04:41:59 -0000	1.1.1.2
++++ interfaces/kscript/Makefile.am	24 Nov 2002 07:11:20 -0000	1.2
+@@ -9,7 +9,7 @@
+ #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
+ 
+ libkscript_la_SOURCES = scriptmanager.cpp
+-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
++libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -avoid-version
+ libkscript_la_LIBADD = $(LIB_KIO)
+ 
+ kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+--- interfaces/kscript/sample/Makefile.am	25 Jun 2002 02:46:54 -0000	1.1.1.1
++++ interfaces/kscript/sample/Makefile.am	24 Nov 2002 07:11:20 -0000	1.2
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libshellscript.la
+ 
+ libshellscript_la_SOURCES = shellscript.cpp
+-libshellscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
++libshellscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -avoid-version
+ libshellscript_la_LIBADD = ../libkscript.la
+ 
+ 
+--- interfaces/ktexteditor/Makefile.am	14 Aug 2002 14:00:12 -0000	1.1.1.3
++++ interfaces/ktexteditor/Makefile.am	24 Nov 2002 07:11:21 -0000	1.2
+@@ -21,7 +21,7 @@
+     viewstatusmsgdcopinterface.skel selectioninterfaceext.cpp selectionextdcopinterface.skel
+     
+     
+-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -avoid-version
+ libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la
+ 
+ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+--- kabc/Makefile.am	20 Nov 2002 00:54:01 -0000	1.1.1.6
++++ kabc/Makefile.am	23 Nov 2002 03:50:34 -0000	1.7
+@@ -4,8 +4,8 @@
+   -I$(top_srcdir)/kabc -I$(top_srcdir)/kab $(all_includes)
+ 
+ lib_LTLIBRARIES   = libkabc.la
+-libkabc_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:1 -module
+-libkabc_la_LIBADD  = vcard/libvcard.la ../kdeui/libkdeui.la ../kio/libkio.la
++libkabc_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:1
++libkabc_la_LIBADD  = $(top_builddir)/kabc/vcard/libvcard.la $(top_builddir)/kdeui/libkdeui.la $(top_builddir)/kio/libkio.la
+ 
+ libkabc_la_SOURCES = \
+   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \
+--- kabc/plugins/ldap/configure.in.in	14 Jan 2003 19:45:52 -0000	1.1.1.3
++++ kabc/plugins/ldap/configure.in.in	14 Jan 2003 23:53:31 -0000	1.7
+@@ -19,7 +19,7 @@
+   fi
+   if test $with_ldap = FOUND ; then
+     with_ldap=NOTFOUND
+-    for ext in la so sl a ; do
++    for ext in la so sl a dylib; do
+       AC_FIND_FILE(libldap.$ext, $kde_libraries /usr/lib /usr/local/lib,
+         ldap_libdir)
+       if test -r $ldap_libdir/libldap.$ext ; then
+--- kabc/vcard/Makefile.am	10 Jul 2002 04:42:34 -0000	1.1.1.2
++++ kabc/vcard/Makefile.am	24 Nov 2002 07:11:21 -0000	1.5
+@@ -7,6 +7,7 @@
+ 
+ libvcard_la_SOURCES = vCard-all.cpp
+ libvcard_la_LIBADD = $(LIB_KDECORE)
++libvcard_la_LDFLAGS = -avoid-version
+ 
+ check_PROGRAMS = testwrite testread
+ 
+--- kate/interfaces/Makefile.am	10 Jul 2002 04:42:56 -0000	1.1.1.2
++++ kate/interfaces/Makefile.am	24 Nov 2002 07:11:21 -0000	1.2
+@@ -4,7 +4,7 @@
+ 
+ libkatepartinterfaces_la_SOURCES = interfaces.cpp
+ libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+-libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
++libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -avoid-version
+ 
+ kateinclude_HEADERS = document.h view.h
+ kateincludedir = $(includedir)/kate
+--- kconf_update/Makefile.am	25 Jun 2002 02:46:55 -0000	1.1.1.1
++++ kconf_update/Makefile.am	26 Nov 2002 21:00:48 -0000	1.4
+@@ -18,22 +18,26 @@
+ 
+ INCLUDES= $(all_includes)
+ 
+-lib_LTLIBRARIES = kconf_update.la
+-
++lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la
+ bin_PROGRAMS = kconf_update
+-kconf_update_SOURCES = dummy.cpp
+-kconf_update_LDADD = kconf_update.la
+-kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+-kconf_update_la_SOURCES = kconf_update.cpp
+-kconf_update_la_LIBADD = ../kdecore/libkdecore.la
+-kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkconf_update_main_la_SOURCES = kconf_update.cpp
++libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la
++libkconf_update_main_la_LDFLAGS = $(all_libraries) -avoid-version
++
++kconf_update_la_SOURCES = kconf_update_la_main.cpp
++kconf_update_la_LIBADD = libkconf_update_main.la
++kconf_update_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++kconf_update_la_main.cpp: kconf_update_main.cpp
++	cat kconf_update_main.cpp > kconf_update_la_main.cpp
++
++kconf_update_SOURCES = kconf_update_main.cpp
++kconf_update_LDADD = libkconf_update_main.la
++kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ METASOURCES = AUTO
+ 
+ # Internal
+ # noinst_HEADERS = kconf_update.h
+-
+-dummy.cpp: 
+-	echo > dummy.cpp
+ 
+--- kconf_update/kconf_update.cpp	12 Nov 2002 03:56:45 -0000	1.1.1.3
++++ kconf_update/kconf_update.cpp	26 Nov 2002 21:00:48 -0000	1.2
+@@ -779,7 +779,9 @@
+ }
+ 
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+    KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
+                         "1.0.2",
+RCS file: kconf_update/kconf_update_main.cpp
+diff -N kconf_update/kconf_update_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kconf_update/kconf_update_main.cpp	26 Nov 2002 21:00:48 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- kdecore/Makefile.am	20 Nov 2002 00:54:24 -0000	1.1.1.6
++++ kdecore/Makefile.am	21 Nov 2002 21:28:35 -0000	1.4
+@@ -1,6 +1,6 @@
+ #    This file is part of the KDE libraries
+ #
+-#    $Id: Makefile.am,v 1.303 2002/11/14 08:46:24 hausmann Exp $
++#    $Id: Makefile.am,v 1.302 2002/10/26 14:32:21 gallium Exp $
+ #
+ #    Copyright (C) 1996-1997 Matthias Kalle Dalheimer (kalle@kde.org)
+ #			  (C) 1997 Stephan Kulow (coolo@kde.org)
+--- kdecore/fakes.c	4 Jan 2003 04:28:21 -0000	1.1.1.5
++++ kdecore/fakes.c	4 Jan 2003 04:43:31 -0000	1.3
+@@ -19,6 +19,7 @@
+    Boston, MA 02111-1307, USA.
+ */
+ 
++#include <sys/types.h>
+ #include <config.h>
+ 
+ #ifndef HAVE_SETENV
+@@ -137,7 +138,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ 
+-int getdomainname(char *name, size_t len)
++int getdomainname(char *name, unsigned int len)
+ {
+         struct utsname uts;
+         struct hostent *hent;
+--- kdecore/kglobalsettings.cpp	29 Oct 2002 02:36:56 -0000	1.1.1.3
++++ kdecore/kglobalsettings.cpp	29 Oct 2002 02:58:40 -0000	1.4
+@@ -455,7 +455,7 @@
+         *s_desktopPath += "/";
+ 
+     // Trash Path
+-    *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
++    *s_trashPath = *s_desktopPath + "." + i18n("Trash") + "/";
+     *s_trashPath = config->readEntry( "Trash" , *s_trashPath);
+     if ( (*s_trashPath)[0] != '/' )
+       s_trashPath->prepend( QDir::homeDirPath() + "/" );
+--- kdecore/kiconloader.cpp	14 Jan 2003 19:46:12 -0000	1.1.1.10
++++ kdecore/kiconloader.cpp	14 Jan 2003 20:04:30 -0000	1.6
+@@ -457,7 +457,7 @@
+     return icon;
+ }
+ 
+-inline QString KIconLoader::unknownIconPath( int size ) const
++QString KIconLoader::unknownIconPath( int size ) const
+ {
+     static const QString &str_unknown = KGlobal::staticQString("unknown");
+ 
+--- kdecore/klibloader.cpp	10 Jul 2002 04:43:40 -0000	1.1.1.2
++++ kdecore/klibloader.cpp	14 Nov 2002 21:41:20 -0000	1.5
+@@ -366,13 +366,8 @@
+     else
+     {
+       libfile = instance->dirs()->findResource( "module", libname );
+-      if ( libfile.isEmpty() )
+-      {
++      if ( libfile.isEmpty() ) {
+         libfile = instance->dirs()->findResource( "lib", libname );
+-#ifndef NDEBUG
+-        if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
+-          kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
+-#endif
+       }
+       if ( libfile.isEmpty() )
+       {
+--- kded/Makefile.am	10 Jul 2002 04:44:10 -0000	1.1.1.2
++++ kded/Makefile.am	26 Nov 2002 21:00:49 -0000	1.4
+@@ -19,32 +19,46 @@
+ 
+ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
+ 
+-lib_LTLIBRARIES = kded.la kbuildsycoca.la
++lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
+ 
+-kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_la_LIBADD = $(LIB_KIO)
+-kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
++libkded_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkded_main_la_LIBADD = $(LIB_KIO)
++libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
+ 			kbuildservicefactory.cpp \
+ 			kbuildservicegroupfactory.cpp kdedmodule.cpp
+ 
+-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kbuildsycoca_la_LIBADD = $(LIB_KIO)
+-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
++kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kded_la_LIBADD  = libkded_main.la
++kded_la_SOURCES = kded_la_main.cpp
++
++kded_la_main.cpp: kded_main.cpp
++	cat kded_main.cpp > kded_la_main.cpp
++
++libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkbuildsycoca_main_la_LIBADD = $(LIB_KIO)
++libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+ 				kbuildservicefactory.cpp \
+ 				kbuildservicegroupfactory.cpp \
+ 				kbuildimageiofactory.cpp \
+ 				kbuildprotocolinfofactory.cpp \
+ 				kctimefactory.cpp
+ 
++kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kbuildsycoca_la_LIBADD  = libkbuildsycoca_main.la
++kbuildsycoca_la_SOURCES = kbuildsycoca_la_main.cpp
++
++kbuildsycoca_la_main.cpp: kbuildsycoca_main.cpp
++	cat kbuildsycoca_main.cpp > kbuildsycoca_la_main.cpp
++
+ bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname
+ 
+ kded_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kded_LDADD = kded.la
+-kded_SOURCES = dummy.cpp
++kded_LDADD   = libkded_main.la
++kded_SOURCES = kded_main.cpp
+ 
+ kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kbuildsycoca_LDADD = kbuildsycoca.la
+-kbuildsycoca_SOURCES = dummy.cpp
++kbuildsycoca_LDADD = libkbuildsycoca_main.la
++kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
+ 
+ kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ kdontchangethehostname_LDADD = $(LIB_KDECORE) 
+@@ -64,6 +78,3 @@
+ 
+ update_DATA = kded.upd
+ updatedir = $(kde_datadir)/kconf_update
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kded/kbuildsycoca.cpp	1 Oct 2002 03:05:26 -0000	1.1.1.4
++++ kded/kbuildsycoca.cpp	26 Nov 2002 21:00:49 -0000	1.2
+@@ -502,7 +502,9 @@
+ static const char *appName = "kbuildsycoca";
+ static const char *appVersion = "1.0";
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+    KLocale::setMainCatalogue("kdelibs");
+    KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
+RCS file: kded/kbuildsycoca_main.cpp
+diff -N kded/kbuildsycoca_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kded/kbuildsycoca_main.cpp	26 Nov 2002 21:00:49 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- kded/kded.cpp	14 Aug 2002 14:00:31 -0000	1.1.1.3
++++ kded/kded.cpp	26 Nov 2002 21:00:49 -0000	1.2
+@@ -653,7 +653,9 @@
+   bool startup;
+ };
+ 
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+      KAboutData aboutData( "kded", I18N_NOOP("KDE Daemon"),
+         "$Id: kded.cpp,v 1.75 2002/08/04 21:45:31 danimo Exp $",
+RCS file: kded/kded_main.cpp
+diff -N kded/kded_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kded/kded_main.cpp	26 Nov 2002 21:00:49 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- kdeprint/Makefile.am	1 Oct 2002 03:05:31 -0000	1.1.1.4
++++ kdeprint/Makefile.am	26 Nov 2002 21:00:49 -0000	1.9
+@@ -10,9 +10,8 @@
+ kde_module_LTLIBRARIES = kded_kdeprintd.la
+ 
+ kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp
+-kded_kdeprintd_la_LIBADD = $(LIB_KIO)
++kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(top_builddir)/kded/libkded_main.la
+ kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-#kded_kdeprintd_la_METASOURCES = AUTO
+ 
+ lib_LTLIBRARIES = libkdeprint.la
+ 
+--- kdeprint/cups/cupsdconf2/Makefile.am	1 Oct 2002 03:05:37 -0000	1.1.1.3
++++ kdeprint/cups/cupsdconf2/Makefile.am	26 Nov 2002 21:00:49 -0000	1.4
+@@ -3,22 +3,32 @@
+ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes)
+ 
+ bin_PROGRAMS = cupsdconf
+-cupsdconf_SOURCES = main.cpp
+ 
+-cupsdconf_LDADD   =  libcupsdconf.la
++cupsdconf_SOURCES = cupsdconf_main.cpp
++cupsdconf_LDADD   = libcupsdconf_main.la
+ cupsdconf_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++cupsdconf_main.cpp: stub_main.cpp
++	cat stub_main.cpp > cupsdconf_main.cpp
++
+ # library creation
+-lib_LTLIBRARIES = libcupsdconf.la
+-libcupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
++lib_LTLIBRARIES = libcupsdconf_main.la cupsdconf.la
++libcupsdconf_main_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
+ 			  cupsdserverpage.cpp cupsdlogpage.cpp cupsdjobspage.cpp cupsdfilterpage.cpp \
+ 			  qdirlineedit.cpp cupsddirpage.cpp portdialog.cpp cupsdnetworkpage.cpp \
+ 			  editlist.cpp cupsdbrowsingpage.cpp browsedialog.cpp cupsdsecuritypage.cpp \
+ 			  locationdialog.cpp addressdialog.cpp cups-util.c \
+-			  qdirmultilineedit.cpp sizewidget.cpp
+-libcupsdconf_la_METASOURCES = AUTO
+-libcupsdconf_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-libcupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
++			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
++libcupsdconf_main_la_METASOURCES = AUTO
++libcupsdconf_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libcupsdconf_main_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
++
++cupsdconf_la_SOURCES = cupsdconf_la_main.cpp
++cupsdconf_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH)
++cupsdconf_la_LIBADD  = libcupsdconf_main.la
++
++cupsdconf_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > cupsdconf_la_main.cpp
+ 
+ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
+ 		 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
+--- kdeprint/cups/cupsdconf2/main.cpp	25 Jun 2002 02:46:57 -0000	1.1.1.1
++++ kdeprint/cups/cupsdconf2/main.cpp	26 Nov 2002 21:00:49 -0000	1.2
+@@ -30,7 +30,9 @@
+ 	{ 0, 0, 0}
+ };
+ 
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+ 	KCmdLineArgs::init(argc,argv,"cupsdconf",I18N_NOOP("A CUPS configuration tool"),"0.0.1");
+ 	KCmdLineArgs::addCmdLineOptions(options);
+RCS file: kdeprint/cups/cupsdconf2/stub_main.cpp
+diff -N kdeprint/cups/cupsdconf2/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kdeprint/cups/cupsdconf2/stub_main.cpp	26 Nov 2002 21:00:49 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kdeprint/management/Makefile.am	14 Aug 2002 14:04:14 -0000	1.1.1.3
++++ kdeprint/management/Makefile.am	26 Nov 2002 21:00:49 -0000	1.4
+@@ -3,13 +3,16 @@
+ lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la
+ bin_PROGRAMS = kaddprinterwizard
+ 
+-kaddprinterwizard_SOURCES = dummy.cpp
+-kaddprinterwizard_LDADD = kaddprinterwizard.la
++kaddprinterwizard_SOURCES = kaddprinterwizard_main.cpp
++kaddprinterwizard_LDADD = libkdeprint_management.la
+ kaddprinterwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kaddprinterwizard_main.cpp: kaddprinterwizard.cpp
++	cat kaddprinterwizard.cpp > kaddprinterwizard_main.cpp
++
+ kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
+ kaddprinterwizard_la_LIBADD = libkdeprint_management.la
+-kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
++kaddprinterwizard_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -module
+ 
+ libkdeprint_management_la_SOURCES = \
+ 	kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp \
+@@ -45,7 +48,4 @@
+ 
+ dataicon_DATA = tileup.png tiledown.png side.png
+ dataicondir = $(kde_datadir)/kdeprint
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+--- kdeui/kedittoolbar.cpp	10 Dec 2002 16:19:22 -0000	1.1.1.6
++++ kdeui/kedittoolbar.cpp	10 Dec 2002 16:37:43 -0000	1.7
+@@ -142,13 +142,13 @@
+    */
+   ToolbarList findToolbars(QDomElement elem)
+   {
+-    static const QString &tagToolbar = KGlobal::staticQString( "ToolBar" );
+-    static const QString &attrNoEdit = KGlobal::staticQString( "noEdit" );
++    // static const QString &tagToolbar = KGlobal::staticQString( "ToolBar" );
++    // static const QString &attrNoEdit = KGlobal::staticQString( "noEdit" );
+     ToolbarList list;
+ 
+     for( ; !elem.isNull(); elem = elem.nextSibling().toElement() )
+     {
+-      if (elem.tagName() == tagToolbar && elem.attribute( attrNoEdit ) != "true" )
++      if (elem.tagName() == KGlobal::staticQString( "ToolBar" ) && elem.attribute( KGlobal::staticQString( "noEdit" ) ) != "true" )
+         list.append(elem);
+ 
+       QDomElement child = elem.firstChild().toElement();
+--- kdeui/kxmlguifactory.cpp	1 Oct 2002 03:06:00 -0000	1.1.1.3
++++ kdeui/kxmlguifactory.cpp	1 Oct 2002 03:59:10 -0000	1.5
+@@ -49,14 +49,10 @@
+ public:
+     KXMLGUIFactoryPrivate()
+     {
+-        static const QString &defaultMergingName = KGlobal::staticQString( "<default>" );
+-        static const QString &actionList = KGlobal::staticQString( "actionlist" );
+-        static const QString &name = KGlobal::staticQString( "name" );
+-
+         m_rootNode = new ContainerNode( 0L, QString::null, 0L );
+-        m_defaultMergingName = defaultMergingName;
+-        tagActionList = actionList;
+-        attrName = name;
++        m_defaultMergingName = KGlobal::staticQString( "<default>" );
++        tagActionList = KGlobal::staticQString( "actionlist" );
++        attrName = KGlobal::staticQString( "name" );
+     }
+     ~KXMLGUIFactoryPrivate()
+     {
+--- khtml/Makefile.am	4 Jan 2003 04:30:33 -0000	1.1.1.5
++++ khtml/Makefile.am	4 Jan 2003 04:43:31 -0000	1.4
+@@ -26,8 +26,8 @@
+ 
+ SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) . ecma kmultipart
+ 
+-lib_LTLIBRARIES = libkhtml.la
+-kde_module_LTLIBRARIES = khtmlimagepart.la
++lib_LTLIBRARIES = libkhtml.la khtml.la
++kde_module_LTLIBRARIES = libkhtmlimagepart_main.la khtmlimagepart.la
+ 
+ libkhtml_la_SOURCES = khtmlview.cpp khtml_part.cpp khtml_run.cpp khtml_factory.cpp khtml_settings.cc \
+ 		      khtml_events.cpp khtml_ext.cpp khtml_pagecache.cpp khtml_iface.skel khtml_iface.cc \
+@@ -40,7 +40,7 @@
+ noinst_HEADERS = design.h testkhtml.h testrender.h test_regression.h khtml_ext.h \
+ 		 khtml_pagecache.h khtmlimage.h khtmlpart_p.h khtml_printsettings.h
+ 
+-libkhtml_la_LDFLAGS = -version-info 5:0:1 -module -no-undefined $(all_libraries)
++libkhtml_la_LDFLAGS = -version-info 5:0:1 -no-undefined $(all_libraries)
+ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
+ 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
+ 	./misc/libkhtmlmisc.la ./dom/libkhtmldom.la $(LIBKJAVA) \
+@@ -49,9 +49,23 @@
+ 	$(top_builddir)/kdeprint/libkdeprint.la  \
+ 	$(top_builddir)/kutils/libkutils.la 
+ 
+-khtmlimagepart_la_SOURCES = khtmlimage.cpp
++khtml_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -module
++khtml_la_LIBADD  = libkhtml.la
++khtml_la_SOURCES = dummy.cpp
++
++dummy.cpp:
++	echo > dummy.cpp
++
++libkhtmlimagepart_main_la_SOURCES = khtmlimage.cpp
++libkhtmlimagepart_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version
++libkhtmlimagepart_main_la_LIBADD  = $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KPARTS) libkhtml.la
++
++khtmlimagepart_la_SOURCES = khtmlimagepart_dummy.cpp
+ khtmlimagepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-khtmlimagepart_la_LIBADD = libkhtml.la
++khtmlimagepart_la_LIBADD  = $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KPARTS) libkhtml.la
++
++khtmlimagepart_dummy.cpp:
++	echo > khtmlimagepart_dummy.cpp
+ 
+ INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio \
+ 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
+--- kimgio/Makefile.am	4 Jan 2003 04:31:10 -0000	1.1.1.5
++++ kimgio/Makefile.am	4 Jan 2003 04:43:31 -0000	1.8
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES= kimg_eps.la kimg_xview.la kimg_krl.la \
+ 	         $(KIMGIO_TIFF_MODULES) kimg_ico.la
+ 
+-KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
++KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)' $(all_libraries) $(LIB_KDECORE) $(LIB_QT)
+ 
+ kimg_tiff_la_SOURCES = tiffr.cpp
+ kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+--- kinit/Makefile.am	10 Jul 2002 04:49:13 -0000	1.1.1.2
++++ kinit/Makefile.am	26 Nov 2002 21:00:49 -0000	1.4
+@@ -20,7 +20,7 @@
+ SUBDIRS = . tests
+ 
+ bin_PROGRAMS = kdeinit kdeinit_wrapper kshell kdeinit_shutdown lnusertemp kwrapper klauncher kioslave
+-lib_LTLIBRARIES = klauncher.la
++lib_LTLIBRARIES = klauncher.la libklauncher_main.la
+ 
+ kdeinit_SOURCES = kinit.cpp setproctitle.cpp
+ 
+@@ -49,13 +49,20 @@
+ kwrapper_SOURCES = kwrapper.c
+ kwrapper_LDADD = $(LIBSOCKET)
+ 
+-klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-klauncher_la_LIBADD = $(LIB_KIO)
+-klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
++libklauncher_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libklauncher_main_la_LIBADD = $(LIB_KIO)
++libklauncher_main_la_SOURCES = klauncher.cpp autostart.cpp
++
++klauncher_la_LDFLAGS = $(all_libraries) -avoid-version -module
++klauncher_la_LIBADD = $(LIB_KIO) libklauncher_main.la
++klauncher_la_SOURCES = klauncher_la_main.cpp
++
++klauncher_la_main.cpp: klauncher_main.cpp
++	cat klauncher_main.cpp > klauncher_la_main.cpp
+ 
+ klauncher_LDFLAGS =  $(all_libraries) $(KDE_RPATH)
+-klauncher_LDADD = klauncher.la
+-klauncher_SOURCES = dummy.cpp
++klauncher_LDADD = libklauncher_main.la
++klauncher_SOURCES = klauncher_main.cpp
+ 
+ METASOURCES = AUTO
+ 
+@@ -64,6 +71,3 @@
+ kwrapper.o: wrapper.c
+ 
+ shell.o: wrapper.c
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kinit/kinit.cpp	14 Jan 2003 19:47:38 -0000	1.1.1.5
++++ kinit/kinit.cpp	14 Jan 2003 20:04:30 -0000	1.6
+@@ -1430,6 +1430,7 @@
+    kdeinit_setproctitle("Starting up...");
+    kdeinit_library_path();
+    unsetenv("LD_BIND_NOW");
++   unsetenv("DYLD_BIND_AT_LAUNCH");
+    KApplication::loadedByKdeinit = true;
+ 
+    d.maxname = strlen(argv[0]);
+--- kinit/setproctitle.cpp	4 Jan 2003 04:31:11 -0000	1.1.1.3
++++ kinit/setproctitle.cpp	4 Jan 2003 04:43:31 -0000	1.4
+@@ -72,6 +72,12 @@
+ # define SPT_TYPE	SPT_REUSEARGV
+ #endif
+ 
++#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
++#include <sys/time.h>
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ #if SPT_TYPE != SPT_NONE && SPT_TYPE != SPT_BUILTIN
+ 
+ # if SPT_TYPE == SPT_PSTAT
+--- kio/Makefile.am	1 Oct 2002 03:06:46 -0000	1.1.1.4
++++ kio/Makefile.am	23 Nov 2002 03:50:36 -0000	1.7
+@@ -20,7 +20,7 @@
+ 
+ INCLUDES=  -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
+ 
+-SUBDIRS = kssl kio bookmarks kfile . kpasswdserver misc pics tests
++SUBDIRS = kssl kio bookmarks kfile . kded kpasswdserver misc pics tests
+ 
+ lib_LTLIBRARIES = libkio.la
+ 
+RCS file: kio/kded/Makefile
+diff -N kio/kded/Makefile
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kio/kded/Makefile	23 Nov 2002 03:50:36 -0000	1.2
+@@ -0,0 +1,8 @@
++# That's right!  OSX's linker is so anal, I had to totally
++# mess with the link order to get things to build.  Scary, scary.
++
++all:
++	pushd ../../kded; $(MAKE); popd
++
++clean:
++install:
+--- kio/kio/kurlcompletion.cpp	1 Oct 2002 03:06:59 -0000	1.1.1.3
++++ kio/kio/kurlcompletion.cpp	1 Oct 2002 03:59:13 -0000	1.4
+@@ -740,6 +740,11 @@
+ // Environment variables
+ //
+ 
++#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)   
++#include <crt_externs.h>                                 
++#define environ (*_NSGetEnviron()) 
++#endif
++
+ extern char **environ; // Array of environment variables
+ 
+ bool KURLCompletion::envCompletion(const MyURL &url, QString *match)
+--- kio/kio/kurlcompletion.h	10 Jul 2002 04:49:47 -0000	1.1.1.2
++++ kio/kio/kurlcompletion.h	10 Jul 2002 05:12:46 -0000	1.3
+@@ -23,6 +23,10 @@
+ #ifndef KURLCOMPLETION_H
+ #define KURLCOMPLETION_H
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <kcompletion.h>
+ #include <kio/jobclasses.h>
+ #include <qstring.h>
+--- kio/kpasswdserver/Makefile.am	1 Oct 2002 03:07:02 -0000	1.1.1.2
++++ kio/kpasswdserver/Makefile.am	26 Nov 2002 21:00:49 -0000	1.7
+@@ -10,4 +10,4 @@
+ kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
+ kded_kpasswdserver_la_METASOURCES = AUTO
+ kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kpasswdserver_la_LIBADD = $(LIB_KIO)
++kded_kpasswdserver_la_LIBADD = $(LIB_KIO) $(top_builddir)/kded/libkded_main.la
+--- kio/kssl/kopenssl.cc	4 Jan 2003 04:31:42 -0000	1.1.1.5
++++ kio/kssl/kopenssl.cc	4 Jan 2003 04:43:31 -0000	1.6
+@@ -251,6 +251,9 @@
+             #ifdef _AIX
+             << "/opt/freeware/lib/"
+ 	    #endif
++	    #ifdef __APPLE__
++	    << "@PREFIX@/lib/"
++	    #endif
+ 	    << "/usr/lib/"
+ 	    << "/usr/ssl/lib/"
+             << "/usr/local/lib/"
+@@ -269,6 +272,7 @@
+ 	     #elif defined(__APPLE__)
+ 	     << "libssl.dylib"
+ 	     << "libssl.0.9.dylib"
++	     << "libssl.0.9.6.dylib"
+              #else
+              << "libssl.so"
+ 	     << "libssl.so.0"
+@@ -286,6 +290,7 @@
+ 	     #elif defined(__APPLE__)
+ 	     << "libcrypto.dylib"
+ 	     << "libcrypto.0.9.dylib"
++	     << "libcrypto.0.9.6.dylib"
+ 	     #else
+              << "libcrypto.so"
+ 	     << "libcrypto.so.0"
+--- kio/misc/Makefile.am	4 Jan 2003 04:31:49 -0000	1.1.1.4
++++ kio/misc/Makefile.am	4 Jan 2003 04:43:32 -0000	1.5
+@@ -22,25 +22,29 @@
+ 
+ SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile
+ 
+-lib_LTLIBRARIES = kio_uiserver.la
++lib_LTLIBRARIES = kio_uiserver.la libkio_uiserver_main.la
+ bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice
+ 
+-kio_uiserver_SOURCES = dummy.cpp
+-kio_uiserver_LDADD = kio_uiserver.la
+-kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
++libkio_uiserver_main_la_LIBADD = $(LIB_KIO)
++libkio_uiserver_main_la_LDFLAGS = $(all_libraries) -avoid-version
++
++kio_uiserver_la_SOURCES = kio_uiserver_la_main.cpp
++kio_uiserver_la_LIBADD = libkio_uiserver_main.la
++kio_uiserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
++
++kio_uiserver_la_main.cpp: kio_uiserver_main.cpp
++	cat kio_uiserver_main.cpp > kio_uiserver_la_main.cpp
+ 
+-kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
+-kio_uiserver_la_LIBADD = $(LIB_KIO)
+-kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kio_uiserver_SOURCES = kio_uiserver_main.cpp
++kio_uiserver_LDADD = libkio_uiserver_main.la
++kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ observer_DIR = $(top_srcdir)/kio/kio
+ 
+ METASOURCES = AUTO
+ 
+ kde_services_DATA = kio_uiserver.desktop
+-
+-dummy.cpp: uiserver.kidl
+-	echo > dummy.cpp
+ 
+ kmailservice_SOURCES = kmailservice.cpp
+ kmailservice_LDADD = $(LIB_KDECORE)
+RCS file: kio/misc/kio_uiserver_main.cpp
+diff -N kio/misc/kio_uiserver_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kio/misc/kio_uiserver_main.cpp	26 Nov 2002 21:00:50 -0000	1.1
+@@ -0,0 +1,27 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
+--- kio/misc/uiserver.cpp	1 Dec 2002 16:29:16 -0000	1.1.1.4
++++ kio/misc/uiserver.cpp	1 Dec 2002 16:52:51 -0000	1.3
+@@ -1013,7 +1013,9 @@
+ 
+ //------------------------------------------------------------
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+     KLocale::setMainCatalogue("kdelibs");
+     //  GS 5/2001 - I changed the name to "KDE" to make it look better
+--- kio/misc/kpac/dhcp.h	10 Jul 2002 04:50:03 -0000	1.1.1.2
++++ kio/misc/kpac/dhcp.h	10 Jul 2002 05:12:46 -0000	1.3
+@@ -29,6 +29,10 @@
+ 
+ #define DHCP_OPT_LEN 312
+ 
++#ifndef uint8_t
++#include <stdint.h>
++#endif
++
+ struct dhcp_msg
+ {
+ #define DHCP_BOOTREQUEST 1
+--- kio/misc/kpac/kpac_dhcp_helper.c	10 Jul 2002 04:50:04 -0000	1.1.1.2
++++ kio/misc/kpac/kpac_dhcp_helper.c	29 Oct 2002 14:19:18 -0000	1.2
+@@ -19,6 +19,7 @@
+ /* $Id: kpac_dhcp_helper.c,v 1.8 2002/04/20 13:42:02 hausmann Exp $ */
+ 
+ #include <config.h>
++#include <sys/types.h>
+ #include <grp.h>
+ 
+ #include <unistd.h>
+--- kio/misc/kssld/Makefile.am	4 Jan 2003 04:31:50 -0000	1.1.1.3
++++ kio/misc/kssld/Makefile.am	4 Jan 2003 04:43:32 -0000	1.8
+@@ -21,7 +21,7 @@
+ kde_module_LTLIBRARIES = kded_kssld.la
+ 
+ kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kssld_la_LIBADD = $(LIB_KIO)
++kded_kssld_la_LIBADD = $(LIB_KIO) $(top_builddir)/kded/libkded_main.la
+ kded_kssld_la_SOURCES = kssld.cpp kssld.skel
+ 
+ METASOURCES = AUTO
+--- kioslave/http/Makefile.am	29 Oct 2002 02:38:44 -0000	1.1.1.4
++++ kioslave/http/Makefile.am	26 Nov 2002 21:00:50 -0000	1.4
+@@ -9,7 +9,7 @@
+ ####### Files
+ 
+ bin_PROGRAMS = kio_http_cache_cleaner
+-lib_LTLIBRARIES = kio_http_cache_cleaner.la
++lib_LTLIBRARIES = kio_http_cache_cleaner.la libkio_http_cache_cleaner_main.la
+ kde_module_LTLIBRARIES = kio_http.la
+ 
+ kio_http_la_SOURCES = http.cc httpfilter.cc
+@@ -17,19 +17,26 @@
+ kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ)
+ kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+-kio_http_cache_cleaner_SOURCES = dummy.cpp
+-kio_http_cache_cleaner_LDADD   = kio_http_cache_cleaner.la
++kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp
++kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la
+ kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH)
+ 
+-kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
+-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO)
+-kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
++http_cache_cleaner_main.cpp: stub_main.cpp
++	cat stub_main.cpp > http_cache_cleaner_main.cpp
++
++kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_la_main.cpp
++kio_http_cache_cleaner_la_LIBADD  = libkio_http_cache_cleaner_main.la
++kio_http_cache_cleaner_la_LDFLAGS = -avoid-version -module
++
++http_cache_cleaner_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > http_cache_cleaner_la_main.cpp
++
++libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp
++libkio_http_cache_cleaner_main_la_LIBADD  = $(LIB_KIO)
++libkio_http_cache_cleaner_main_la_LDFLAGS = -avoid-version
+ 
+ noinst_HEADERS = http.h
+ 
+ kdelnkdir = $(kde_servicesdir)
+ kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \
+               webdav.protocol webdavs.protocol
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kioslave/http/http.cc	17 Jan 2003 14:31:04 -0000	1.1.1.12
++++ kioslave/http/http.cc	17 Jan 2003 14:42:13 -0000	1.11
+@@ -34,9 +34,9 @@
+ #include <netinet/in.h>  // Required for AIX
+ #include <netinet/tcp.h>
+ 
++#include <unistd.h>
+ /*
+ #include <netdb.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
+ */
+--- kioslave/http/http_cache_cleaner.cpp	25 Jun 2002 02:47:04 -0000	1.1.1.1
++++ kioslave/http/http_cache_cleaner.cpp	26 Nov 2002 21:00:50 -0000	1.2
+@@ -187,7 +187,9 @@
+    }
+ }
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++
++int kdemain(int argc, char **argv)
+ {
+    KLocale::setMainCatalogue("kdelibs");
+    KCmdLineArgs::init( argc, argv, appName, description, version, true);
+RCS file: kioslave/http/stub_main.cpp
+diff -N kioslave/http/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kioslave/http/stub_main.cpp	26 Nov 2002 21:00:50 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kioslave/http/kcookiejar/Makefile.am	1 Oct 2002 03:07:20 -0000	1.1.1.3
++++ kioslave/http/kcookiejar/Makefile.am	26 Nov 2002 21:00:50 -0000	1.7
+@@ -9,25 +9,25 @@
+ lib_LTLIBRARIES = kcookiejar.la
+ kde_module_LTLIBRARIES = kded_kcookiejar.la
+ 
+-kcookiejar_la_SOURCES = main.cpp
+ METASOURCES = AUTO
++kcookiejar_la_SOURCES = main.cpp
+ kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ kcookiejar_la_LIBADD = $(LIB_KDECORE)
+ 
+ kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
+ 			kcookieserver.skel kcookiewin.cpp 
+ kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kcookiejar_la_LIBADD = $(LIB_KIO)
++kded_kcookiejar_la_LIBADD = $(LIB_KIO) $(top_builddir)/kded/libkded_main.la
+ 
+-kcookiejar_SOURCES = dummy.cpp
+-kcookiejar_LDADD = kcookiejar.la
++kcookiejar_SOURCES = kcookiejar_main.cpp
++kcookiejar_LDADD = $(LIB_KDECORE)
+ kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kcookiejar_main.cpp: main.cpp
++	cat main.cpp > kcookiejar_main.cpp
++
+ kded_DATA = kcookiejar.desktop
+ kdeddir = $(kde_servicesdir)/kded
+ 
+ update_DATA = kcookiescfg.upd
+ updatedir = $(kde_datadir)/kconf_update
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- libkscreensaver/Makefile.am	14 Aug 2002 14:04:21 -0000	1.1.1.3
++++ libkscreensaver/Makefile.am	23 Nov 2002 03:50:37 -0000	1.6
+@@ -1,7 +1,7 @@
+ lib_LTLIBRARIES = libkscreensaver.la
+ libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
+ libkscreensaver_la_LIBADD  = $(LIB_KIO)
+-libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 5:0:1
++libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 5:0:1 -undefined suppress -flat_namespace
+ 
+ include_HEADERS = kscreensaver.h kscreensaver_vroot.h
+ 
+--- libltdl/ltdl.c	10 Jul 2002 04:51:21 -0000	1.1.1.2
++++ libltdl/ltdl.c	26 Nov 2002 21:00:50 -0000	1.7
+@@ -1544,11 +1544,14 @@
+   /* try to open the old library first; if it was dlpreopened,
+      we want the preopened version of it, even if a dlopenable
+      module is available */
++/*	HACKALERT: Why? Mac OS/Darwin can't open static libs, it is
++	a waste to even try. Disabled for kde.	*/
++#if 0
+   if (old_name && tryall_dlopen(handle, old_name) == 0)
+     {
+       return 0;
+     }
+-
++#endif
+   /* try to open the dynamic library */
+   if (dlname)
+     {
+--- libltdl/ltdl.m4	10 Jul 2002 04:51:21 -0000	1.1.1.2
++++ libltdl/ltdl.m4	22 Jan 2003 02:54:22 -0000	1.4
+@@ -103,6 +103,9 @@
+ 	osf*)
+ 	  libltdl_cv_sys_dlopen_deplibs=yes
+ 	  ;;
++	darwin*)
++	  libltdl_cv_sys_dlopen_deplibs=yes
++	  ;;
+ 	esac
+ ])
+ if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
+@@ -442,6 +445,8 @@
+ if test x"$ac_cv_sys_symbol_underscore" = xyes; then
+   if test x"$ac_cv_func_dlopen" = xyes ||
+      test x"$ac_cv_lib_dl_dlopen" = xyes ; then
++        ac_save_LIBS="$LIBS"
++        LIBS="$LIBS $LIBADD_DL"
+ 	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+ 		libltdl_cv_need_uscore, [dnl
+ 		AC_TRY_RUN([
+@@ -495,6 +500,7 @@
+ fi
+ 
+ if test x"$libltdl_cv_need_uscore" = xyes; then
++  LIBS="$ac_save_LIBS"
+   AC_DEFINE(NEED_USCORE, 1,
+     [Define if dlsym() requires a leading underscode in symbol names. ])
+ fi
Index: trunk/dports/x11/kdenework3/Portfile
===================================================================
--- trunk/dports/x11/kdenework3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdenework3/Portfile	(revision 1900)
@@ -0,0 +1,42 @@
+PortSystem 1.0
+name		kdenetwork3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	network applications
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdenetwork-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libjpeg:jpeg lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 \
+		lib:libpng.3:libpng lib:libpoll:poll-emulator lib:libqt-mt.3.1:qt3 \
+		lib:libX11.6:XFree86
+
+checksums	kdenetwork-${version}.tar.bz2 md5 f286a6708c80c439401817bf31f63fba \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdenework3/files/patch-kdenetwork3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdenework3/files/patch-kdenetwork3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdenework3/files/patch-kdenetwork3-3.1.darwin	(revision 1900)
@@ -0,0 +1,521 @@
+
+--- kmailcvt/filter_plain.cxx	14 Aug 2002 19:13:56 -0000	1.1.1.2
++++ kmailcvt/filter_plain.cxx	14 Aug 2002 19:36:48 -0000	1.3
+@@ -24,7 +24,6 @@
+ #include <kfiledialog.h>
+ #include <kdirlister.h>
+ #include <qregexp.h>
+-#include <libgen.h>
+ #include <qdir.h>
+ 
+ #include "filter_plain.hxx"
+--- kpf/src/WebServer.cpp	15 Jan 2003 05:14:48 -0000	1.1.1.6
++++ kpf/src/WebServer.cpp	27 Nov 2002 02:26:50 -0000	1.5
+@@ -230,8 +230,13 @@
+         fd,
+         SOL_SOCKET,
+         SO_REUSEADDR,
+-        ( char* )&on,
+-        sizeof( on ) );
++        reinterpret_cast<const void *>(&on),
++#ifdef __osf__
++        (size_t) sizeof(on)
++#else
++	(socklen_t) sizeof(on)
++#endif
++      );
+ 
+     on = 0;
+ 
+@@ -240,8 +245,13 @@
+         fd,
+         SOL_SOCKET,
+         SO_LINGER,
+-        ( char* ) &on,
+-        sizeof( on ) );
++        reinterpret_cast<const void *>(&on),
++#ifdef __osf__
++        (size_t) sizeof(on)
++#else
++        (socklen_t) sizeof(on)
++#endif
++      );
+ 
+     Server * s = new Server(d->root, d->followSymlinks, fd, this);
+ 
+--- krdc/rfbproto.h	20 Nov 2002 02:57:22 -0000	1.1.1.3
++++ krdc/rfbproto.h	20 Nov 2002 03:11:12 -0000	1.4
+@@ -43,6 +43,9 @@
+  *      messages have to be explained by comments.
+  */
+ 
++#ifndef RFBPROTO_H
++#define RFBPROTO_H
++
+ #include "vnctypes.h"
+ 
+ /*****************************************************************************
+@@ -833,3 +836,5 @@
+     rfbPointerEventMsg pe;
+     rfbClientCutTextMsg cct;
+ } rfbClientToServerMsg;
++
++#endif
+--- krdc/vnctypes.h	14 Aug 2002 19:12:45 -0000	1.1.1.2
++++ krdc/vnctypes.h	17 Aug 2002 17:34:19 -0000	1.4
+@@ -30,7 +30,6 @@
+ 
+ #include <X11/Xmd.h>
+ 
+-
+ typedef struct {
+   int shareDesktop; /* bool */
+   int viewOnly; /* bool */
+--- krdc/vncviewer.h	14 Aug 2002 19:12:46 -0000	1.1.1.2
++++ krdc/vncviewer.h	17 Aug 2002 17:34:19 -0000	1.4
+@@ -177,4 +177,5 @@
+ #if(defined __cplusplus)
+ }
+ #endif
+-#endif
++
++#endif /* VNCVIEWER_H */
+--- krfb/kinetd/Makefile.am	29 Oct 2002 17:41:27 -0000	1.1.1.4
++++ krfb/kinetd/Makefile.am	29 Nov 2002 19:01:21 -0000	1.9
+@@ -5,15 +5,14 @@
+ 
+ kded_kinetd_la_SOURCES = kinetd.cpp kinetd.skel
+ kded_kinetd_la_LDFLAGS  = $(all_libraries) -module -avoid-version
+-kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) 
++kded_kinetd_la_LIBADD   = $(top_builddir)/krfb/srvloc/libsrvloc.la $(LIB_KIO) $(LIB_KDED) -lkdeui -lDCOP
+ 
+ # Services
+ kde_servicetypes_DATA = kinetdmodule.desktop
+ kdeddir = $(kde_servicesdir)/kded
+ kded_DATA = kinetd.desktop
+ 
+-EXTRA_DIST = $(kded_kinetd_la_SOURCES)\
+-             $(kded_DATA) \
++EXTRA_DIST = $(kded_DATA) \
+              $(kde_servicetypes_DATA) \
+ 	     eventsrc README.debugging
+ 
+--- krfb/libvncserver/rfb.h	10 Dec 2002 22:11:57 -0000	1.1.1.3
++++ krfb/libvncserver/rfb.h	10 Dec 2002 22:20:46 -0000	1.4
+@@ -31,6 +31,8 @@
+ {
+ #endif
+ 
++typedef unsigned int socklen_t;
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+RCS file: krfb/srvloc/inet_ntop.c
+diff -N krfb/srvloc/inet_ntop.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ krfb/srvloc/inet_ntop.c	23 Aug 2002 21:19:36 -0000	1.1
+@@ -0,0 +1,195 @@
++/*
++ * Copyright (c) 1996-1999 by Internet Software Consortium.
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ */
++
++#if defined(LIBC_SCCS) && !defined(lint)
++static const char rcsid[] = "$Id: inet_ntop.c,v 1.1 2002/08/23 21:19:36 ranger Exp $";
++#endif /* LIBC_SCCS and not lint */
++
++/*#include "port_before.h"*/
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <arpa/nameser.h>
++
++#include <errno.h>
++#include <stdio.h>
++#include <string.h>
++
++/*#include "port_after.h"*/
++
++#define NS_INT16SZ      2
++#define NS_IN6ADDRSZ   16
++ 
++#ifdef SPRINTF_CHAR
++# define SPRINTF(x) strlen(sprintf/**/x)
++#else
++# define SPRINTF(x) ((size_t)sprintf x)
++#endif
++
++/*
++ * WARNING: Don't even consider trying to compile this on a system where
++ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
++ */
++
++static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
++static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
++
++/* char *
++ * inet_ntop(af, src, dst, size)
++ *	convert a network format address to presentation format.
++ * return:
++ *	pointer to presentation format address (`dst'), or NULL (see errno).
++ * author:
++ *	Paul Vixie, 1996.
++ */
++const char *
++inet_ntop(int af, const void *src, char *dst, size_t size)
++{
++	switch (af) {
++	case AF_INET:
++		return (inet_ntop4(src, dst, size));
++	case AF_INET6:
++		return (inet_ntop6(src, dst, size));
++	default:
++		errno = EAFNOSUPPORT;
++		return (NULL);
++	}
++	/* NOTREACHED */
++}
++
++/* const char *
++ * inet_ntop4(src, dst, size)
++ *	format an IPv4 address
++ * return:
++ *	`dst' (as a const)
++ * notes:
++ *	(1) uses no statics
++ *	(2) takes a u_char* not an in_addr as input
++ * author:
++ *	Paul Vixie, 1996.
++ */
++static const char *
++inet_ntop4(const u_char *src, char *dst, size_t size)
++{
++	static const char fmt[] = "%u.%u.%u.%u";
++	char tmp[sizeof "255.255.255.255"];
++
++	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) >= size) {
++		errno = ENOSPC;
++		return (NULL);
++	}
++	strcpy(dst, tmp);
++	return (dst);
++}
++
++/* const char *
++ * inet_ntop6(src, dst, size)
++ *	convert IPv6 binary address into presentation (printable) format
++ * author:
++ *	Paul Vixie, 1996.
++ */
++static const char *
++inet_ntop6(const u_char *src, char *dst, size_t size)
++{
++	/*
++	 * Note that int32_t and int16_t need only be "at least" large enough
++	 * to contain a value of the specified size.  On some systems, like
++	 * Crays, there is no such thing as an integer variable with 16 bits.
++	 * Keep this in mind if you think this function should have been coded
++	 * to use pointer overlays.  All the world's not a VAX.
++	 */
++	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
++	struct { int base, len; } best, cur;
++	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
++	int i;
++
++	/*
++	 * Preprocess:
++	 *	Copy the input (bytewise) array into a wordwise array.
++	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
++	 */
++	memset(words, '\0', sizeof words);
++	for (i = 0; i < NS_IN6ADDRSZ; i++)
++		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
++	best.base = -1;
++	cur.base = -1;
++	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
++		if (words[i] == 0) {
++			if (cur.base == -1)
++				cur.base = i, cur.len = 1;
++			else
++				cur.len++;
++		} else {
++			if (cur.base != -1) {
++				if (best.base == -1 || cur.len > best.len)
++					best = cur;
++				cur.base = -1;
++			}
++		}
++	}
++	if (cur.base != -1) {
++		if (best.base == -1 || cur.len > best.len)
++			best = cur;
++	}
++	if (best.base != -1 && best.len < 2)
++		best.base = -1;
++
++	/*
++	 * Format the result.
++	 */
++	tp = tmp;
++	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
++		/* Are we inside the best run of 0x00's? */
++		if (best.base != -1 && i >= best.base &&
++		    i < (best.base + best.len)) {
++			if (i == best.base)
++				*tp++ = ':';
++			continue;
++		}
++		/* Are we following an initial run of 0x00s or any real hex? */
++		if (i != 0)
++			*tp++ = ':';
++		/* Is this address an encapsulated IPv4? */
++		if (i == 6 && best.base == 0 &&
++		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
++			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
++				return (NULL);
++			tp += strlen(tp);
++			break;
++		}
++		tp += SPRINTF((tp, "%x", words[i]));
++	}
++	/* Was it a trailing run of 0x00's? */
++	if (best.base != -1 && (best.base + best.len) == 
++	    (NS_IN6ADDRSZ / NS_INT16SZ))
++		*tp++ = ':';
++	*tp++ = '\0';
++
++	/*
++	 * Check for overflow, copy, and we're done.
++	 */
++	if ((size_t)(tp - tmp) > size) {
++		errno = ENOSPC;
++		return (NULL);
++	}
++	strcpy(dst, tmp);
++	return (dst);
++}
+--- krfb/srvloc/kinetaddr.cpp	29 Oct 2002 17:41:41 -0000	1.1.1.3
++++ krfb/srvloc/kinetaddr.cpp	31 Oct 2002 19:24:26 -0000	1.6
+@@ -28,6 +28,8 @@
+ 
+ #include <limits.h>
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ 
+ #include <kdebug.h>
+ #include <klocale.h>
+--- ksirc/Makefile.am	5 Nov 2002 02:44:24 -0000	1.1.1.6
++++ ksirc/Makefile.am	12 Jan 2003 18:00:03 -0000	1.11
+@@ -17,17 +17,16 @@
+ testview_LDADD = kstextview.lo $(LIB_KDEUI)
+ testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+-lib_LTLIBRARIES = ksirc.la
++lib_LTLIBRARIES = ksirc.la libksirc_main.la
+ 
+ noinst_PROGRAMS = getdate
+ 
+ # Which sources should be compiled for ksirc.
+ 
+-ksirc_la_SOURCES = \
++libksirc_main_la_SOURCES = \
+ 	toplevel.cpp \
+ 	charSelector.cpp \
+ 	chanButtons.cpp \
+-	ksirc.cpp \
+ 	alistbox.cpp \
+ 	ahistlineedit.cpp \
+ 	iocontroller.cpp \
+@@ -57,8 +56,7 @@
+         colorpicker.cpp
+ 
+ # the library search path
+-ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-ksirc_la_COMPILE_FIRST = cdate.h
++libksirc_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
+ all_ksirc_libraries = \
+ 	./KSPrefs/libksprefs.la \
+@@ -68,10 +66,20 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-ksirc_la_LIBADD   = $(all_ksirc_libraries)
++libksirc_main_la_LIBADD   = $(all_ksirc_libraries) -lkdecore -lkdeui $(LIB_QT)
++
++ksirc_la_COMPILE_FIRST = cdate.h
++ksirc_la_SOURCES = ksirc_la_main.cpp
++ksirc_la_LIBADD  = libksirc_main.la
++ksirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++
++ksirc_la_main.cpp: ksirc.cpp
++	cat ksirc.cpp > ksirc_la_main.cpp
++
++ksirc.cpp: cdate.h
+ 
+-ksirc_SOURCES = dummy.cpp
+-ksirc_LDADD = ksirc.la
++ksirc_SOURCES = ksirc.cpp
++ksirc_LDADD = libksirc_main.la
+ ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ kdoc:
+--- ktalkd/ktalkd/machines/answmach.cpp	4 Jan 2003 20:03:10 -0000	1.1.1.2
++++ ktalkd/ktalkd/machines/answmach.cpp	4 Jan 2003 20:08:04 -0000	1.3
+@@ -32,6 +32,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "answmach.h"
+ 
+ #include <stdio.h>
+--- ktalkd/ktalkd/machines/forwmach.cpp	4 Jan 2003 20:03:11 -0000	1.1.1.2
++++ ktalkd/ktalkd/machines/forwmach.cpp	4 Jan 2003 20:08:04 -0000	1.3
+@@ -31,6 +31,9 @@
+  * (BSD License, from kdelibs/doc/common/bsd-license.html)
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ #include "../includ.h"
+ #include "forwmach.h"
+ #include <stdio.h>
+--- kxmlrpc/Makefile.am	3 Oct 2002 00:44:41 -0000	1.1.1.2
++++ kxmlrpc/Makefile.am	29 Nov 2002 19:01:21 -0000	1.5
+@@ -1,21 +1,31 @@
+ # Makefile for kxmlrpcd.
+ # Written by Kurt Granroth using tons of KDE Makefiles as examples
+ 
++METASOURCES      = AUTO
+ INCLUDES         = $(all_includes)
+ 
+ bin_PROGRAMS     = kxmlrpcd
+-kxmlrpcd_LDADD   = kxmlrpcd.la
++kxmlrpcd_LDADD   = libkxmlrpcd_main.la
+ kxmlrpcd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kxmlrpcd_SOURCES = dummy.cpp
++kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
+ 
+-lib_LTLIBRARIES        = kxmlrpcd.la
++kxmlrpcd_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kxmlrpcd_main.cpp
++
++lib_LTLIBRARIES        = kxmlrpcd.la libkxmlrpcd_main.la
+ kde_module_LTLIBRARIES = kcm_xmlrpcd.la
+ 
+-kxmlrpcd_la_LIBADD  = $(LIB_KSYCOCA)
+-kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
+-kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
++libkxmlrpcd_main_la_LIBADD  = $(LIB_KSYCOCA) $(LIB_QT) -lkdecore -lDCOP
++libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) -avoid-version 
++libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
+ 	kxmlrpcdaemon.cpp kxmlrpcutil.cpp
+-kxmlrpcd_la_METASOURCES = AUTO
++
++kxmlrpcd_la_LIBADD  = libkxmlrpcd_main.la
++kxmlrpcd_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kxmlrpcd_la_SOURCES = kxmlrpcd_la_main.cpp
++
++kxmlrpcd_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kxmlrpcd_la_main.cpp
+ 
+ kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
+ kcm_xmlrpcd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+@@ -28,6 +38,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kxmlrpcd.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kxmlrpc/kxmlrpcdaemon.cpp	25 Jun 2002 03:12:42 -0000	1.1.1.1
++++ kxmlrpc/kxmlrpcdaemon.cpp	29 Nov 2002 19:01:21 -0000	1.2
+@@ -358,7 +358,8 @@
+    { 0, 0, 0 }
+ };
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++int kdemain(int argc, char **argv)
+ {
+     KAboutData about("kxmlrpcd", I18N_NOOP("KXmlRpc Daemon"),
+                      version, description, KAboutData::License_BSD);
+RCS file: kxmlrpc/stub_main.cpp
+diff -N kxmlrpc/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kxmlrpc/stub_main.cpp	29 Nov 2002 19:01:21 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- libkdenetwork/Makefile.am	15 Jan 2003 05:16:05 -0000	1.1.1.5
++++ libkdenetwork/Makefile.am	15 Jan 2003 05:25:30 -0000	1.6
+@@ -43,8 +43,7 @@
+ 
+ libkdenetwork_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0
+ noinst_HEADERS = kpgpbase.h
+-
+-libkdenetwork_la_LIBADD = $(LIB_KDEUI)
++libkdenetwork_la_LIBADD = $(LIB_KDEUI) $(LIB_POLL)
+ 
+ METASOURCES = AUTO
+ 
+--- mimelib/mimelib/config.h	25 Jun 2002 03:12:43 -0000	1.1.1.1
++++ mimelib/mimelib/config.h	25 Jun 2002 03:14:13 -0000	1.2
+@@ -35,7 +35,7 @@
+ #   define DW_WIN32
+ #endif
+ 
+-#if defined(__unix__) || defined(__unix) || defined(_AIX) || defined(__NetBSD__)
++#if defined(__unix__) || defined(__unix) || defined(_AIX) || defined(__NetBSD__) || defined(__MACH__)
+ #   define DW_UNIX
+ #endif
+ 
Index: trunk/dports/x11/kdepim3/Portfile
===================================================================
--- trunk/dports/x11/kdepim3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdepim3/Portfile	(revision 1900)
@@ -0,0 +1,43 @@
+PortSystem 1.0
+name		kdepim3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	pim applications
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdepim-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+#FIXME - need to port pilot-link
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libjpeg:jpeg lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 \
+		lib:libpng.3:libpng lib:libpoll:poll-emulator lib:libqt-mt.3.1:qt3 \
+		lib:libX11.6:XFree86
+
+checksums	kdepim-${version}.tar.bz2 md5 9a416238193107ed2d937a3f5b02f579 \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdepim3/files/patch-kdepim3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdepim3/files/patch-kdepim3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdepim3/files/patch-kdepim3-3.1.darwin	(revision 1900)
@@ -0,0 +1,2299 @@
+
+--- calendarsystem/Makefile.am	29 Oct 2002 18:08:05 -0000	1.1.1.2
++++ calendarsystem/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -1,7 +1,7 @@
+ INCLUDES = $(all_includes)
+ 
+ lib_LTLIBRARIES = libkcalsystem.la
+-libkcalsystem_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:1:0 -module
++libkcalsystem_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:1:0
+ libkcalsystem_la_LIBADD  = $(LIB_QT) $(LIB_KDEUI)
+ libkcalsystem_la_SOURCES = kcalendarsystem.cpp kcalendarsystemhijri.cpp hconv.c
+ 
+--- kaddressbook/Makefile.am	29 Oct 2002 18:08:21 -0000	1.1.1.4
++++ kaddressbook/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -10,13 +10,28 @@
+ bin_PROGRAMS = kaddressbook
+ 
+ kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kaddressbook_LDADD   = libkaddressbookpart.la
++kaddressbook_LDADD   = libkaddressbookpart_shared.la
+ kaddressbook_SOURCES = main.cpp
+ 
+-kde_module_LTLIBRARIES = libkaddressbookpart.la
++lib_LTLIBRARIES = kaddressbook.la
++kde_module_LTLIBRARIES = libkaddressbookpart.la libkaddressbookpart_shared.la
+ 
+-libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libkaddressbookpart_la_LIBADD  = $(top_builddir)/libkdepim/libkdepim.la \
++kaddressbook_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kaddressbook_la_LIBADD  = libkaddressbookpart_shared.la
++kaddressbook_la_SOURCES = kaddressbook_la_main.cpp
++
++kaddressbook_la_main.cpp: main.cpp
++	cat main.cpp > kaddressbook_la_main.cpp
++
++libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version
++libkaddressbookpart_la_LIBADD  = libkaddressbookpart_shared.la
++libkaddressbookpart_la_SOURCES = libkaddressbookpart_la_dummy.cpp
++
++libkaddressbookpart_la_dummy.cpp:
++	echo > libkaddressbookpart_la_dummy.cpp
++
++libkaddressbookpart_shared_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version
++libkaddressbookpart_shared_la_LIBADD  = $(top_builddir)/libkdepim/libkdepim.la \
+ 	./details/libdetails.la \
+ 	./features/libfeatures.la \
+ 	./printing/libprinter.la \
+@@ -24,7 +39,7 @@
+ 	$(LIB_KPARTS) $(LIB_KFILE) \
+ 	-lkabc -lkdeprint
+ 
+-libkaddressbookpart_la_SOURCES = \
++libkaddressbookpart_shared_la_SOURCES = \
+  actionmanager.cpp addhostdialog.cpp addresseditwidget.cpp addresseeconfig.cpp \
+  addresseeeditordialog.cpp addresseeeditorwidget.cpp addresseeutil.cpp \
+  addviewdialog.cpp configureviewdialog.cpp configureviewfilterpage.cpp \
+@@ -37,7 +52,7 @@
+  phoneeditwidget.cpp prefsdialog.cpp selectfieldswidget.cpp \
+  undo.cpp undocmds.cpp viewmanager.cpp viewwrapper.cpp
+ 
+-kaddressbook_METASOURCES = AUTO
++METASOURCES = AUTO
+ 
+ noinst_HEADERS = \
+  actionmanager.h addhostdialog.h addresseditwidget.h addresseeconfig.h \
+--- kalarmd/Makefile.am	12 Nov 2002 17:27:02 -0000	1.1.1.5
++++ kalarmd/Makefile.am	16 Jan 2003 17:38:12 -0000	1.5
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libkalarmd.la
+ 
+ libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-libkalarmd_la_LIBADD  = $(LIB_KDECORE)
++libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(LIB_QT) -lDCOP
+ libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub dummy.cpp
+ 
+ DISTCLEANFILES = dummy.cpp
+--- knotes/Makefile.am	29 Oct 2002 18:08:35 -0000	1.1.1.2
++++ knotes/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -9,7 +9,7 @@
+ include_HEADERS = KNotesIface.h
+ noinst_HEADERS  = knotesapp.h knote.h knoteedit.h knoteconfigdlg.h knotebutton.h
+ knotes_SOURCES  = knotesapp.cpp knote.cpp knoteedit.cpp knoteconfigdlg.cpp main.cpp KNotesIface.skel
+-knotes_LDADD    = $(LIB_KIO) -lkdeprint
++knotes_LDADD    = $(LIB_KIO) $(LIB_KDEPRINT)
+ knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+ 
+ METASOURCES     = AUTO
+--- korganizer/Makefile.am	29 Oct 2002 18:08:43 -0000	1.1.1.4
++++ korganizer/Makefile.am	11 Nov 2002 20:56:20 -0000	1.2
+@@ -93,7 +93,7 @@
+ 
+ kde_bin_SCRIPTS = ical2vcal korganizerIn
+ 
+-kdelnkdir = $(kde_appsdir)/Applications
++kdelnkdir = $(kde_appsdir)/Utilities
+ kdelnk_DATA = korganizer.desktop
+ 
+ rcdir = $(kde_datadir)/korganizer
+--- korganizer/knewstuff/Makefile.am	10 Jul 2002 05:20:46 -0000	1.1.1.1
++++ korganizer/knewstuff/Makefile.am	6 Oct 2002 16:12:37 -0000	1.2
+@@ -5,7 +5,7 @@
+ lib_LTLIBRARIES = libknewstuff.la
+ 
+ libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+-libknewstuff_la_LIBADD  = $(LIB_KIO)
++libknewstuff_la_LIBADD  = $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT)
+ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
+   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp
+ 
+--- korganizer/plugins/holidays/Makefile.am	27 Nov 2002 02:36:42 -0000	1.1.1.3
++++ korganizer/plugins/holidays/Makefile.am	1 Dec 2002 17:02:08 -0000	1.2
+@@ -18,7 +18,8 @@
+ servicedir  = $(kde_servicesdir)/korganizer
+ service_DATA = holidays.desktop
+ 
+-parser:
+-	cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y
++parseholiday.c: parseholiday.y
+ 	cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y
++
++scanholiday.c: scanholiday.lex
+ 	cd $(srcdir) && lex -Pkcal -B -oscanholiday.c scanholiday.lex
+--- korganizer/plugins/holidays/parseholiday.y	25 Jun 2002 03:18:22 -0000	1.1.1.1
++++ korganizer/plugins/holidays/parseholiday.y	6 Oct 2002 17:22:17 -0000	1.2
+@@ -68,7 +68,7 @@
+ /*** Variables and structures ***/
+ static int	 m, d, y;
+ int              kcallineno;	       	/* current line # being parsed */
+-FILE            *kcalin;                  /* file currently being processed */
++extern FILE     *kcalin;                  /* file currently being processed */
+ int	         yacc_small;		/* small string or on its own line? */
+ int	         yacc_stringcolor;	/* color of holiday name text, 1..8 */
+ char	        *yacc_string;		/* holiday name text */
+--- korganizer/plugins/holidays/scanholiday.lex	25 Jun 2002 03:18:22 -0000	1.1.1.1
++++ korganizer/plugins/holidays/scanholiday.lex	1 Dec 2002 17:02:08 -0000	1.2
+@@ -1,4 +1,5 @@
+ %{
++#define kcalyacclval kcallval
+ #include <string.h>
+ #include "parseholiday.h"
+ %}
+--- kpilot/conduits/configure.in.in	3 Oct 2002 00:58:19 -0000	1.1.1.1
++++ kpilot/conduits/configure.in.in	6 Oct 2002 04:32:13 -0000	1.2
+@@ -51,7 +51,7 @@
+ dnl
+ if  test "$HAVE_MAL" = "0" ; then
+ 	AC_MSG_CHECKING([for libmal.h alternate])
+-	for i in /usr/local/include/mal  /usr/local/include /vol/kde/support/include /usr/include/mal ; do
++	for i in @PREFIX@/include/mal /usr/local/include/mal  /usr/local/include /vol/kde/support/include /usr/include/mal ; do
+ 		test -f $i/libmal.h && HAVE_MAL=1
+ 		test -f $i/libmal.h && MAL_INCLUDE="-I$i"
+ 	done
+@@ -68,6 +68,8 @@
+ if test "$HAVE_MAL" = "1" ; then
+ 	HAVE_MAL=0
+ 
++	CPPFLAGS="$mal_save_cflags $all_includes $MAL_INCLUDE"
++	LDFLAGS="$mal_save_ldflags $all_libraries -L/sw/lib"
+ 	AC_CHECK_LIB(mal,
+ 		Disconnect,
+ 		[MAL_LIB="-lmal"
+--- kpilot/conduits/JPilotPluginProxy/configure.in.in	10 Jul 2002 05:21:36 -0000	1.1.1.1
++++ kpilot/conduits/JPilotPluginProxy/configure.in.in	19 Oct 2002 21:02:43 -0000	1.2
+@@ -25,218 +25,91 @@
+ HAVE_GDBM=0
+ HAVE_JPILOT=0
+ 
+-kpilot_save_cflags="$CPPFLAGS"
+-kpilot_save_ldflags="$LDFLAGS"
+-
+-
+-
+-
+ dnl
+ dnl First check for GTK, then for gdk, then for glib, and finally for gdbm
+ dnl
+ 
+-
++dnl Check for pkg-config
++AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 
+ dnl ********************************************************************************
+-dnl *                                       GLIB                                 
++dnl *                                       glib
+ dnl ********************************************************************************
+ 
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-LDFLAGS="$LDFLAGS $all_libraries"
+-
+-
+-GLIB_LIB=""
+-GLIB_INCLUDE=""
++GLIB_PACKAGES="glib"
++GLIB_VERSION="1.2.0"
++AC_MSG_CHECKING(for glib (at least $GLIB_VERSION))
+ 
+-AC_CHECK_HEADER(glib.h,[HAVE_GLIB=1], )
+-
+-dnl Warn if no headers found. Maybe this should be collected at the end
+-dnl of the build as well, like other this-won't-be-built messages?
+-
+-if  test "$HAVE_GLIB" = "0" ; then
+-	AC_MSG_CHECKING([for glib.h alternate])
+-	for i in /usr/local/include /usr/include/glib-2.0 /usr/include/glib-1.2 /vol/gnome/support/include /usr/include/glib  ; do
+-		test -f $i/glib.h && HAVE_GLIB=1
+-		test -f $i/glib.h && GLIB_INCLUDE="-I$i"
+-	done
+-
+-
+-	if test "$HAVE_GLIB" = "0" ; then
+-		AC_MSG_WARN([JPilotPluginProxy: no glib headers found.])
+-	else
+-		AC_MSG_RESULT([found])
+-	fi
++if test "x$PKG_CONFIG" != "xno"; then
++if $PKG_CONFIG --atleast-version $GLIB_VERSION $GLIB_PACKAGES >/dev/null 2>&1 ; then
++    GLIB_INCLUDE="`$PKG_CONFIG --cflags $GLIB_PACKAGES`"
++    GLIB_LIB="`$PKG_CONFIG --libs $GLIB_PACKAGES`"
++    HAVE_GLIB=1
++    AC_MSG_RESULT(yes)
+ fi
+-
+-
+-dnl Search the library
+-
+-CPPFLAGS="$kpilot_save_cflags  $all_includes $GLIB_INCLUDE"
+-LDFLAGS="$kpilot_save_ldflags  $all_libraries"
+-
+-if test "$HAVE_GLIB" = "1" ; then
+-	HAVE_GLIB=0
+-	AC_CHECK_LIB(glib, g_free,
+-			[GLIB_LIB="-lglib"
+-			HAVE_GLIB=1],[],[])
+-
+-	for i in /usr/local/glib /usr/local/lib /usr/local/lib /vol/kde/support/lib ; do
+-		if test "$HAVE_GLIB" = "0" ; then
+-			CPPFLAGS="$kpilot_save_cflags  $all_includes $GLIB_INCLUDE"
+-			LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$i -R$i"
+-
+-			unset ac_cv_lib_glib_g_free
+-			AC_CHECK_LIB(glib, g_free,
+-				[GLIB_LIB="-L$i -R$i -lglib"
+-				HAVE_GLIB=1],[],[])
+-		fi
+-	done
+ fi
+ 
+-if test "$HAVE_GLIB" = "0" ; then
+-	AC_MSG_WARN([JPilotPluginProxy: glib library or header files not found])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
++if test -z "$GLIB_LIB"; then
++        AC_MSG_RESULT(not installed)
++    DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
+ fi
+ 
+ AC_SUBST(GLIB_LIB)
+ AC_SUBST(GLIB_INCLUDE)
++AC_SUBST(HAVE_GLIB)
+ 
+ 
+ dnl ********************************************************************************
+-dnl *                                       GTK                                 
++dnl *                                       gtk+
+ dnl ********************************************************************************
+ 
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-LDFLAGS="$LDFLAGS $all_libraries"
+-
+-
+-GTK_LIB=""
+-GTK_INCLUDE=""
++GTK_PACKAGES="gtk+"
++GTK_VERSION="1.2.0"
++AC_MSG_CHECKING(for gtk+ (at least $GTK_VERSION))
+ 
+-AC_CHECK_HEADER(gtk/gtk.h,[HAVE_GTK=1], )
+-
+-dnl Warn if no headers found. Maybe this should be collected at the end
+-dnl of the build as well, like other this-won't-be-built messages?
+-
+-if  test "$HAVE_GTK" = "0" ; then
+-	AC_MSG_CHECKING([for gtk.h alternate])
+-	for i in /usr/local/include  /vol/gnome/support/include  ; do
+-		test -f $i/gtk/gtk.h && HAVE_GTK=1
+-		test -f $i/gtk/gtk.h && GTK_INCLUDE="-I$i"
+-	done
+-
+-
+-	if test "$HAVE_GTK" = "0" ; then
+-		AC_MSG_WARN([JPilotPluginProxy: no gtk headers found.])
+-	else
+-		AC_MSG_RESULT([found])
+-	fi
++if test "x$PKG_CONFIG" != "xno"; then
++if $PKG_CONFIG --atleast-version $GTK_VERSION $GTK_PACKAGES >/dev/null 2>&1 ; then
++    GTK_INCLUDE="`$PKG_CONFIG --cflags $GTK_PACKAGES`"
++    GTK_LIB="`$PKG_CONFIG --libs $GTK_PACKAGES`"
++    HAVE_GTK=1
++    AC_MSG_RESULT(yes)
+ fi
+-
+-
+-dnl Search the library
+-
+-CPPFLAGS="$kpilot_save_cflags  $all_includes $GTK_INCLUDE"
+-LDFLAGS="$kpilot_save_ldflags  $all_libraries"
+-
+-if test "$HAVE_GTK" = "1" ; then
+-	AC_CHECK_LIB(gtk, gtk_main,
+-			[GLIB_LIB="-lgtk"
+-			HAVE_GTK=1],[],[])
+-
+-	for i in /usr/local/glib /usr/local/lib /usr/lib /vol/kde/support/lib ; do
+-		if test "$HAVE_GTK" = "0" ; then
+-			CPPFLAGS="$kpilot_save_cflags  $all_includes $GTK_INCLUDE"
+-			LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$i -R$i"
+-
+-			unset ac_cv_lib_gtk_gtk_main
+-			AC_CHECK_LIB(gtk, gtk_main,
+-				[GTK_LIB="-L$i -R$i -lgtk"
+-				HAVE_GTK=1],[],[])
+-		fi
+-	done
+ fi
+ 
+-if test "$HAVE_GTK" = "0" ; then
+-	AC_MSG_WARN([JPilotPluginProxy: gtk library or header files not found])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
++if test -z "$GTK_LIB"; then
++        AC_MSG_RESULT(not installed)
++    DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
+ fi
+ 
+ AC_SUBST(GTK_LIB)
+ AC_SUBST(GTK_INCLUDE)
++AC_SUBST(HAVE_GTK)
+ 
+ 
+ dnl ********************************************************************************
+-dnl *                                       GDK                                 
++dnl *                                       gdk+
+ dnl ********************************************************************************
+ 
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-LDFLAGS="$LDFLAGS $all_libraries"
+-
+-
+-GTK_LIB=""
+-GTK_INCLUDE=""
++GDK_PACKAGES="gdk"
++GDK_VERSION="0.12.0"
++AC_MSG_CHECKING(for gdk (at least $GDK_VERSION))
+ 
+-AC_CHECK_HEADER(gtk/gtk.h,[HAVE_GTK=1], )
+-
+-dnl Warn if no headers found. Maybe this should be collected at the end
+-dnl of the build as well, like other this-won't-be-built messages?
+-
+-if  test "$HAVE_GTK" = "0" ; then
+-	AC_MSG_CHECKING([for gtk.h alternate])
+-	for i in /usr/local/include  /vol/gnome/support/include  ; do
+-		test -f $i/gtk/gtk.h && HAVE_GTK=1
+-		test -f $i/gtk/gtk.h && GTK_INCLUDE="-I$i"
+-	done
+-
+-
+-	if test "$HAVE_GTK" = "0" ; then
+-		AC_MSG_WARN([JPilotPluginProxy: no gtk headers found.])
+-	else
+-		AC_MSG_RESULT([found])
+-	fi
++if test "x$PKG_CONFIG" != "xno"; then
++if $PKG_CONFIG --atleast-version $GDK_VERSION $GDK_PACKAGES >/dev/null 2>&1 ; then
++    GDK_INCLUDE="`$PKG_CONFIG --cflags $GDK_PACKAGES`"
++    GDK_LIB="`$PKG_CONFIG --libs $GDK_PACKAGES`"
++    HAVE_GDK=1
++    AC_MSG_RESULT(yes)
+ fi
+-
+-
+-dnl Search the library
+-
+-CPPFLAGS="$kpilot_save_cflags  $all_includes $GTK_INCLUDE"
+-LDFLAGS="$kpilot_save_ldflags  $all_libraries"
+-
+-if test "$HAVE_GTK" = "1" ; then
+-	AC_CHECK_LIB(gtk, gtk_main,
+-			[GLIB_LIB="-lgtk"
+-			HAVE_GTK=1],[],[])
+-
+-	for i in /usr/local/glib /usr/local/lib /usr/lib /vol/kde/support/lib ; do
+-		if test "$HAVE_GTK" = "0" ; then
+-			CPPFLAGS="$kpilot_save_cflags  $all_includes $GTK_INCLUDE"
+-			LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$i -R$i"
+-
+-			unset ac_cv_lib_gtk_gtk_main
+-			AC_CHECK_LIB(gtk, gtk_main,
+-				[GTK_LIB="-L$i -R$i -lgtk"
+-				HAVE_GTK=1],[],[])
+-		fi
+-	done
+ fi
+ 
+-if test "$HAVE_GTK" = "0" ; then
+-	AC_MSG_WARN([JPilotPluginProxy: gtk library or header files not found])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
++if test -z "$GDK_LIB"; then
++        AC_MSG_RESULT(not installed)
++    DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot/conduits/JPilotPluginProxy"
+ fi
+ 
+-AC_SUBST(GTK_LIB)
+-AC_SUBST(GTK_INCLUDE)
+-
+-
+-
+-
+-
+-
++AC_SUBST(GDK_LIB)
++AC_SUBST(GDK_INCLUDE)
++AC_SUBST(HAVE_GDK)
+ 
+ 
+-CPPFLAGS="$kpilot_save_cflags"
+-LDFLAGS="$kpilot_save_ldflags"
+-unset kpilot_save_cflags
+-unset kpilot_save_ldflags
+--- kpilot/conduits/abbrowserconduit/Makefile.am	3 Oct 2002 00:58:19 -0000	1.1.1.4
++++ kpilot/conduits/abbrowserconduit/Makefile.am	31 Oct 2002 19:24:26 -0000	1.2
+@@ -23,4 +23,4 @@
+ 	abbrowser-conduit.cc \
+ 	kaddressbookConduit.ui
+ libaddressconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib 
+-libaddressconduit_la_LIBADD = -lkpilot -lkabc
++libaddressconduit_la_LIBADD = -lkpilot -lkabc -lpisock $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
+--- kpilot/conduits/expense/Makefile.am	25 Jun 2002 03:18:22 -0000	1.1.1.1
++++ kpilot/conduits/expense/Makefile.am	16 Jan 2003 17:38:12 -0000	1.3
+@@ -14,7 +14,7 @@
+ libexpenseconduit_la_SOURCES = expenseConduit.ui setupDialog.cc \
+ 	expense.cc expense-factory.cc
+ libexpenseconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libexpenseconduit_la_LIBADD  =  -lkpilot
++libexpenseconduit_la_LIBADD  =  -lkpilot $(PISOCK_LIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lDCOP
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = expense.h setupDialog.h 
+--- kpilot/conduits/null/Makefile.am	25 Jun 2002 03:18:22 -0000	1.1.1.1
++++ kpilot/conduits/null/Makefile.am	6 Oct 2002 04:32:13 -0000	1.2
+@@ -10,5 +10,5 @@
+ 
+ libnullconduit_la_SOURCES = setup_base.ui null-conduit.cc null-factory.cc
+ libnullconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libnullconduit_la_LIBADD = -lkpilot
++libnullconduit_la_LIBADD = -lkpilot $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
+ 
+--- kpilot/conduits/popmail/Makefile.am	25 Jun 2002 03:18:22 -0000	1.1.1.1
++++ kpilot/conduits/popmail/Makefile.am	29 Nov 2002 19:01:22 -0000	1.3
+@@ -17,7 +17,7 @@
+ libpopmailconduit_la_SOURCES = popmail-factory.cc setupDialog.cc \
+ 	passworddialog.cc popmail-conduit.cc parsedate.c
+ libpopmailconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libpopmailconduit_la_LIBADD   =  -lkpilot
++libpopmailconduit_la_LIBADD   =  -lkpilot $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(PISOCK_LIB) $(LIB_KIO) -lDCOP
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = popmail-conduit.h passworddialog.h setupDialog.h
+--- kpilot/conduits/popmail/popmail-conduit.cc	15 Jan 2003 05:29:37 -0000	1.1.1.5
++++ kpilot/conduits/popmail/popmail-conduit.cc	15 Jan 2003 05:43:24 -0000	1.3
+@@ -41,6 +41,7 @@
+ 
+ 
+ #include <sys/types.h>
++#include <sys/utsname.h>
+ #include <sys/socket.h>
+ #include <sys/utsname.h>
+ #include <ctype.h>
+--- kpilot/conduits/timeconduit/Makefile.am	14 Aug 2002 19:38:40 -0000	1.1.1.1
++++ kpilot/conduits/timeconduit/Makefile.am	6 Oct 2002 04:32:14 -0000	1.2
+@@ -17,5 +17,5 @@
+ 	time-conduit.cc \
+ 	time-setup_dialog.ui
+ libtimeconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib 
+-libtimeconduit_la_LIBADD = -lkpilot 
+- 
+\ No newline at end of file
++libtimeconduit_la_LIBADD = -lkpilot $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
++ 
+--- kpilot/conduits/vcalconduit/Makefile.am	14 Aug 2002 19:38:44 -0000	1.1.1.3
++++ kpilot/conduits/vcalconduit/Makefile.am	6 Oct 2002 04:32:14 -0000	1.2
+@@ -16,12 +16,12 @@
+ libvcalconduit_la_SOURCES = korganizerConduit.ui vcal-factorybase.cc vcal-factory.cc  \
+ 	vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc
+ libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libvcalconduit_la_LIBADD = -lkpilot -lkcal
++libvcalconduit_la_LIBADD = -lkpilot -lkcal $(LIB_KDECORE) $(LIB_QT) $(LIB_KIO) $(PISOCK_LIB) $(LIB_KDEUI)
+ 
+ libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc  \
+ 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc
+ libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libtodoconduit_la_LIBADD = -lkpilot -lkcal
++libtodoconduit_la_LIBADD = -lkpilot -lkcal $(LIB_KDECORE) $(LIB_QT) $(LIB_KIO) $(PISOCK_LIB) $(LIB_KDEUI)
+ 
+ # You may want to enable debugging like this on systems with broken kdelibs
+ # libtodoconduit_la_CFLAGS = -DDEBUG -DDEBUG_CERR
+--- kpilot/kpilot/Makefile-standalone	25 Jun 2002 03:18:23 -0000	1.1.1.1
++++ kpilot/kpilot/Makefile-standalone	28 Nov 2002 00:02:51 -0000	1.2
+@@ -152,7 +152,7 @@
+ 
+ 
+ %.kidl : %.h
+-	$(DCOPIDL) $< > $@ || ( rm -f $@ ; /bin/false )
++	$(DCOPIDL) $< > $@ || ( rm -f $@ ; false )
+ 
+ %_stub.cc : %.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cc --no-skel $<
+--- kpilot/lib/Makefile.am	3 Oct 2002 00:58:31 -0000	1.1.1.4
++++ kpilot/lib/Makefile.am	29 Nov 2002 19:01:22 -0000	1.3
+@@ -23,8 +23,8 @@
+ 	pilotMemo.cc pilotAddress.cc \
+ 	pilotDateEntry.cc pilotTodoEntry.cc
+ 
+-libkpilot_la_LDFLAGS = $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
+-libkpilot_la_LIBADD = $(PISOCK_LIB)
++libkpilot_la_LDFLAGS = $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH) $(QT_LDFLAGS)
++libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
+ 
+ kpilotincludedir = $(includedir)/kpilot
+ kpilotinclude_HEADERS = kpilotlink.h uiDialog.h plugin.h syncAction.h \
+--- ksync/lib/Makefile.am	3 Oct 2002 00:58:32 -0000	1.1.1.4
++++ ksync/lib/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(top_srcdir)/libkcal $(all_includes)
+ 
+ lib_LTLIBRARIES   = libksync.la
+-libksync_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module
++libksync_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
+ libksync_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la -lkabc $(LIB_QT)
+ 
+ libksync_la_SOURCES = \
+--- libical/src/libical/.cvsignore	25 Jun 2002 03:18:23 -0000	1.1.1.1
++++ libical/src/libical/.cvsignore	6 Oct 2002 03:09:13 -0000	1.2
+@@ -9,7 +9,6 @@
+ icalderivedproperty.h
+ icalderivedvalue.c
+ icalderivedvalue.h
+-icallexer.c
+ icalattendee.lo
+ icalattendee.o
+ icalcomponent.lo
+@@ -63,5 +62,3 @@
+ vsnprintf.o
+ y.output
+ 
+-icalyacc.c
+-icalyacc.h
+--- libical/src/libicalss/.cvsignore	25 Jun 2002 03:18:23 -0000	1.1.1.1
++++ libical/src/libicalss/.cvsignore	6 Oct 2002 03:39:42 -0000	1.2
+@@ -30,4 +30,3 @@
+ libicalss.la
+ y.output
+ 
+-icalsslexer.c
+RCS file: libical/src/libicalss/icalsslexer.c
+diff -N libical/src/libicalss/icalsslexer.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ libical/src/libicalss/icalsslexer.c	6 Oct 2002 03:39:42 -0000	1.1
+@@ -0,0 +1,1687 @@
++/* A lexical scanner generated by flex */
++
++/* Scanner skeleton version:
++ * $Header: /Volumes/src/cvs/od/proj/KDE-Darwin/kdepim/libical/src/libicalss/icalsslexer.c,v 1.1 2002/10/06 03:39:42 ranger Exp $
++ */
++
++#define FLEX_SCANNER
++#define YY_FLEX_MAJOR_VERSION 2
++#define YY_FLEX_MINOR_VERSION 5
++
++#include <stdio.h>
++
++
++/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
++#ifdef c_plusplus
++#ifndef __cplusplus
++#define __cplusplus
++#endif
++#endif
++
++
++#ifdef __cplusplus
++
++#include <stdlib.h>
++#include <unistd.h>
++
++/* Use prototypes in function declarations. */
++#define YY_USE_PROTOS
++
++/* The "const" storage-class-modifier is valid. */
++#define YY_USE_CONST
++
++#else	/* ! __cplusplus */
++
++#if __STDC__
++
++#define YY_USE_PROTOS
++#define YY_USE_CONST
++
++#endif	/* __STDC__ */
++#endif	/* ! __cplusplus */
++
++#ifdef __TURBOC__
++ #pragma warn -rch
++ #pragma warn -use
++#include <io.h>
++#include <stdlib.h>
++#define YY_USE_CONST
++#define YY_USE_PROTOS
++#endif
++
++#ifdef YY_USE_CONST
++#define ssconst const
++#else
++#define ssconst
++#endif
++
++
++#ifdef YY_USE_PROTOS
++#define YY_PROTO(proto) proto
++#else
++#define YY_PROTO(proto) ()
++#endif
++
++/* Returned upon end-of-file. */
++#define YY_NULL 0
++
++/* Promotes a possibly negative, possibly signed char to an unsigned
++ * integer for use as an array index.  If the signed char is negative,
++ * we want to instead treat it as an 8-bit unsigned char, hence the
++ * double cast.
++ */
++#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
++
++/* Enter a start condition.  This macro really ought to take a parameter,
++ * but we do it the disgusting crufty way forced on us by the ()-less
++ * definition of BEGIN.
++ */
++#define BEGIN ss_start = 1 + 2 *
++
++/* Translate the current start state into a value that can be later handed
++ * to BEGIN to return to the state.  The YYSTATE alias is for lex
++ * compatibility.
++ */
++#define YY_START ((ss_start - 1) / 2)
++#define YYSTATE YY_START
++
++/* Action number for EOF rule of a given start state. */
++#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
++
++/* Special action meaning "start processing a new file". */
++#define YY_NEW_FILE ssrestart( ssin )
++
++#define YY_END_OF_BUFFER_CHAR 0
++
++/* Size of default input buffer. */
++#define YY_BUF_SIZE 16384
++
++typedef struct ss_buffer_state *YY_BUFFER_STATE;
++
++extern int ssleng;
++extern FILE *ssin, *ssout;
++
++#define EOB_ACT_CONTINUE_SCAN 0
++#define EOB_ACT_END_OF_FILE 1
++#define EOB_ACT_LAST_MATCH 2
++
++/* The funky do-while in the following #define is used to turn the definition
++ * int a single C statement (which needs a semi-colon terminator).  This
++ * avoids problems with code like:
++ *
++ * 	if ( condition_holds )
++ *		ssless( 5 );
++ *	else
++ *		do_something_else();
++ *
++ * Prior to using the do-while the compiler would get upset at the
++ * "else" because it interpreted the "if" statement as being all
++ * done when it reached the ';' after the ssless() call.
++ */
++
++/* Return all but the first 'n' matched characters back to the input stream. */
++
++#define ssless(n) \
++	do \
++		{ \
++		/* Undo effects of setting up sstext. */ \
++		*ss_cp = ss_hold_char; \
++		YY_RESTORE_YY_MORE_OFFSET \
++		ss_c_buf_p = ss_cp = ss_bp + n - YY_MORE_ADJ; \
++		YY_DO_BEFORE_ACTION; /* set up sstext again */ \
++		} \
++	while ( 0 )
++
++#define unput(c) ssunput( c, sstext_ptr )
++
++/* The following is because we cannot portably get our hands on size_t
++ * (without autoconf's help, which isn't available because we want
++ * flex-generated scanners to compile on their own).
++ */
++typedef unsigned int ss_size_t;
++
++
++struct ss_buffer_state
++	{
++	FILE *ss_input_file;
++
++	char *ss_ch_buf;		/* input buffer */
++	char *ss_buf_pos;		/* current position in input buffer */
++
++	/* Size of input buffer in bytes, not including room for EOB
++	 * characters.
++	 */
++	ss_size_t ss_buf_size;
++
++	/* Number of characters read into ss_ch_buf, not including EOB
++	 * characters.
++	 */
++	int ss_n_chars;
++
++	/* Whether we "own" the buffer - i.e., we know we created it,
++	 * and can realloc() it to grow it, and should free() it to
++	 * delete it.
++	 */
++	int ss_is_our_buffer;
++
++	/* Whether this is an "interactive" input source; if so, and
++	 * if we're using stdio for input, then we want to use getc()
++	 * instead of fread(), to make sure we stop fetching input after
++	 * each newline.
++	 */
++	int ss_is_interactive;
++
++	/* Whether we're considered to be at the beginning of a line.
++	 * If so, '^' rules will be active on the next match, otherwise
++	 * not.
++	 */
++	int ss_at_bol;
++
++	/* Whether to try to fill the input buffer when we reach the
++	 * end of it.
++	 */
++	int ss_fill_buffer;
++
++	int ss_buffer_status;
++#define YY_BUFFER_NEW 0
++#define YY_BUFFER_NORMAL 1
++	/* When an EOF's been seen but there's still some text to process
++	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
++	 * shouldn't try reading from the input source any more.  We might
++	 * still have a bunch of tokens to match, though, because of
++	 * possible backing-up.
++	 *
++	 * When we actually see the EOF, we change the status to "new"
++	 * (via ssrestart()), so that the user can continue scanning by
++	 * just pointing ssin at a new input file.
++	 */
++#define YY_BUFFER_EOF_PENDING 2
++	};
++
++static YY_BUFFER_STATE ss_current_buffer = 0;
++
++/* We provide macros for accessing buffer states in case in the
++ * future we want to put the buffer states in a more general
++ * "scanner state".
++ */
++#define YY_CURRENT_BUFFER ss_current_buffer
++
++
++/* ss_hold_char holds the character lost when sstext is formed. */
++static char ss_hold_char;
++
++static int ss_n_chars;		/* number of characters read into ss_ch_buf */
++
++
++int ssleng;
++
++/* Points to current character in buffer. */
++static char *ss_c_buf_p = (char *) 0;
++static int ss_init = 1;		/* whether we need to initialize */
++static int ss_start = 0;	/* start state number */
++
++/* Flag which is used to allow sswrap()'s to do buffer switches
++ * instead of setting up a fresh ssin.  A bit of a hack ...
++ */
++static int ss_did_buffer_switch_on_eof;
++
++void ssrestart YY_PROTO(( FILE *input_file ));
++
++void ss_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
++void ss_load_buffer_state YY_PROTO(( void ));
++YY_BUFFER_STATE ss_create_buffer YY_PROTO(( FILE *file, int size ));
++void ss_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
++void ss_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
++void ss_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
++#define YY_FLUSH_BUFFER ss_flush_buffer( ss_current_buffer )
++
++YY_BUFFER_STATE ss_scan_buffer YY_PROTO(( char *base, ss_size_t size ));
++YY_BUFFER_STATE ss_scan_string YY_PROTO(( ssconst char *ss_str ));
++YY_BUFFER_STATE ss_scan_bytes YY_PROTO(( ssconst char *bytes, int len ));
++
++static void *ss_flex_alloc YY_PROTO(( ss_size_t ));
++static void *ss_flex_realloc YY_PROTO(( void *, ss_size_t ));
++static void ss_flex_free YY_PROTO(( void * ));
++
++#define ss_new_buffer ss_create_buffer
++
++#define ss_set_interactive(is_interactive) \
++	{ \
++	if ( ! ss_current_buffer ) \
++		ss_current_buffer = ss_create_buffer( ssin, YY_BUF_SIZE ); \
++	ss_current_buffer->ss_is_interactive = is_interactive; \
++	}
++
++#define ss_set_bol(at_bol) \
++	{ \
++	if ( ! ss_current_buffer ) \
++		ss_current_buffer = ss_create_buffer( ssin, YY_BUF_SIZE ); \
++	ss_current_buffer->ss_at_bol = at_bol; \
++	}
++
++#define YY_AT_BOL() (ss_current_buffer->ss_at_bol)
++
++typedef unsigned char YY_CHAR;
++FILE *ssin = (FILE *) 0, *ssout = (FILE *) 0;
++typedef int ss_state_type;
++extern char sstext[];
++
++
++static ss_state_type ss_get_previous_state YY_PROTO(( void ));
++static ss_state_type ss_try_NUL_trans YY_PROTO(( ss_state_type current_state ));
++static int ss_get_next_buffer YY_PROTO(( void ));
++static void ss_fatal_error YY_PROTO(( ssconst char msg[] ));
++
++/* Done after the current pattern has been matched and before the
++ * corresponding action - sets up sstext.
++ */
++#define YY_DO_BEFORE_ACTION \
++	sstext_ptr = ss_bp; \
++	ssleng = (int) (ss_cp - ss_bp); \
++	ss_hold_char = *ss_cp; \
++	*ss_cp = '\0'; \
++	if ( ssleng >= YYLMAX ) \
++		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
++	ss_flex_strncpy( sstext, sstext_ptr, ssleng + 1 ); \
++	ss_c_buf_p = ss_cp;
++
++#define YY_NUM_RULES 19
++#define YY_END_OF_BUFFER 20
++static ssconst short int ss_accept[47] =
++    {   0,
++        0,    0,    0,    0,    0,    0,   20,   18,   14,   14,
++       18,   13,   17,    4,   15,    7,    5,    8,   17,   17,
++       17,   17,   17,   14,    6,    0,   17,    9,   10,   17,
++       17,   12,   17,   17,   16,   11,   17,   17,   17,    2,
++       17,   17,   17,    3,    1,    0
++    } ;
++
++static ssconst int ss_ec[256] =
++    {   0,
++        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
++        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    2,    4,    1,    1,    1,    1,    1,    5,    1,
++        1,    6,    1,    7,    6,    6,    1,    6,    6,    6,
++        6,    6,    6,    6,    6,    6,    6,    1,    8,    9,
++       10,   11,    1,    1,   12,    6,   13,   14,   15,   16,
++        6,   17,    6,    6,    6,   18,   19,   20,   21,    6,
++        6,   22,   23,   24,    6,    6,   25,    6,    6,    6,
++        1,    1,    1,    1,    1,    1,   12,    6,   13,   14,
++
++       15,   16,    6,   17,    6,    6,    6,   18,   19,   20,
++       21,    6,    6,   22,   23,   24,    6,    6,   25,    6,
++        6,    6,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1
++    } ;
++
++static ssconst int ss_meta[26] =
++    {   0,
++        1,    1,    1,    1,    1,    2,    1,    1,    1,    1,
++        1,    2,    2,    2,    2,    2,    2,    2,    2,    2,
++        2,    2,    2,    2,    2
++    } ;
++
++static ssconst short int ss_base[49] =
++    {   0,
++        0,    0,    0,    0,    0,    0,   53,   54,   24,   26,
++       42,    0,    0,   54,   54,   41,   54,   40,   29,   26,
++       25,   31,   28,   28,   54,   39,    0,   54,   54,   29,
++       21,    0,   23,   25,   54,    0,   20,   23,   15,    0,
++       23,   20,   10,    0,    0,   54,   31,   30
++    } ;
++
++static ssconst short int ss_def[49] =
++    {   0,
++       46,    1,    1,    1,    1,    1,   46,   46,   46,   46,
++       46,   47,   48,   46,   46,   46,   46,   46,   48,   48,
++       48,   48,   48,   46,   46,   47,   48,   46,   46,   48,
++       48,   48,   48,   48,   46,   48,   48,   48,   48,   48,
++       48,   48,   48,   48,   48,    0,   46,   46
++    } ;
++
++static ssconst short int ss_nxt[80] =
++    {   0,
++        8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
++       18,   19,   13,   13,   13,   20,   13,   13,   13,   13,
++       21,   13,   22,   13,   23,   24,   24,   24,   24,   24,
++       24,   27,   26,   45,   44,   43,   42,   41,   40,   39,
++       38,   37,   36,   35,   34,   33,   32,   31,   30,   29,
++       28,   25,   46,    7,   46,   46,   46,   46,   46,   46,
++       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
++       46,   46,   46,   46,   46,   46,   46,   46,   46
++    } ;
++
++static ssconst short int ss_chk[80] =
++    {   0,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    1,    1,    1,    1,    9,    9,   10,   10,   24,
++       24,   48,   47,   43,   42,   41,   39,   38,   37,   34,
++       33,   31,   30,   26,   23,   22,   21,   20,   19,   18,
++       16,   11,    7,   46,   46,   46,   46,   46,   46,   46,
++       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
++       46,   46,   46,   46,   46,   46,   46,   46,   46
++    } ;
++
++static ss_state_type ss_last_accepting_state;
++static char *ss_last_accepting_cpos;
++
++/* The intent behind this definition is that it'll catch
++ * any uses of REJECT which flex missed.
++ */
++#define REJECT reject_used_but_not_detected
++#define ssmore() ssmore_used_but_not_detected
++#define YY_MORE_ADJ 0
++#define YY_RESTORE_YY_MORE_OFFSET
++#ifndef YYLMAX
++#define YYLMAX 8192
++#endif
++
++char sstext[YYLMAX];
++char *sstext_ptr;
++#line 1 "icalsslexer.l"
++#define INITIAL 0
++#line 2 "icalsslexer.l"
++/* -*- Mode: C -*-
++  ======================================================================
++  FILE: icalsslexer.l
++  CREATOR: eric 8 Aug 2000
++  
++  DESCRIPTION:
++  
++  $Id: icalsslexer.c,v 1.1 2002/10/06 03:39:42 ranger Exp $
++  $Locker:  $
++
++(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of either: 
++
++    The LGPL as published by the Free Software Foundation, version
++    2.1, available at: http://www.fsf.org/copyleft/lesser.html
++
++  Or:
++
++    The Mozilla Public License Version 1.0. You may obtain a copy of
++    the License at http://www.mozilla.org/MPL/
++
++ The Original Code is eric. The Initial Developer of the Original
++ Code is Eric Busboom
++
++  ======================================================================*/
++
++#include "icalssyacc.h"
++#include "icalgaugeimpl.h"
++#include "assert.h"
++
++#include <string.h> /* For strdup() */
++
++int icalparser_flex_input(char* buf, int max_size);
++void icalparser_clear_flex_input();
++
++#undef YY_INPUT
++#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
++
++#undef SS_FATAL_ERROR
++#define SS_FATAL_ERROR(msg) sserror(msg)
++
++
++#define sql 1
++#define string_value 2
++
++#line 465 "icalsslexer.c"
++
++/* Macros after this point can all be overridden by user definitions in
++ * section 1.
++ */
++
++#ifndef YY_SKIP_YYWRAP
++#ifdef __cplusplus
++extern "C" int sswrap YY_PROTO(( void ));
++#else
++extern int sswrap YY_PROTO(( void ));
++#endif
++#endif
++
++#ifndef YY_NO_UNPUT
++static void ssunput YY_PROTO(( int c, char *buf_ptr ));
++#endif
++
++#ifndef sstext_ptr
++static void ss_flex_strncpy YY_PROTO(( char *, ssconst char *, int ));
++#endif
++
++#ifdef YY_NEED_STRLEN
++static int ss_flex_strlen YY_PROTO(( ssconst char * ));
++#endif
++
++#ifndef YY_NO_INPUT
++#ifdef __cplusplus
++static int ssinput YY_PROTO(( void ));
++#else
++static int input YY_PROTO(( void ));
++#endif
++#endif
++
++#if YY_STACK_USED
++static int ss_start_stack_ptr = 0;
++static int ss_start_stack_depth = 0;
++static int *ss_start_stack = 0;
++#ifndef YY_NO_PUSH_STATE
++static void ss_push_state YY_PROTO(( int new_state ));
++#endif
++#ifndef YY_NO_POP_STATE
++static void ss_pop_state YY_PROTO(( void ));
++#endif
++#ifndef YY_NO_TOP_STATE
++static int ss_top_state YY_PROTO(( void ));
++#endif
++
++#else
++#define YY_NO_PUSH_STATE 1
++#define YY_NO_POP_STATE 1
++#define YY_NO_TOP_STATE 1
++#endif
++
++#ifdef YY_MALLOC_DECL
++YY_MALLOC_DECL
++#else
++#if __STDC__
++#ifndef __cplusplus
++#include <stdlib.h>
++#endif
++#else
++/* Just try to get by without declaring the routines.  This will fail
++ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
++ * or sizeof(void*) != sizeof(int).
++ */
++#endif
++#endif
++
++/* Amount of stuff to slurp up with each read. */
++#ifndef YY_READ_BUF_SIZE
++#define YY_READ_BUF_SIZE 8192
++#endif
++
++/* Copy whatever the last rule matched to the standard output. */
++
++#ifndef ECHO
++/* This used to be an fputs(), but since the string might contain NUL's,
++ * we now use fwrite().
++ */
++#define ECHO (void) fwrite( sstext, ssleng, 1, ssout )
++#endif
++
++/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
++ * is returned in "result".
++ */
++#ifndef YY_INPUT
++#define YY_INPUT(buf,result,max_size) \
++	if ( ss_current_buffer->ss_is_interactive ) \
++		{ \
++		int c = '*', n; \
++		for ( n = 0; n < max_size && \
++			     (c = getc( ssin )) != EOF && c != '\n'; ++n ) \
++			buf[n] = (char) c; \
++		if ( c == '\n' ) \
++			buf[n++] = (char) c; \
++		if ( c == EOF && ferror( ssin ) ) \
++			YY_FATAL_ERROR( "input in flex scanner failed" ); \
++		result = n; \
++		} \
++	else if ( ((result = fread( buf, 1, max_size, ssin )) == 0) \
++		  && ferror( ssin ) ) \
++		YY_FATAL_ERROR( "input in flex scanner failed" );
++#endif
++
++/* No semi-colon after return; correct usage is to write "ssterminate();" -
++ * we don't want an extra ';' after the "return" because that will cause
++ * some compilers to complain about unreachable statements.
++ */
++#ifndef ssterminate
++#define ssterminate() return YY_NULL
++#endif
++
++/* Number of entries by which start-condition stack grows. */
++#ifndef YY_START_STACK_INCR
++#define YY_START_STACK_INCR 25
++#endif
++
++/* Report a fatal error. */
++#ifndef YY_FATAL_ERROR
++#define YY_FATAL_ERROR(msg) ss_fatal_error( msg )
++#endif
++
++/* Default declaration of generated scanner - a define so the user can
++ * easily add parameters.
++ */
++#ifndef YY_DECL
++#define YY_DECL int sslex YY_PROTO(( void ))
++#endif
++
++/* Code executed at the beginning of each rule, after sstext and ssleng
++ * have been set up.
++ */
++#ifndef YY_USER_ACTION
++#define YY_USER_ACTION
++#endif
++
++/* Code executed at the end of each rule. */
++#ifndef YY_BREAK
++#define YY_BREAK break;
++#endif
++
++#define YY_RULE_SETUP \
++	YY_USER_ACTION
++
++YY_DECL
++	{
++	register ss_state_type ss_current_state;
++	register char *ss_cp, *ss_bp;
++	register int ss_act;
++
++#line 69 "icalsslexer.l"
++
++
++
++
++
++
++#line 623 "icalsslexer.c"
++
++	if ( ss_init )
++		{
++		ss_init = 0;
++
++#ifdef YY_USER_INIT
++		YY_USER_INIT;
++#endif
++
++		if ( ! ss_start )
++			ss_start = 1;	/* first start state */
++
++		if ( ! ssin )
++			ssin = stdin;
++
++		if ( ! ssout )
++			ssout = stdout;
++
++		if ( ! ss_current_buffer )
++			ss_current_buffer =
++				ss_create_buffer( ssin, YY_BUF_SIZE );
++
++		ss_load_buffer_state();
++		}
++
++	while ( 1 )		/* loops until end-of-file is reached */
++		{
++		ss_cp = ss_c_buf_p;
++
++		/* Support of sstext. */
++		*ss_cp = ss_hold_char;
++
++		/* ss_bp points to the position in ss_ch_buf of the start of
++		 * the current run.
++		 */
++		ss_bp = ss_cp;
++
++		ss_current_state = ss_start;
++ss_match:
++		do
++			{
++			register YY_CHAR ss_c = ss_ec[YY_SC_TO_UI(*ss_cp)];
++			if ( ss_accept[ss_current_state] )
++				{
++				ss_last_accepting_state = ss_current_state;
++				ss_last_accepting_cpos = ss_cp;
++				}
++			while ( ss_chk[ss_base[ss_current_state] + ss_c] != ss_current_state )
++				{
++				ss_current_state = (int) ss_def[ss_current_state];
++				if ( ss_current_state >= 47 )
++					ss_c = ss_meta[(unsigned int) ss_c];
++				}
++			ss_current_state = ss_nxt[ss_base[ss_current_state] + (unsigned int) ss_c];
++			++ss_cp;
++			}
++		while ( ss_base[ss_current_state] != 54 );
++
++ss_find_action:
++		ss_act = ss_accept[ss_current_state];
++		if ( ss_act == 0 )
++			{ /* have to back up */
++			ss_cp = ss_last_accepting_cpos;
++			ss_current_state = ss_last_accepting_state;
++			ss_act = ss_accept[ss_current_state];
++			}
++
++		YY_DO_BEFORE_ACTION;
++
++
++do_action:	/* This label is used only to access EOF actions. */
++
++
++		switch ( ss_act )
++	{ /* beginning of action switch */
++			case 0: /* must back up */
++			/* undo the effects of YY_DO_BEFORE_ACTION */
++			*ss_cp = ss_hold_char;
++			ss_cp = ss_last_accepting_cpos;
++			ss_current_state = ss_last_accepting_state;
++			goto ss_find_action;
++
++case 1:
++YY_RULE_SETUP
++#line 75 "icalsslexer.l"
++{ return SELECT; }
++	YY_BREAK
++case 2:
++YY_RULE_SETUP
++#line 76 "icalsslexer.l"
++{ return FROM; }
++	YY_BREAK
++case 3:
++YY_RULE_SETUP
++#line 77 "icalsslexer.l"
++{ return WHERE; }
++	YY_BREAK
++case 4:
++YY_RULE_SETUP
++#line 78 "icalsslexer.l"
++{ return COMMA; }
++	YY_BREAK
++case 5:
++YY_RULE_SETUP
++#line 79 "icalsslexer.l"
++{ return EQUALS; }
++	YY_BREAK
++case 6:
++YY_RULE_SETUP
++#line 80 "icalsslexer.l"
++{ return NOTEQUALS; }
++	YY_BREAK
++case 7:
++YY_RULE_SETUP
++#line 81 "icalsslexer.l"
++{ return LESS; }
++	YY_BREAK
++case 8:
++YY_RULE_SETUP
++#line 82 "icalsslexer.l"
++{ return GREATER; }
++	YY_BREAK
++case 9:
++YY_RULE_SETUP
++#line 83 "icalsslexer.l"
++{ return LESSEQUALS; }
++	YY_BREAK
++case 10:
++YY_RULE_SETUP
++#line 84 "icalsslexer.l"
++{ return GREATEREQUALS; }
++	YY_BREAK
++case 11:
++YY_RULE_SETUP
++#line 85 "icalsslexer.l"
++{ return AND; }
++	YY_BREAK
++case 12:
++YY_RULE_SETUP
++#line 86 "icalsslexer.l"
++{ return OR; }
++	YY_BREAK
++case 13:
++YY_RULE_SETUP
++#line 87 "icalsslexer.l"
++{ return QUOTE; }
++	YY_BREAK
++case 14:
++YY_RULE_SETUP
++#line 88 "icalsslexer.l"
++;			
++	YY_BREAK
++case 15:
++YY_RULE_SETUP
++#line 89 "icalsslexer.l"
++{ return EOL; }
++	YY_BREAK
++case 16:
++YY_RULE_SETUP
++#line 90 "icalsslexer.l"
++{
++	int c = input();
++	unput(c);
++	if(c!='\''){
++		sslval.v_string= icalmemory_tmp_copy(sstext);
++		return STRING;
++	} else {
++		/*ssmore();*/
++	}
++}
++	YY_BREAK
++case 17:
++YY_RULE_SETUP
++#line 101 "icalsslexer.l"
++{ sslval.v_string= icalmemory_tmp_copy(sstext);
++			  return STRING; }
++	YY_BREAK
++case 18:
++YY_RULE_SETUP
++#line 105 "icalsslexer.l"
++{ return sstext[0]; }
++	YY_BREAK
++case 19:
++YY_RULE_SETUP
++#line 107 "icalsslexer.l"
++ECHO;
++	YY_BREAK
++#line 811 "icalsslexer.c"
++case YY_STATE_EOF(INITIAL):
++case YY_STATE_EOF(sql):
++case YY_STATE_EOF(string_value):
++	ssterminate();
++
++	case YY_END_OF_BUFFER:
++		{
++		/* Amount of text matched not including the EOB char. */
++		int ss_amount_of_matched_text = (int) (ss_cp - sstext_ptr) - 1;
++
++		/* Undo the effects of YY_DO_BEFORE_ACTION. */
++		*ss_cp = ss_hold_char;
++		YY_RESTORE_YY_MORE_OFFSET
++
++		if ( ss_current_buffer->ss_buffer_status == YY_BUFFER_NEW )
++			{
++			/* We're scanning a new file or input source.  It's
++			 * possible that this happened because the user
++			 * just pointed ssin at a new source and called
++			 * sslex().  If so, then we have to assure
++			 * consistency between ss_current_buffer and our
++			 * globals.  Here is the right place to do so, because
++			 * this is the first action (other than possibly a
++			 * back-up) that will match for the new input source.
++			 */
++			ss_n_chars = ss_current_buffer->ss_n_chars;
++			ss_current_buffer->ss_input_file = ssin;
++			ss_current_buffer->ss_buffer_status = YY_BUFFER_NORMAL;
++			}
++
++		/* Note that here we test for ss_c_buf_p "<=" to the position
++		 * of the first EOB in the buffer, since ss_c_buf_p will
++		 * already have been incremented past the NUL character
++		 * (since all states make transitions on EOB to the
++		 * end-of-buffer state).  Contrast this with the test
++		 * in input().
++		 */
++		if ( ss_c_buf_p <= &ss_current_buffer->ss_ch_buf[ss_n_chars] )
++			{ /* This was really a NUL. */
++			ss_state_type ss_next_state;
++
++			ss_c_buf_p = sstext_ptr + ss_amount_of_matched_text;
++
++			ss_current_state = ss_get_previous_state();
++
++			/* Okay, we're now positioned to make the NUL
++			 * transition.  We couldn't have
++			 * ss_get_previous_state() go ahead and do it
++			 * for us because it doesn't know how to deal
++			 * with the possibility of jamming (and we don't
++			 * want to build jamming into it because then it
++			 * will run more slowly).
++			 */
++
++			ss_next_state = ss_try_NUL_trans( ss_current_state );
++
++			ss_bp = sstext_ptr + YY_MORE_ADJ;
++
++			if ( ss_next_state )
++				{
++				/* Consume the NUL. */
++				ss_cp = ++ss_c_buf_p;
++				ss_current_state = ss_next_state;
++				goto ss_match;
++				}
++
++			else
++				{
++				ss_cp = ss_c_buf_p;
++				goto ss_find_action;
++				}
++			}
++
++		else switch ( ss_get_next_buffer() )
++			{
++			case EOB_ACT_END_OF_FILE:
++				{
++				ss_did_buffer_switch_on_eof = 0;
++
++				if ( sswrap() )
++					{
++					/* Note: because we've taken care in
++					 * ss_get_next_buffer() to have set up
++					 * sstext, we can now set up
++					 * ss_c_buf_p so that if some total
++					 * hoser (like flex itself) wants to
++					 * call the scanner after we return the
++					 * YY_NULL, it'll still work - another
++					 * YY_NULL will get returned.
++					 */
++					ss_c_buf_p = sstext_ptr + YY_MORE_ADJ;
++
++					ss_act = YY_STATE_EOF(YY_START);
++					goto do_action;
++					}
++
++				else
++					{
++					if ( ! ss_did_buffer_switch_on_eof )
++						YY_NEW_FILE;
++					}
++				break;
++				}
++
++			case EOB_ACT_CONTINUE_SCAN:
++				ss_c_buf_p =
++					sstext_ptr + ss_amount_of_matched_text;
++
++				ss_current_state = ss_get_previous_state();
++
++				ss_cp = ss_c_buf_p;
++				ss_bp = sstext_ptr + YY_MORE_ADJ;
++				goto ss_match;
++
++			case EOB_ACT_LAST_MATCH:
++				ss_c_buf_p =
++				&ss_current_buffer->ss_ch_buf[ss_n_chars];
++
++				ss_current_state = ss_get_previous_state();
++
++				ss_cp = ss_c_buf_p;
++				ss_bp = sstext_ptr + YY_MORE_ADJ;
++				goto ss_find_action;
++			}
++		break;
++		}
++
++	default:
++		YY_FATAL_ERROR(
++			"fatal flex scanner internal error--no action found" );
++	} /* end of action switch */
++		} /* end of scanning one token */
++	} /* end of sslex */
++
++
++/* ss_get_next_buffer - try to read in a new buffer
++ *
++ * Returns a code representing an action:
++ *	EOB_ACT_LAST_MATCH -
++ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
++ *	EOB_ACT_END_OF_FILE - end of file
++ */
++
++static int ss_get_next_buffer()
++	{
++	register char *dest = ss_current_buffer->ss_ch_buf;
++	register char *source = sstext_ptr;
++	register int number_to_move, i;
++	int ret_val;
++
++	if ( ss_c_buf_p > &ss_current_buffer->ss_ch_buf[ss_n_chars + 1] )
++		YY_FATAL_ERROR(
++		"fatal flex scanner internal error--end of buffer missed" );
++
++	if ( ss_current_buffer->ss_fill_buffer == 0 )
++		{ /* Don't try to fill the buffer, so this is an EOF. */
++		if ( ss_c_buf_p - sstext_ptr - YY_MORE_ADJ == 1 )
++			{
++			/* We matched a single character, the EOB, so
++			 * treat this as a final EOF.
++			 */
++			return EOB_ACT_END_OF_FILE;
++			}
++
++		else
++			{
++			/* We matched some text prior to the EOB, first
++			 * process it.
++			 */
++			return EOB_ACT_LAST_MATCH;
++			}
++		}
++
++	/* Try to read more data. */
++
++	/* First move last chars to start of buffer. */
++	number_to_move = (int) (ss_c_buf_p - sstext_ptr) - 1;
++
++	for ( i = 0; i < number_to_move; ++i )
++		*(dest++) = *(source++);
++
++	if ( ss_current_buffer->ss_buffer_status == YY_BUFFER_EOF_PENDING )
++		/* don't do the read, it's not guaranteed to return an EOF,
++		 * just force an EOF
++		 */
++		ss_current_buffer->ss_n_chars = ss_n_chars = 0;
++
++	else
++		{
++		int num_to_read =
++			ss_current_buffer->ss_buf_size - number_to_move - 1;
++
++		while ( num_to_read <= 0 )
++			{ /* Not enough room in the buffer - grow it. */
++#ifdef YY_USES_REJECT
++			YY_FATAL_ERROR(
++"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
++#else
++
++			/* just a shorter name for the current buffer */
++			YY_BUFFER_STATE b = ss_current_buffer;
++
++			int ss_c_buf_p_offset =
++				(int) (ss_c_buf_p - b->ss_ch_buf);
++
++			if ( b->ss_is_our_buffer )
++				{
++				int new_size = b->ss_buf_size * 2;
++
++				if ( new_size <= 0 )
++					b->ss_buf_size += b->ss_buf_size / 8;
++				else
++					b->ss_buf_size *= 2;
++
++				b->ss_ch_buf = (char *)
++					/* Include room in for 2 EOB chars. */
++					ss_flex_realloc( (void *) b->ss_ch_buf,
++							 b->ss_buf_size + 2 );
++				}
++			else
++				/* Can't grow it, we don't own it. */
++				b->ss_ch_buf = 0;
++
++			if ( ! b->ss_ch_buf )
++				YY_FATAL_ERROR(
++				"fatal error - scanner input buffer overflow" );
++
++			ss_c_buf_p = &b->ss_ch_buf[ss_c_buf_p_offset];
++
++			num_to_read = ss_current_buffer->ss_buf_size -
++						number_to_move - 1;
++#endif
++			}
++
++		if ( num_to_read > YY_READ_BUF_SIZE )
++			num_to_read = YY_READ_BUF_SIZE;
++
++		/* Read in more data. */
++		YY_INPUT( (&ss_current_buffer->ss_ch_buf[number_to_move]),
++			ss_n_chars, num_to_read );
++
++		ss_current_buffer->ss_n_chars = ss_n_chars;
++		}
++
++	if ( ss_n_chars == 0 )
++		{
++		if ( number_to_move == YY_MORE_ADJ )
++			{
++			ret_val = EOB_ACT_END_OF_FILE;
++			ssrestart( ssin );
++			}
++
++		else
++			{
++			ret_val = EOB_ACT_LAST_MATCH;
++			ss_current_buffer->ss_buffer_status =
++				YY_BUFFER_EOF_PENDING;
++			}
++		}
++
++	else
++		ret_val = EOB_ACT_CONTINUE_SCAN;
++
++	ss_n_chars += number_to_move;
++	ss_current_buffer->ss_ch_buf[ss_n_chars] = YY_END_OF_BUFFER_CHAR;
++	ss_current_buffer->ss_ch_buf[ss_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
++
++	sstext_ptr = &ss_current_buffer->ss_ch_buf[0];
++
++	return ret_val;
++	}
++
++
++/* ss_get_previous_state - get the state just before the EOB char was reached */
++
++static ss_state_type ss_get_previous_state()
++	{
++	register ss_state_type ss_current_state;
++	register char *ss_cp;
++
++	ss_current_state = ss_start;
++
++	for ( ss_cp = sstext_ptr + YY_MORE_ADJ; ss_cp < ss_c_buf_p; ++ss_cp )
++		{
++		register YY_CHAR ss_c = (*ss_cp ? ss_ec[YY_SC_TO_UI(*ss_cp)] : 1);
++		if ( ss_accept[ss_current_state] )
++			{
++			ss_last_accepting_state = ss_current_state;
++			ss_last_accepting_cpos = ss_cp;
++			}
++		while ( ss_chk[ss_base[ss_current_state] + ss_c] != ss_current_state )
++			{
++			ss_current_state = (int) ss_def[ss_current_state];
++			if ( ss_current_state >= 47 )
++				ss_c = ss_meta[(unsigned int) ss_c];
++			}
++		ss_current_state = ss_nxt[ss_base[ss_current_state] + (unsigned int) ss_c];
++		}
++
++	return ss_current_state;
++	}
++
++
++/* ss_try_NUL_trans - try to make a transition on the NUL character
++ *
++ * synopsis
++ *	next_state = ss_try_NUL_trans( current_state );
++ */
++
++#ifdef YY_USE_PROTOS
++static ss_state_type ss_try_NUL_trans( ss_state_type ss_current_state )
++#else
++static ss_state_type ss_try_NUL_trans( ss_current_state )
++ss_state_type ss_current_state;
++#endif
++	{
++	register int ss_is_jam;
++	register char *ss_cp = ss_c_buf_p;
++
++	register YY_CHAR ss_c = 1;
++	if ( ss_accept[ss_current_state] )
++		{
++		ss_last_accepting_state = ss_current_state;
++		ss_last_accepting_cpos = ss_cp;
++		}
++	while ( ss_chk[ss_base[ss_current_state] + ss_c] != ss_current_state )
++		{
++		ss_current_state = (int) ss_def[ss_current_state];
++		if ( ss_current_state >= 47 )
++			ss_c = ss_meta[(unsigned int) ss_c];
++		}
++	ss_current_state = ss_nxt[ss_base[ss_current_state] + (unsigned int) ss_c];
++	ss_is_jam = (ss_current_state == 46);
++
++	return ss_is_jam ? 0 : ss_current_state;
++	}
++
++
++#ifndef YY_NO_UNPUT
++#ifdef YY_USE_PROTOS
++static void ssunput( int c, register char *ss_bp )
++#else
++static void ssunput( c, ss_bp )
++int c;
++register char *ss_bp;
++#endif
++	{
++	register char *ss_cp = ss_c_buf_p;
++
++	/* undo effects of setting up sstext */
++	*ss_cp = ss_hold_char;
++
++	if ( ss_cp < ss_current_buffer->ss_ch_buf + 2 )
++		{ /* need to shift things up to make room */
++		/* +2 for EOB chars. */
++		register int number_to_move = ss_n_chars + 2;
++		register char *dest = &ss_current_buffer->ss_ch_buf[
++					ss_current_buffer->ss_buf_size + 2];
++		register char *source =
++				&ss_current_buffer->ss_ch_buf[number_to_move];
++
++		while ( source > ss_current_buffer->ss_ch_buf )
++			*--dest = *--source;
++
++		ss_cp += (int) (dest - source);
++		ss_bp += (int) (dest - source);
++		ss_current_buffer->ss_n_chars =
++			ss_n_chars = ss_current_buffer->ss_buf_size;
++
++		if ( ss_cp < ss_current_buffer->ss_ch_buf + 2 )
++			YY_FATAL_ERROR( "flex scanner push-back overflow" );
++		}
++
++	*--ss_cp = (char) c;
++
++
++	sstext_ptr = ss_bp;
++	ss_hold_char = *ss_cp;
++	ss_c_buf_p = ss_cp;
++	}
++#endif	/* ifndef YY_NO_UNPUT */
++
++
++#ifdef __cplusplus
++static int ssinput()
++#else
++static int input()
++#endif
++	{
++	int c;
++
++	*ss_c_buf_p = ss_hold_char;
++
++	if ( *ss_c_buf_p == YY_END_OF_BUFFER_CHAR )
++		{
++		/* ss_c_buf_p now points to the character we want to return.
++		 * If this occurs *before* the EOB characters, then it's a
++		 * valid NUL; if not, then we've hit the end of the buffer.
++		 */
++		if ( ss_c_buf_p < &ss_current_buffer->ss_ch_buf[ss_n_chars] )
++			/* This was really a NUL. */
++			*ss_c_buf_p = '\0';
++
++		else
++			{ /* need more input */
++			int offset = ss_c_buf_p - sstext_ptr;
++			++ss_c_buf_p;
++
++			switch ( ss_get_next_buffer() )
++				{
++				case EOB_ACT_LAST_MATCH:
++					/* This happens because ss_g_n_b()
++					 * sees that we've accumulated a
++					 * token and flags that we need to
++					 * try matching the token before
++					 * proceeding.  But for input(),
++					 * there's no matching to consider.
++					 * So convert the EOB_ACT_LAST_MATCH
++					 * to EOB_ACT_END_OF_FILE.
++					 */
++
++					/* Reset buffer status. */
++					ssrestart( ssin );
++
++					/* fall through */
++
++				case EOB_ACT_END_OF_FILE:
++					{
++					if ( sswrap() )
++						return EOF;
++
++					if ( ! ss_did_buffer_switch_on_eof )
++						YY_NEW_FILE;
++#ifdef __cplusplus
++					return ssinput();
++#else
++					return input();
++#endif
++					}
++
++				case EOB_ACT_CONTINUE_SCAN:
++					ss_c_buf_p = sstext_ptr + offset;
++					break;
++				}
++			}
++		}
++
++	c = *(unsigned char *) ss_c_buf_p;	/* cast for 8-bit char's */
++	*ss_c_buf_p = '\0';	/* preserve sstext */
++	ss_hold_char = *++ss_c_buf_p;
++
++
++	return c;
++	}
++
++
++#ifdef YY_USE_PROTOS
++void ssrestart( FILE *input_file )
++#else
++void ssrestart( input_file )
++FILE *input_file;
++#endif
++	{
++	if ( ! ss_current_buffer )
++		ss_current_buffer = ss_create_buffer( ssin, YY_BUF_SIZE );
++
++	ss_init_buffer( ss_current_buffer, input_file );
++	ss_load_buffer_state();
++	}
++
++
++#ifdef YY_USE_PROTOS
++void ss_switch_to_buffer( YY_BUFFER_STATE new_buffer )
++#else
++void ss_switch_to_buffer( new_buffer )
++YY_BUFFER_STATE new_buffer;
++#endif
++	{
++	if ( ss_current_buffer == new_buffer )
++		return;
++
++	if ( ss_current_buffer )
++		{
++		/* Flush out information for old buffer. */
++		*ss_c_buf_p = ss_hold_char;
++		ss_current_buffer->ss_buf_pos = ss_c_buf_p;
++		ss_current_buffer->ss_n_chars = ss_n_chars;
++		}
++
++	ss_current_buffer = new_buffer;
++	ss_load_buffer_state();
++
++	/* We don't actually know whether we did this switch during
++	 * EOF (sswrap()) processing, but the only time this flag
++	 * is looked at is after sswrap() is called, so it's safe
++	 * to go ahead and always set it.
++	 */
++	ss_did_buffer_switch_on_eof = 1;
++	}
++
++
++#ifdef YY_USE_PROTOS
++void ss_load_buffer_state( void )
++#else
++void ss_load_buffer_state()
++#endif
++	{
++	ss_n_chars = ss_current_buffer->ss_n_chars;
++	sstext_ptr = ss_c_buf_p = ss_current_buffer->ss_buf_pos;
++	ssin = ss_current_buffer->ss_input_file;
++	ss_hold_char = *ss_c_buf_p;
++	}
++
++
++#ifdef YY_USE_PROTOS
++YY_BUFFER_STATE ss_create_buffer( FILE *file, int size )
++#else
++YY_BUFFER_STATE ss_create_buffer( file, size )
++FILE *file;
++int size;
++#endif
++	{
++	YY_BUFFER_STATE b;
++
++	b = (YY_BUFFER_STATE) ss_flex_alloc( sizeof( struct ss_buffer_state ) );
++	if ( ! b )
++		YY_FATAL_ERROR( "out of dynamic memory in ss_create_buffer()" );
++
++	b->ss_buf_size = size;
++
++	/* ss_ch_buf has to be 2 characters longer than the size given because
++	 * we need to put in 2 end-of-buffer characters.
++	 */
++	b->ss_ch_buf = (char *) ss_flex_alloc( b->ss_buf_size + 2 );
++	if ( ! b->ss_ch_buf )
++		YY_FATAL_ERROR( "out of dynamic memory in ss_create_buffer()" );
++
++	b->ss_is_our_buffer = 1;
++
++	ss_init_buffer( b, file );
++
++	return b;
++	}
++
++
++#ifdef YY_USE_PROTOS
++void ss_delete_buffer( YY_BUFFER_STATE b )
++#else
++void ss_delete_buffer( b )
++YY_BUFFER_STATE b;
++#endif
++	{
++	if ( ! b )
++		return;
++
++	if ( b == ss_current_buffer )
++		ss_current_buffer = (YY_BUFFER_STATE) 0;
++
++	if ( b->ss_is_our_buffer )
++		ss_flex_free( (void *) b->ss_ch_buf );
++
++	ss_flex_free( (void *) b );
++	}
++
++
++#ifndef YY_ALWAYS_INTERACTIVE
++#ifndef YY_NEVER_INTERACTIVE
++extern int isatty YY_PROTO(( int ));
++#endif
++#endif
++
++#ifdef YY_USE_PROTOS
++void ss_init_buffer( YY_BUFFER_STATE b, FILE *file )
++#else
++void ss_init_buffer( b, file )
++YY_BUFFER_STATE b;
++FILE *file;
++#endif
++
++
++	{
++	ss_flush_buffer( b );
++
++	b->ss_input_file = file;
++	b->ss_fill_buffer = 1;
++
++#if YY_ALWAYS_INTERACTIVE
++	b->ss_is_interactive = 1;
++#else
++#if YY_NEVER_INTERACTIVE
++	b->ss_is_interactive = 0;
++#else
++	b->ss_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
++#endif
++#endif
++	}
++
++
++#ifdef YY_USE_PROTOS
++void ss_flush_buffer( YY_BUFFER_STATE b )
++#else
++void ss_flush_buffer( b )
++YY_BUFFER_STATE b;
++#endif
++
++	{
++	if ( ! b )
++		return;
++
++	b->ss_n_chars = 0;
++
++	/* We always need two end-of-buffer characters.  The first causes
++	 * a transition to the end-of-buffer state.  The second causes
++	 * a jam in that state.
++	 */
++	b->ss_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
++	b->ss_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
++
++	b->ss_buf_pos = &b->ss_ch_buf[0];
++
++	b->ss_at_bol = 1;
++	b->ss_buffer_status = YY_BUFFER_NEW;
++
++	if ( b == ss_current_buffer )
++		ss_load_buffer_state();
++	}
++
++
++#ifndef YY_NO_SCAN_BUFFER
++#ifdef YY_USE_PROTOS
++YY_BUFFER_STATE ss_scan_buffer( char *base, ss_size_t size )
++#else
++YY_BUFFER_STATE ss_scan_buffer( base, size )
++char *base;
++ss_size_t size;
++#endif
++	{
++	YY_BUFFER_STATE b;
++
++	if ( size < 2 ||
++	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
++	     base[size-1] != YY_END_OF_BUFFER_CHAR )
++		/* They forgot to leave room for the EOB's. */
++		return 0;
++
++	b = (YY_BUFFER_STATE) ss_flex_alloc( sizeof( struct ss_buffer_state ) );
++	if ( ! b )
++		YY_FATAL_ERROR( "out of dynamic memory in ss_scan_buffer()" );
++
++	b->ss_buf_size = size - 2;	/* "- 2" to take care of EOB's */
++	b->ss_buf_pos = b->ss_ch_buf = base;
++	b->ss_is_our_buffer = 0;
++	b->ss_input_file = 0;
++	b->ss_n_chars = b->ss_buf_size;
++	b->ss_is_interactive = 0;
++	b->ss_at_bol = 1;
++	b->ss_fill_buffer = 0;
++	b->ss_buffer_status = YY_BUFFER_NEW;
++
++	ss_switch_to_buffer( b );
++
++	return b;
++	}
++#endif
++
++
++#ifndef YY_NO_SCAN_STRING
++#ifdef YY_USE_PROTOS
++YY_BUFFER_STATE ss_scan_string( ssconst char *ss_str )
++#else
++YY_BUFFER_STATE ss_scan_string( ss_str )
++ssconst char *ss_str;
++#endif
++	{
++	int len;
++	for ( len = 0; ss_str[len]; ++len )
++		;
++
++	return ss_scan_bytes( ss_str, len );
++	}
++#endif
++
++
++#ifndef YY_NO_SCAN_BYTES
++#ifdef YY_USE_PROTOS
++YY_BUFFER_STATE ss_scan_bytes( ssconst char *bytes, int len )
++#else
++YY_BUFFER_STATE ss_scan_bytes( bytes, len )
++ssconst char *bytes;
++int len;
++#endif
++	{
++	YY_BUFFER_STATE b;
++	char *buf;
++	ss_size_t n;
++	int i;
++
++	/* Get memory for full buffer, including space for trailing EOB's. */
++	n = len + 2;
++	buf = (char *) ss_flex_alloc( n );
++	if ( ! buf )
++		YY_FATAL_ERROR( "out of dynamic memory in ss_scan_bytes()" );
++
++	for ( i = 0; i < len; ++i )
++		buf[i] = bytes[i];
++
++	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
++
++	b = ss_scan_buffer( buf, n );
++	if ( ! b )
++		YY_FATAL_ERROR( "bad buffer in ss_scan_bytes()" );
++
++	/* It's okay to grow etc. this buffer, and we should throw it
++	 * away when we're done.
++	 */
++	b->ss_is_our_buffer = 1;
++
++	return b;
++	}
++#endif
++
++
++#ifndef YY_NO_PUSH_STATE
++#ifdef YY_USE_PROTOS
++static void ss_push_state( int new_state )
++#else
++static void ss_push_state( new_state )
++int new_state;
++#endif
++	{
++	if ( ss_start_stack_ptr >= ss_start_stack_depth )
++		{
++		ss_size_t new_size;
++
++		ss_start_stack_depth += YY_START_STACK_INCR;
++		new_size = ss_start_stack_depth * sizeof( int );
++
++		if ( ! ss_start_stack )
++			ss_start_stack = (int *) ss_flex_alloc( new_size );
++
++		else
++			ss_start_stack = (int *) ss_flex_realloc(
++					(void *) ss_start_stack, new_size );
++
++		if ( ! ss_start_stack )
++			YY_FATAL_ERROR(
++			"out of memory expanding start-condition stack" );
++		}
++
++	ss_start_stack[ss_start_stack_ptr++] = YY_START;
++
++	BEGIN(new_state);
++	}
++#endif
++
++
++#ifndef YY_NO_POP_STATE
++static void ss_pop_state()
++	{
++	if ( --ss_start_stack_ptr < 0 )
++		YY_FATAL_ERROR( "start-condition stack underflow" );
++
++	BEGIN(ss_start_stack[ss_start_stack_ptr]);
++	}
++#endif
++
++
++#ifndef YY_NO_TOP_STATE
++static int ss_top_state()
++	{
++	return ss_start_stack[ss_start_stack_ptr - 1];
++	}
++#endif
++
++#ifndef YY_EXIT_FAILURE
++#define YY_EXIT_FAILURE 2
++#endif
++
++#ifdef YY_USE_PROTOS
++static void ss_fatal_error( ssconst char msg[] )
++#else
++static void ss_fatal_error( msg )
++char msg[];
++#endif
++	{
++	(void) fprintf( stderr, "%s\n", msg );
++	exit( YY_EXIT_FAILURE );
++	}
++
++
++
++/* Redefine ssless() so it works in section 3 code. */
++
++#undef ssless
++#define ssless(n) \
++	do \
++		{ \
++		/* Undo effects of setting up sstext. */ \
++		sstext[ssleng] = ss_hold_char; \
++		ss_c_buf_p = sstext + n; \
++		ss_hold_char = *ss_c_buf_p; \
++		*ss_c_buf_p = '\0'; \
++		ssleng = n; \
++		} \
++	while ( 0 )
++
++
++/* Internal utility routines. */
++
++#ifndef sstext_ptr
++#ifdef YY_USE_PROTOS
++static void ss_flex_strncpy( char *s1, ssconst char *s2, int n )
++#else
++static void ss_flex_strncpy( s1, s2, n )
++char *s1;
++ssconst char *s2;
++int n;
++#endif
++	{
++	register int i;
++	for ( i = 0; i < n; ++i )
++		s1[i] = s2[i];
++	}
++#endif
++
++#ifdef YY_NEED_STRLEN
++#ifdef YY_USE_PROTOS
++static int ss_flex_strlen( ssconst char *s )
++#else
++static int ss_flex_strlen( s )
++ssconst char *s;
++#endif
++	{
++	register int n;
++	for ( n = 0; s[n]; ++n )
++		;
++
++	return n;
++	}
++#endif
++
++
++#ifdef YY_USE_PROTOS
++static void *ss_flex_alloc( ss_size_t size )
++#else
++static void *ss_flex_alloc( size )
++ss_size_t size;
++#endif
++	{
++	return (void *) malloc( size );
++	}
++
++#ifdef YY_USE_PROTOS
++static void *ss_flex_realloc( void *ptr, ss_size_t size )
++#else
++static void *ss_flex_realloc( ptr, size )
++void *ptr;
++ss_size_t size;
++#endif
++	{
++	/* The cast to (char *) in the following accommodates both
++	 * implementations that use char* generic pointers, and those
++	 * that use void* generic pointers.  It works with the latter
++	 * because both ANSI C and C++ allow castless assignment from
++	 * any pointer type to void*, and deal with argument conversions
++	 * as though doing an assignment.
++	 */
++	return (void *) realloc( (char *) ptr, size );
++	}
++
++#ifdef YY_USE_PROTOS
++static void ss_flex_free( void *ptr )
++#else
++static void ss_flex_free( ptr )
++void *ptr;
++#endif
++	{
++	free( ptr );
++	}
++
++#if YY_MAIN
++int main()
++	{
++	sslex();
++	return 0;
++	}
++#endif
++#line 107 "icalsslexer.l"
++
++
++int sswrap()
++{
++     return 1;
++}
++
+--- libkcal/Makefile.am	29 Oct 2002 18:09:14 -0000	1.1.1.4
++++ libkcal/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -5,7 +5,7 @@
+   -I$(top_builddir)/libical/src/libicalss -I$(srcdir)/versit $(all_includes)
+ 
+ lib_LTLIBRARIES   = libkcal.la
+-libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 -module
++libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0
+ libkcal_la_LIBADD  = $(LIB_QT) versit/libversit.la $(LIB_KFILE) \
+                      $(top_builddir)/libical/src/libical/libical.la \
+                      $(top_builddir)/libical/src/libicalss/libicalss.la
+--- libkcal/versit/vcc.c	25 Jun 2002 03:18:24 -0000	1.1.1.1
++++ libkcal/versit/vcc.c	6 Oct 2002 04:36:30 -0000	1.2
+@@ -125,7 +125,7 @@
+ #endif
+ 
+ #include <string.h>
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__APPLE__)
+ #include <malloc.h>
+ #endif
+ #include <stdio.h>
+--- libkdepim/Makefile.am	29 Oct 2002 18:09:16 -0000	1.1.1.4
++++ libkdepim/Makefile.am	29 Nov 2002 19:01:22 -0000	1.2
+@@ -9,7 +9,7 @@
+   categoryeditdialog_base.ui categoryeditdialog.cpp \
+   kdateedit.cpp kimportdialog.cpp kvcarddrag.cpp
+ 
+-libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module
++libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
+ libkdepim_la_LIBADD  = $(top_builddir)/libkdepim/resources/libkpimresources.la $(LIB_KIO) 
+ 
+ METASOURCES = AUTO
+--- libkpimexchange/Makefile.am	29 Oct 2002 18:09:16 -0000	1.1.1.3
++++ libkpimexchange/Makefile.am	1 Dec 2002 17:02:08 -0000	1.2
+@@ -9,7 +9,7 @@
+ lib_LTLIBRARIES = libkpimexchange.la
+ 
+ libkpimexchange_la_SOURCES = dummy.cpp
+-libkpimexchange_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module
++libkpimexchange_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
+ libkpimexchange_la_LIBADD = core/libkpimexchangecore.la calendar/libkpimexchangecalendar.la \
+ 			    $(LIB_KIO) $(top_builddir)/libkcal/libkcal.la 
+ 
Index: trunk/dports/x11/kdesdk3/Portfile
===================================================================
--- trunk/dports/x11/kdesdk3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdesdk3/Portfile	(revision 1900)
@@ -0,0 +1,41 @@
+PortSystem 1.0
+name		kdesdk3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	tools for developing with KDE
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdesdk-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 lib:libpng.3:libpng \
+		lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdesdk-${version}.tar.bz2 md5 8c4e22ce1dd2be8464d31800cb0b347b \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdesdk3/files/patch-kdesdk3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdesdk3/files/patch-kdesdk3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdesdk3/files/patch-kdesdk3-3.1.darwin	(revision 1900)
@@ -0,0 +1,849 @@
+
+--- kdesdk.lsm	15 Jan 2003 05:46:16 -0000	1.1.1.8
++++ kdesdk.lsm	16 Jan 2003 21:08:49 -0000	1.2
+@@ -1,7 +1,7 @@
+ Begin4
+ Title:          kdesdk
+ Version:        3.1.0
+-Entered-date:   2003-01-13
++Entered-date:   2002-11-25
+ Description:    K Desktop Environment (KDE) SDK
+ Keywords:       KDE X11 desktop Qt 
+ Author:         submit@bugs.kde.org (KDE Bugtracking System)
+--- cervisia/Makefile.am	5 Nov 2002 03:00:09 -0000	1.1.1.3
++++ cervisia/Makefile.am	1 Dec 2002 17:02:08 -0000	1.3
+@@ -4,9 +4,9 @@
+ AM_CPPFLAGS = -UQT_NO_COMPAT -D_BSD_SOURCE
+ 
+ bin_PROGRAMS = cervisia
+-lib_LTLIBRARIES = libcervisia.la
++lib_LTLIBRARIES = libcervisiapart_shared.la cervisiapart.la cervisia.la
+ 
+-libcervisia_la_SOURCES = updateview.cpp protocolview.cpp watchdlg.cpp \
++libcervisiapart_shared_la_SOURCES = cervisiashell.cpp updateview.cpp protocolview.cpp watchdlg.cpp \
+ 		   settingsdlg.cpp changelogdlg.cpp historydlg.cpp repositorydlg.cpp \
+ 		   commitdlg.cpp checkoutdlg.cpp updatedlg.cpp \
+ 		   tagdlg.cpp mergedlg.cpp \
+@@ -14,12 +14,26 @@
+ 		   annotatedlg.cpp annotateview.cpp \
+ 		   cvsprogressdlg.cpp tiplabel.cpp listview.cpp \
+ 		   cvsdir.cpp repositories.cpp misc.cpp cervisiapart.cpp qttableview.cpp
+-libcervisia_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module -no-undefined
+-libcervisia_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
++libcervisiapart_shared_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
++libcervisiapart_shared_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+-cervisia_SOURCES = main.cpp cervisiashell.cpp
++cervisiapart_la_SOURCES = cervisiapart_la_dummy.cpp
++cervisiapart_la_LDFLAGS = $(all_libraries) -avoid-version -module
++cervisiapart_la_LIBADD  = libcervisiapart_shared.la
++
++cervisiapart_la_dummy.cpp:
++	echo > cervisiapart_la_dummy.cpp
++
++cervisia_la_SOURCES = cervisia_la_main.cpp
++cervisia_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++cervisia_la_LIBADD  = libcervisiapart_shared.la
++
++cervisia_la_main.cpp: main.cpp
++	cat main.cpp > cervisia_la_main.cpp
++
++cervisia_SOURCES = main.cpp
+ cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-cervisia_LDADD = libcervisia.la
++cervisia_LDADD = libcervisiapart_shared.la
+ 
+ man_MANS = cervisia.1
+ 
+RCS file: cervisia/strptime.c
+diff -N cervisia/strptime.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ cervisia/strptime.c	17 Jul 2002 14:13:50 -0000	1.1
+@@ -0,0 +1,365 @@
++/*
++ * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer
++ *    in the documentation and/or other materials provided with the
++ *    distribution.
++ * 3. All advertising materials mentioning features or use of this
++ *    software must display the following acknowledgement:
++ *	This product includes software developed by Powerdog Industries.
++ * 4. The name of Powerdog Industries may not be used to endorse or
++ *    promote products derived from this software without specific prior
++ *    written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE POWERDOG INDUSTRIES BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#ifndef HAVE_STRPTIME
++
++#include <time.h>
++#include <ctype.h>
++#include <locale.h>
++#include <string.h>
++
++#define asizeof(a)	(sizeof (a) / sizeof ((a)[0]))
++
++struct dtconv {
++    char	*abbrev_month_names[12];
++    char	*month_names[12];
++    char	*abbrev_weekday_names[7];
++    char	*weekday_names[7];
++    char	*time_format;
++    char	*sdate_format;
++    char	*dtime_format;
++    char	*am_string;
++    char	*pm_string;
++    char	*ldate_format;
++};
++
++static struct dtconv	En_US = {
++    { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
++      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" },
++    { "January", "February", "March", "April",
++      "May", "June", "July", "August",
++      "September", "October", "November", "December" },
++    { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" },
++    { "Sunday", "Monday", "Tuesday", "Wednesday",
++      "Thursday", "Friday", "Saturday" },
++    "%H:%M:%S",
++    "%m/%d/%y",
++    "%a %b %e %T %Z %Y",
++    "AM",
++    "PM",
++    "%A, %B, %e, %Y"
++};
++
++#if defined(__APPLE__)
++__private_extern__
++#endif
++char	*
++strptime(char *buf, char *fmt, struct tm *tm)
++{
++    char c, *ptr;
++    int	i, len = 0;
++
++    ptr = fmt;
++    while (*ptr != 0)
++    {
++	if (*buf == 0)
++	    break;
++
++	c = *ptr++;
++
++	if (c != '%')
++	{
++	    if (isspace(c))
++		while (*buf != 0 && isspace(*buf))
++		    buf++;
++	    else if (c != *buf++)
++		return 0;
++	    continue;
++	}
++
++	c = *ptr++;
++	switch (c)
++	{
++	    case 0:
++	    case '%':
++		if (*buf++ != '%')
++		    return 0;
++		break;
++
++	    case 'C':
++		buf = strptime(buf, En_US.ldate_format, tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'c':
++		buf = strptime(buf, "%x %X", tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'D':
++		buf = strptime(buf, "%m/%d/%y", tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'R':
++		buf = strptime(buf, "%H:%M", tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'r':
++		buf = strptime(buf, "%I:%M:%S %p", tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'T':
++		buf = strptime(buf, "%H:%M:%S", tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'X':
++		buf = strptime(buf, En_US.time_format, tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'x':
++		buf = strptime(buf, En_US.sdate_format, tm);
++		if (buf == 0)
++		    return 0;
++		break;
++
++	    case 'j':
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (i > 365)
++		    return 0;
++
++		tm->tm_yday = i;
++		break;
++
++	    case 'M':
++	    case 'S':
++		if (*buf == 0 || isspace(*buf))
++		    break;
++
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (i > 59)
++		    return 0;
++
++		if (c == 'M')
++		    tm->tm_min = i;
++		else
++		    tm->tm_sec = i;
++
++		if (*buf != 0 && isspace(*buf))
++		    while (*ptr != 0 && !isspace(*ptr))
++			ptr++;
++		break;
++
++	    case 'H':
++	    case 'I':
++	    case 'k':
++	    case 'l':
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (c == 'H' || c == 'k') {
++		    if (i > 23)
++			return 0;
++		} else if (i > 11)
++		    return 0;
++
++		tm->tm_hour = i;
++
++		if (*buf != 0 && isspace(*buf))
++		    while (*ptr != 0 && !isspace(*ptr))
++			ptr++;
++		break;
++
++	    case 'p':
++		len = strlen(En_US.am_string);
++		if (strncasecmp(buf, En_US.am_string, len) == 0)
++		{
++		    if (tm->tm_hour > 12)
++			return 0;
++		    if (tm->tm_hour == 12)
++			tm->tm_hour = 0;
++		    buf += len;
++		    break;
++		}
++
++		len = strlen(En_US.pm_string);
++		if (strncasecmp(buf, En_US.pm_string, len) == 0)
++		{
++		    if (tm->tm_hour > 12)
++			return 0;
++		    if (tm->tm_hour != 12)
++			tm->tm_hour += 12;
++		    buf += len;
++		    break;
++		}
++
++		return 0;
++
++	    case 'A':
++	    case 'a':
++		for (i = 0; i < asizeof(En_US.weekday_names); i++)
++		{
++		    len = strlen(En_US.weekday_names[i]);
++		    if (strncasecmp(buf,
++				      En_US.weekday_names[i],
++				      len) == 0)
++			break;
++
++		    len = strlen(En_US.abbrev_weekday_names[i]);
++		    if (strncasecmp(buf,
++				      En_US.abbrev_weekday_names[i],
++				      len) == 0)
++			break;
++		}
++		if (i == asizeof(En_US.weekday_names))
++		    return 0;
++
++		tm->tm_wday = i;
++		buf += len;
++		break;
++
++	    case 'd':
++	    case 'e':
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (i > 31)
++		    return 0;
++
++		tm->tm_mday = i;
++
++		if (*buf != 0 && isspace(*buf))
++		    while (*ptr != 0 && !isspace(*ptr))
++			ptr++;
++		break;
++
++	    case 'B':
++	    case 'b':
++	    case 'h':
++		for (i = 0; i < asizeof(En_US.month_names); i++)
++		{
++		    len = strlen(En_US.month_names[i]);
++		    if (strncasecmp(buf,
++				      En_US.month_names[i],
++				      len) == 0)
++			break;
++
++		    len = strlen(En_US.abbrev_month_names[i]);
++		    if (strncasecmp(buf,
++				      En_US.abbrev_month_names[i],
++				      len) == 0)
++			break;
++		}
++		if (i == asizeof(En_US.month_names))
++		    return 0;
++
++		tm->tm_mon = i;
++		buf += len;
++		break;
++
++	    case 'm':
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (i < 1 || i > 12)
++		    return 0;
++
++		tm->tm_mon = i - 1;
++
++		if (*buf != 0 && isspace(*buf))
++		    while (*ptr != 0 && !isspace(*ptr))
++			ptr++;
++		break;
++
++	    case 'Y':
++	    case 'y':
++		if (*buf == 0 || isspace(*buf))
++		    break;
++
++		if (!isdigit(*buf))
++		    return 0;
++
++		for (i = 0; *buf != 0 && isdigit(*buf); buf++)
++		{
++		    i *= 10;
++		    i += *buf - '0';
++		}
++		if (c == 'y' && i < 69)	/* Unix Epoch pivot year */
++		    i += 100;
++		if (c == 'Y')
++		    i -= 1900;
++		if (i < 0)
++		    return 0;
++
++		tm->tm_year = i;
++
++		if (*buf != 0 && isspace(*buf))
++		    while (*ptr != 0 && !isspace(*ptr))
++			ptr++;
++		break;
++	}
++    }
++
++    return buf;
++}
++
++#endif /* !HAVE_STRPTIME */
+--- cervisia/updateview.cpp	3 Oct 2002 01:05:39 -0000	1.1.1.4
++++ cervisia/updateview.cpp	3 Oct 2002 01:12:03 -0000	1.7
+@@ -34,6 +34,11 @@
+ #include "misc.h"
+ #include "cvsdir.h"
+ 
++#if defined(__APPLE__) && __GNUC__ < 3
++extern "C" {
++#include "strptime.c"
++}
++#endif
+ #include "cervisiapart.h"
+ 
+ class UpdateDirItem : public ListViewItem
+@@ -313,7 +318,7 @@
+ 	    time_t time;
+ 
+ 	    oldLocale = setlocale(LC_TIME, "C");
+-	    strptime(timestamp.local8Bit(), "%c" , &tmp);
++	    strptime(timestamp.latin1(), "%c" , &tmp);
+ 	    setlocale(LC_TIME, oldLocale);
+ 	    time = mktime(&tmp);
+ 	    updateEntriesItem(name, status, isdir, isbin, rev, tagdate, time);
+--- debian/control	15 Jan 2003 05:46:45 -0000	1.1.1.9
++++ debian/control	16 Jan 2003 21:08:49 -0000	1.2
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Ben Burton <bab@debian.org>
+ Build-Depends: automake1.7, binutils-dev, bison, debhelper (>> 4.0.0), flex, g++-3.2, libdb2-dev, kdelibs4-dev
+-Standards-Version: 3.5.8.0
++Standards-Version: 3.5.7.0
+ 
+ Package: kdesdk
+ Architecture: any
+--- debian/kompare.install	15 Jan 2003 05:46:46 -0000	1.1.1.4
++++ debian/kompare.install	16 Jan 2003 21:08:49 -0000	1.2
+@@ -1,4 +1,5 @@
+ usr/bin/kompare
++usr/lib/kde3/libdiff2.*
+ usr/lib/kde3/libkompare*
+ usr/share/applnk/Development/kompare.desktop
+ usr/share/apps/kompare
+--- debian/rules	15 Jan 2003 05:46:46 -0000	1.1.1.9
++++ debian/rules	16 Jan 2003 21:08:49 -0000	1.2
+@@ -30,9 +30,9 @@
+ endif
+ 
+ # GCC 3.2 defines
+-#export CC=gcc-3.2
+-#export CXX=g++-3.2
+-#export CPP=cpp-3.2
++export CC=gcc-3.2
++export CXX=g++-3.2
++export CPP=cpp-3.2
+ 
+ ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
+   export CFLAGS +=-O0 -mieee
+RCS file: debian/patches/modules.diff
+diff -N debian/patches/modules.diff
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ debian/patches/modules.diff	29 Oct 2002 18:24:50 -0000	1.1.1.1
+@@ -0,0 +1,11 @@
++--- kdesdk/kompare/libdiff2/Makefile.am	2002/03/26 23:19:22	1.2
+++++ kdesdk/kompare/libdiff2/Makefile.am	2002/09/23 00:28:14
++@@ -11,7 +11,7 @@ noinst_HEADERS = \
++ # let automoc handle all of the meta source files (moc)
++ METASOURCES = AUTO
++ 
++-lib_LTLIBRARIES = libdiff2.la
+++kde_module_LTLIBRARIES = libdiff2.la
++ 
++ # the Part's source, library search path, and link libraries
++ libdiff2_la_SOURCES = \
+--- doc/cervisia/index.docbook	5 Nov 2002 03:00:15 -0000	1.1.1.5
++++ doc/cervisia/index.docbook	3 Oct 2002 01:12:03 -0000	1.4
+@@ -555,7 +555,7 @@
+ &CVS; is not designed to provide meaningful revision control for binary
+ files. For example, merging binary files normally does not make
+ sense. Furthermore, by default &CVS; performs keyword expansion (&eg; on the
+-string <literal>&dollar;Revision: 1.6 &dollar;</literal>) when a file is commited. In binary
++string <literal>$Revision: 1.6 $</literal>) when a file is commited. In binary
+ files, such replacements may corrupt the file and make it completely
+ unusable. In order to switch this behavior off, you should commit binary files
+ (or other files, like Postscript) with a command line
+--- kbabel/catalogmanager/Makefile.am	5 Nov 2002 03:00:24 -0000	1.1.1.3
++++ kbabel/catalogmanager/Makefile.am	1 Dec 2002 17:02:09 -0000	1.3
+@@ -6,7 +6,7 @@
+ 
+ # this is the program that gets installed.  it's name is used for all
+ # of the other Makefile.am variables
+-lib_LTLIBRARIES = libcatalogmanager.la
++lib_LTLIBRARIES = catalogmanager.la libcatalogmanager_main.la
+ bin_PROGRAMS = catalogmanager
+ 
+ # set the include path for X, qt and KDE
+@@ -14,21 +14,29 @@
+ 
+ 
+ # which sources should be compiled for kbabel
+-libcatalogmanager_la_SOURCES =	catalogmanageriface.skel \
++libcatalogmanager_main_la_SOURCES =	catalogmanageriface.skel \
+ 			prefwidgets.cpp catalogmanagerview.cpp \
+ 			catalogmanager.cpp cmdedit.cpp finddialog.cpp settings.cpp \
+-			catmanlistitem.cpp roughtransdlg.cpp
++			catmanlistitem.cpp roughtransdlg.cpp main.cpp
+ 
++libcatalogmanager_main_la_LIBADD =  ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict_main.la $(LIB_KIO)
++libcatalogmanager_main_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
+ 
+-libcatalogmanager_la_LIBADD =  ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la $(LIB_KIO)
+-libcatalogmanager_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
++catalogmanager_la_SOURCES = catalogmanager_la_main.cpp
++catalogmanager_la_LDFLAGS = $(all_libraries) -avoid-version -module
++catalogmanager_la_LIBADD  = libcatalogmanager_main.la
+ 
++catalogmanager_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > catalogmanager_la_main.cpp
+ 
+-catalogmanager_SOURCES = main.cpp
++catalogmanager_SOURCES = catalogmanager_main.cpp
+ 
+ # the libraries to link against.
+-catalogmanager_LDADD   = libcatalogmanager.la
++catalogmanager_LDADD   = libcatalogmanager_main.la
+ catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++catalogmanager_main.cpp: stub_main.cpp
++	cat stub_main.cpp > catalogmanager_main.cpp
+ 
+ # these are the headers for your project
+ noinst_HEADERS   = catalogmanageriface.h prefwidgets.h catalogmanager.h cmdedit.h\
+--- kbabel/catalogmanager/main.cpp	29 Oct 2002 18:25:01 -0000	1.1.1.4
++++ kbabel/catalogmanager/main.cpp	1 Dec 2002 17:02:09 -0000	1.2
+@@ -152,8 +152,8 @@
+    {0,0,0}
+ };
+ 
+-
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++int kdemain(int argc, char **argv)
+ {
+     KLocale::setMainCatalogue("kbabel");
+     KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION,
+RCS file: kbabel/catalogmanager/stub_main.cpp
+diff -N kbabel/catalogmanager/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kbabel/catalogmanager/stub_main.cpp	29 Nov 2002 19:01:22 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kbabel/common/Makefile.am	29 Oct 2002 18:25:03 -0000	1.1.1.5
++++ kbabel/common/Makefile.am	29 Oct 2002 18:31:05 -0000	1.4
+@@ -11,7 +11,7 @@
+ lib_LTLIBRARIES = libkbabelcommon.la
+ 
+ # set the include path for X, qt and KDE
+-INCLUDES         = $(all_includes)
++INCLUDES         = $(all_includes) -I$(top_srcdir)/kbabel/kbabel
+ 
+ # which sources should be compiled 
+ libkbabelcommon_la_SOURCES = catalog.cpp catalogitem.cpp editcmd.cpp\
+--- kbabel/common/msgfmt.cpp	15 Jan 2003 05:46:53 -0000	1.1.1.5
++++ kbabel/common/msgfmt.cpp	16 Jan 2003 21:08:49 -0000	1.2
+@@ -79,8 +79,7 @@
+    Status stat=Ok;
+ 
+    // this method does not return the right return values at the moment :-(
+-   KProcess proc;
+-   proc.setUseShell(true);
++   KShellProcess proc;
+ 
+    connect(&proc,SIGNAL(receivedStdout(KProcess*, char*, int)),
+             this,SLOT(addToOutput(KProcess*,char *, int )));
+@@ -90,8 +89,8 @@
+    // remove last output
+    _output="";
+ 
+-   proc << "IFS='\n'; msgfmt --statistics -o /dev/null "
+-           "$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")";
++   proc << "cd" << KShellProcess::quote(dir) << ";";
++   proc << "msgfmt" << "--statistics" << "-o" << "/dev/null" << KShellProcess::quote(regexp);
+ 
+    if(!proc.start(KProcess::Block,KProcess::Stderr))
+    {
+--- kbabel/kbabel/Makefile.am	10 Jul 2002 05:29:11 -0000	1.1.1.2
++++ kbabel/kbabel/Makefile.am	29 Nov 2002 19:01:23 -0000	1.2
+@@ -6,7 +6,7 @@
+ 
+ # this is the program that gets installed.  it's name is used for all
+ # of the other Makefile.am variables
+-lib_LTLIBRARIES = libkbabel.la
++lib_LTLIBRARIES = kbabel.la libkbabel_main.la
+ bin_PROGRAMS = kbabel
+ 
+ # set the include path for X, qt and KDE
+@@ -14,7 +14,7 @@
+ 
+ 
+ # which sources should be compiled for kbabel
+-libkbabel_la_SOURCES =	kbabel.cpp kbabelview.cpp kbabelview2.cpp\
++libkbabel_main_la_SOURCES = main.cpp kbabel.cpp kbabelview.cpp kbabelview2.cpp\
+ 			kbabelpref.cpp kbabeliface.skel \
+ 			kbcatalog.cpp \
+ 			headereditor.cpp prefwidgets.cpp\
+@@ -23,15 +23,24 @@
+ 			finddialog.cpp spelldlg.cpp roughtransdlg.cpp settings.cpp
+ 
+ 
+-libkbabel_la_LIBADD =  ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
+-libkbabel_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
++libkbabel_main_la_LIBADD =  ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict_main.la $(LIB_KIO) $(LIB_KSPELL)
++libkbabel_main_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
+ 
++kbabel_la_SOURCES = kbabel_la_main.cpp
++kbabel_la_LIBADD  = libkbabel_main.la
++kbabel_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kbabel_SOURCES = main.cpp
++kbabel_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kbabel_la_main.cpp
++
++kbabel_SOURCES = kbabel_main.cpp
+ 
+ # the libraries to link against.
+-kbabel_LDADD   = libkbabel.la
++kbabel_LDADD   = libkbabel_main.la
+ kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kbabel_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kbabel_main.cpp
+ 
+ # these are the headers for your project
+ noinst_HEADERS   = kbabel.h kbabelview.h kbabeliface.h kbabelpref.h\
+--- kbabel/kbabel/main.cpp	12 Nov 2002 18:58:04 -0000	1.1.1.5
++++ kbabel/kbabel/main.cpp	1 Dec 2002 17:02:09 -0000	1.2
+@@ -410,7 +410,8 @@
+ };
+ 
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char**);
++int kdemain(int argc, char **argv)
+ {
+     KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
+        I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL,
+RCS file: kbabel/kbabel/stub_main.cpp
+diff -N kbabel/kbabel/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kbabel/kbabel/stub_main.cpp	29 Nov 2002 19:01:23 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+RCS file: kbabel/kbabel/version.h
+diff -N kbabel/kbabel/version.h
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kbabel/kbabel/version.h	17 Aug 2002 17:46:03 -0000	1.1
+@@ -0,0 +1,3 @@
++#undef VERSION
++#define VERSION "0.5.5"
++
+--- kbabel/kbabeldict/Makefile.am	29 Oct 2002 18:25:10 -0000	1.1.1.4
++++ kbabel/kbabeldict/Makefile.am	29 Nov 2002 19:01:23 -0000	1.2
+@@ -8,7 +8,7 @@
+ 
+ # this is the program that gets installed.  it's name is used for all
+ # of the other Makefile.am variables
+-lib_LTLIBRARIES = libkbabeldict.la libkbabeldictplugin.la
++lib_LTLIBRARIES = kbabeldict.la libkbabeldictplugin.la libkbabeldictplugin_shared.la libkbabeldict_main.la
+ bin_PROGRAMS = kbabeldict
+ 
+ # set the include path for X, qt and KDE
+@@ -16,21 +16,34 @@
+ 
+ 
+ # which sources should be compiled for kbabeldict
+-libkbabeldictplugin_la_SOURCES = searchengine.cpp 
+-libkbabeldictplugin_la_LIBADD =  $(LIB_KDECORE)
+-libkbabeldictplugin_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
++libkbabeldictplugin_shared_la_SOURCES = searchengine.cpp 
++libkbabeldictplugin_shared_la_LIBADD =  $(LIB_KDECORE)
++libkbabeldictplugin_shared_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
++
++libkbabeldictplugin_la_SOURCES = libkbabeldictplugin_la_dummy.cpp
++libkbabeldictplugin_la_LIBADD  = libkbabeldictplugin_shared.la
++libkbabeldictplugin_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
+ 
+-libkbabeldict_la_SOURCES = kbabeldictbox.cpp \
++libkbabeldictplugin_la_dummy.cpp:
++	echo > libkbabeldictplugin_la_dummy.cpp
++
++libkbabeldict_main_la_SOURCES = kbabeldictbox.cpp \
+             kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \
+-            aboutmoduledlg.cpp 
+-libkbabeldict_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_KDEUI)
+-libkbabeldict_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
++            aboutmoduledlg.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
++libkbabeldict_main_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin_shared.la $(LIB_KDEUI)
++libkbabeldict_main_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
++
++kbabeldict_la_SOURCES = kbabeldict_main.cpp
++kbabeldict_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kbabeldict_la_LIBADD  = libkbabeldict_main.la
+ 
++kbabeldict_main.cpp:
++	cat main.cpp > kbabeldict_main.cpp
+ 
+-kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
++kbabeldict_SOURCES = main.cpp
+ 
+ # the libraries to link against.
+-kbabeldict_LDADD   = libkbabeldict.la
++kbabeldict_LDADD   = libkbabeldict_main.la
+ kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ # these are the headers for your project
+@@ -42,7 +55,7 @@
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+ 
+-KDE_OPTIONS = nofinal
++#KDE_OPTIONS = nofinal
+ #rcdir = $(kde_datadir)/kbabel
+ #rc_DATA = kbabelui.rc
+ 
+--- kompare/Makefile.am	29 Oct 2002 18:25:22 -0000	1.1.1.3
++++ kompare/Makefile.am	29 Nov 2002 19:01:23 -0000	1.2
+@@ -27,7 +27,7 @@
+ # the application source, library search path, and link libraries
+ kompare_SOURCES = main.cpp kompare_shell.cpp kcomparedialog.cpp
+ kompare_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-kompare_LDADD   = $(LIB_KPARTS) $(top_builddir)/kompare/komparepart/libkomparepart.la
++kompare_LDADD   = $(LIB_KPARTS) $(top_builddir)/kompare/komparepart/libkomparepart_shared.la
+ 
+ # this is where the desktop file will go
+ shelldesktopdir   = $(kde_appsdir)/Development
+--- kompare/komparepart/Makefile.am	10 Jul 2002 05:30:35 -0000	1.1.1.2
++++ kompare/komparepart/Makefile.am	29 Nov 2002 19:01:23 -0000	1.2
+@@ -25,10 +25,10 @@
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+ 
+-kde_module_LTLIBRARIES = libkomparepart.la
++kde_module_LTLIBRARIES = libkomparepart.la libkomparepart_shared.la
+ 
+ # the Part's source, library search path, and link libraries
+-libkomparepart_la_SOURCES = \
++libkomparepart_shared_la_SOURCES = \
+ 	kompare_part.cpp \
+ 	kompare_actions.cpp \
+ 	kompareconnectwidget.cpp \
+@@ -46,9 +46,16 @@
+ 	komparesaveoptionsbase.ui \
+ 	komparesaveoptionswidget.cpp
+ 
+-libkomparepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libkomparepart_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) \
++libkomparepart_shared_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -avoid-version
++libkomparepart_shared_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) \
+ 	$(top_builddir)/kompare/libdiff2/libdiff2.la
++
++libkomparepart_la_SOURCES = libkomparepart_la_dummy.cpp
++libkomparepart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++libkomparepart_la_LIBADD  = libkomparepart_shared.la
++
++libkomparepart_la_dummy.cpp:
++	echo > libkomparepart_la_dummy.cpp
+ 
+ # this is where the desktop file will go
+ partdesktopdir   = $(kde_servicesdir)
Index: trunk/dports/x11/kdetoys3/Portfile
===================================================================
--- trunk/dports/x11/kdetoys3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdetoys3/Portfile	(revision 1900)
@@ -0,0 +1,34 @@
+PortSystem 1.0
+name		kdetoys3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	miscellaneous toys and goofy apps for KDE
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdetoys-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libjpeg:jpeg lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 \
+		lib:libpng.3:libpng lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdetoys-${version}.tar.bz2 md5 faca3d6fdc5d0ac7671a31b03c9c506a \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdeutils3/Portfile
===================================================================
--- trunk/dports/x11/kdeutils3/Portfile	(revision 1900)
+++ trunk/dports/x11/kdeutils3/Portfile	(revision 1900)
@@ -0,0 +1,41 @@
+PortSystem 1.0
+name		kdeutils3
+version		3.1
+revision	1
+categories	x11
+maintainers	ranger@befunk.com
+description	miscellaneous utilities for KDE
+
+platforms	darwin
+master_sites	ftp://ftp.kde.org/pub/kde/stable/3.1/src/ http://ranger.befunk.com/fink/:admin
+extract.sufx	.tar.bz2
+use_bzip2	yes
+distname	kdeutils-${version}
+distfiles	${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
+patchfiles	patch-${name}-${version}.darwin
+depends_lib	lib:libDCOP:kdelibs3 lib:libart_lgpl_2:libart_lgpl lib:libdl.1:dlcompat \
+		lib:libkdecore.4:kdelibs3 bin:startkde:kdebase3 lib:libpng.3:libpng \
+		lib:libqt-mt.3.1:qt3 lib:libX11.6:XFree86
+
+checksums	kdeutils-${version}.tar.bz2 md5 81e2916ba0fa865053aff858982c040e \
+		kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
+
+patch {
+		foreach patch $patchfiles {
+			system "cd '${workpath}/${distname}' && \
+			sed -e 's#@PREFIX@#${prefix}#g' '${portpath}/${filedir}/${patch}' | patch -p0"
+		}
+}
+post-patch      {
+		system "cd '${worksrcpath}' && cp -Rf ../admin/ admin"
+		system "cd '${worksrcpath}' && make -f Makefile.cvs"
+}
+configure.env	CPPFLAGS='-I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
+		LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
+configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
+		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
+		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
+		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--disable-dependency-tracking
+build.env	${configure.env}
Index: trunk/dports/x11/kdeutils3/files/patch-kdeutils3-3.1.darwin
===================================================================
--- trunk/dports/x11/kdeutils3/files/patch-kdeutils3-3.1.darwin	(revision 1900)
+++ trunk/dports/x11/kdeutils3/files/patch-kdeutils3-3.1.darwin	(revision 1900)
@@ -0,0 +1,424 @@
+
+--- configure.in.in	4 Jan 2003 20:44:00 -0000	1.1.1.3
++++ configure.in.in	4 Jan 2003 20:48:13 -0000	1.4
+@@ -6,3 +6,4 @@
+ AC_CHECK_UNSETENV
+ KDE_CHECK_STRLCPY
+ CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE  -DQT_NO_ASCII_CAST"
++DO_NOT_COMPILE="$DO_NOT_COMPILE klaptopdaemon"
+--- ark/Makefile.am	18 Jan 2003 02:10:59 -0000	1.1.1.5
++++ ark/Makefile.am	20 Jan 2003 01:09:23 -0000
+@@ -5,23 +5,31 @@
+ 
+ # The binary name. Changed from kzip to ark
+ bin_PROGRAMS = ark
++noinst_LTLIBRARIES = libark.la
+ lib_LTLIBRARIES = libarkpart.la
+ 
+ # Kpart sources 
+-libarkpart_la_SOURCES= arkapp.cpp extractdlg.cpp dirDlg.cpp arkwidget.cpp \
++libark_la_SOURCES= arkapp.cpp extractdlg.cpp dirDlg.cpp arkwidget.cpp \
+ 		zip.cpp tar.cpp filelistview.cpp arch.cpp \
+ 		selectDlg.cpp lha.cpp shellOutputDlg.cpp arksettings.cpp \
+ 		compressedfile.cpp zoo.cpp rar.cpp ar.cpp generalOptDlg.cpp \
+ 		ark_part.cpp arkwidgetbase.cpp arktoplevelwindow.cpp arkfactory.cpp arkutils.cpp
+ 
+ # KParts
++libark_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
++libark_la_LIBADD  = $(LIB_KFILE) $(LIB_KPARTS)
++
++libarkpart_la_SOURCES = dummy.cpp
+ libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libarkpart_la_LIBADD  = $(LIB_KFILE) $(LIB_KPARTS)
++libarkpart_la_LIBADD  = libark.la
++
++dummy.cpp:
++	echo > dummy.cpp
+ 
+ # Which sources should be compiled for ark.
+ ark_SOURCES    = main.cpp
+ ark_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-ark_LDADD   = libarkpart.la
++ark_LDADD   = libark.la
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = dirDlg.h arksettings.h  tar.h zip.h rar.h \
+--- kcalc/Makefile.am	3 Oct 2002 01:29:13 -0000	1.1.1.3
++++ kcalc/Makefile.am	1 Dec 2002 17:02:11 -0000	1.5
+@@ -1,8 +1,8 @@
+ AM_CPPFLAGS=-D_GNU_SOURCE -D_ISOC99_SOURCE
+ bin_PROGRAMS = kcalc
+-lib_LTLIBRARIES = kcalc.la
++lib_LTLIBRARIES = kcalc.la libkcalc_main.la
+ 
+-kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
++libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
+ 	           optiondialog.cpp
+ 
+ METASOURCES = AUTO
+@@ -10,13 +10,23 @@
+ noinst_HEADERS  = kcalc.h dlabel.h stats.h kcalctype.h
+ 
+ INCLUDES= $(all_includes)
+-kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kcalc_la_LIBADD = $(LIB_KDEUI) -lm
++libkcalc_main_la_LDFLAGS = $(all_libraries) -avoid-version
++libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm $(LIB_KDECORE) $(LIB_QT)
+ 
+-kcalc_SOURCES = dummy.cpp
+-kcalc_LDADD = kcalc.la
++kcalc_la_SOURCES = kcalc_la_main.cpp
++kcalc_la_LDFLAGS = $(all_libraries) -avoid-version -module
++kcalc_la_LIBADD  = libkcalc_main.la
++
++kcalc_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcalc_la_main.cpp
++
++kcalc_SOURCES = kcalc_main.cpp
++kcalc_LDADD = libkcalc_main.la
+ kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kcalc_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kcalc_main.cpp
++
+ pics_DATA = 
+ picsdir = $(kde_datadir)/kcalc/pics
+ 
+@@ -29,6 +39,3 @@
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kcalc/kcalc.cpp	4 Jan 2003 20:44:29 -0000	1.1.1.6
++++ kcalc/kcalc.cpp	4 Jan 2003 20:48:13 -0000	1.3
+@@ -2320,7 +2320,8 @@
+ //-------------------------------------------------------------------------
+ // Name: main(int argc, char *argv[])
+ //-------------------------------------------------------------------------
+-int main(int argc, char *argv[])
++extern "C" int kdemain(int, char**);
++int kdemain(int argc, char *argv[])
+ {
+         QString precisionStatement;
+         
+--- kcalc/kcalc_core.cpp	29 Oct 2002 18:39:39 -0000	1.1.1.5
++++ kcalc/kcalc_core.cpp	29 Oct 2002 18:51:30 -0000	1.5
+@@ -48,6 +48,13 @@
+ 
+ #define UNUSED(x) ((void)(x))
+ 
++#if defined(__APPLE__) && __GNUC__ > 2
++/* FIXME: Jaguar's math.h does some weird isinf trickery
++   that breaks using the builtins... this should be made into
++   an aclocal.m4 macro */
++# undef HAVE_FUNC_ISINF
++#endif
++
+ #ifndef HAVE_FUNC_ISINF
+ 	#ifdef HAVE_IEEEFP_H
+ 		#include <ieeefp.h>
+--- kcalc/kcalctype.h	3 Oct 2002 01:29:13 -0000	1.1.1.2
++++ kcalc/kcalctype.h	3 Oct 2002 01:48:11 -0000	1.3
+@@ -98,7 +98,11 @@
+ 	#define ATAN(X)		atan(X)
+ 	#define ATANH(X)	atanh(X)
+ 	#define EXP(X)		exp(X)
++# if defined(__APPLE__) && __GNUC__ > 2
++	#define POW(X,Y)	(double)pow((double)X,Y)
++# else
+ 	#define POW(X,Y)	pow(X,Y)
++# endif
+ 	#define LOG(X)		log(X)
+ 	#define LOG_TEN(X)	log10(X)
+ 	#define SQRT(X)		sqrt(X)
+RCS file: kcalc/stub_main.cpp
+diff -N kcalc/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kcalc/stub_main.cpp	1 Dec 2002 17:02:13 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- kedit/Makefile.am	25 Jun 2002 03:24:54 -0000	1.1.1.1
++++ kedit/Makefile.am	1 Dec 2002 17:02:14 -0000	1.3
+@@ -8,17 +8,27 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = kedit
+-lib_LTLIBRARIES = kedit.la
++lib_LTLIBRARIES = kedit.la libkedit_main.la
+ 
+-kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
++libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
+ 		mail.cpp  optiondialog.cpp 
+-kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
+-kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
++libkedit_main_la_LDFLAGS = $(all_libraries) -avoid-version
+ 
+-kedit_SOURCES = dummy.cpp
+-kedit_LDADD   = kedit.la
++kedit_la_SOURCES = kedit_la_main.cpp
++kedit_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
++kedit_la_LIBADD  = libkedit_main.la
++
++kedit_la_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kedit_la_main.cpp
++
++kedit_SOURCES = kedit_main.cpp
++kedit_LDADD   = libkedit_main.la
+ kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++kedit_main.cpp: stub_main.cpp
++	cat stub_main.cpp > kedit_main.cpp
++
+ noinst_HEADERS = kedit.h ktextfiledlg.h\
+ 		version.h mail.h optiondialog.h
+ 
+@@ -36,6 +46,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+--- kedit/kedit.cpp	29 Oct 2002 18:39:42 -0000	1.1.1.4
++++ kedit/kedit.cpp	1 Dec 2002 17:02:14 -0000	1.2
+@@ -1516,7 +1516,8 @@
+ 	{ 0, 0, 0}
+ };
+ 
+-int main (int argc, char **argv)
++extern "C" int kdemain(int, char**);
++int kdemain (int argc, char **argv)
+ {
+ 	bool have_top_window = false;
+ 
+RCS file: kedit/stub_main.cpp
+diff -N kedit/stub_main.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ kedit/stub_main.cpp	1 Dec 2002 17:02:14 -0000	1.1
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++        return kdemain(argc, argv);
++}
++
+--- khexedit/chartabledialog.cc	25 Jun 2002 03:24:54 -0000	1.1.1.1
++++ khexedit/chartabledialog.cc	25 Jun 2002 03:25:51 -0000	1.2
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <limits.h>
++#define MAXINT 2147483647
+ 
+ #include <qlabel.h>
+ #include <qheader.h>
+--- khexedit/dialog.cc	3 Oct 2002 01:29:16 -0000	1.1.1.4
++++ khexedit/dialog.cc	3 Oct 2002 01:48:11 -0000	1.5
+@@ -18,9 +18,11 @@
+  *
+  */
+ 
++#include <limits.h>
++#define MAXINT 2147483647
++
+ #include <ctype.h>
+ #include <iostream>
+-#include <limits.h>
+ 
+ #include <qbuttongroup.h> 
+ #include <qfileinfo.h> 
+--- khexedit/exportdialog.cc	3 Oct 2002 01:29:16 -0000	1.1.1.3
++++ khexedit/exportdialog.cc	3 Oct 2002 01:48:11 -0000	1.4
+@@ -19,6 +19,8 @@
+  */
+ 
+ #include <limits.h>
++#define MAXINT 2147483647
++
+ #include <qbuttongroup.h>
+ #include <qlineedit.h> 
+ 
+--- khexedit/optiondialog.cc	3 Oct 2002 01:29:18 -0000	1.1.1.4
++++ khexedit/optiondialog.cc	3 Oct 2002 01:48:11 -0000	1.5
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <limits.h>
++#define MAXINT 2147483647
+ 
+ #include <qvbox.h>
+ #include <qvbuttongroup.h>
+--- klaptopdaemon/Makefile.am	3 Oct 2002 01:29:20 -0000	1.1.1.3
++++ klaptopdaemon/Makefile.am	16 Jan 2003 17:38:12 -0000	1.7
+@@ -1,16 +1,20 @@
+-lib_LTLIBRARIES = klaptopdaemon.la
++lib_LTLIBRARIES = klaptopdaemon.la libklaptopdaemon_shared.la
+ kde_module_LTLIBRARIES = kcm_laptop.la
+ bin_PROGRAMS = klaptopdaemon
+ SUBDIRS = pics applnk
+ 
+-klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
++libklaptopdaemon_shared_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
+ 	kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp
++libklaptopdaemon_shared_la_LDFLAGS = $(all_libraries) -avoid-version
++libklaptopdaemon_shared_la_LIBADD   = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP
++
++klaptopdaemon_la_SOURCES = dummy2.cpp
+ klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-klaptopdaemon_la_LIBADD   = $(LIB_KDEUI)
++klaptopdaemon_la_LIBADD  = libklaptopdaemon_shared.la
+ 
+ klaptopdaemon_SOURCES = dummy.cpp
+ klaptopdaemon_LDFLAGS = $(all_libraries)
+-klaptopdaemon_LDADD = klaptopdaemon.la
++klaptopdaemon_LDADD = libklaptopdaemon_shared.la
+ 
+ kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
+ 	portable.cpp acpi_config.cpp
+@@ -27,5 +31,5 @@
+ 	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
+ 	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
+ 
+-dummy.cpp:
+-	echo >dummy.cpp
++dummy.cpp dummy2.cpp:
++	echo >$@
+--- klaptopdaemon/configure.in.in	25 Jun 2002 03:24:54 -0000	1.1.1.1
++++ klaptopdaemon/configure.in.in	12 Jan 2003 18:00:03 -0000	1.2
+@@ -0,0 +1 @@
++DO_NOT_COMPILE="$DO_NOT_COMPILE klaptopdaemon"
+--- ksim/configure.in.in	10 Jul 2002 05:33:18 -0000	1.1.1.1
++++ ksim/configure.in.in	11 Nov 2002 20:56:20 -0000	1.2
+@@ -1,3 +1,5 @@
++DO_NOT_COMPILE="$DO_NOT_COMPILE ksim"
++
+ AC_CHECK_FUNCS(getloadavg)
+ 
+ sysinfo_check=no
+--- ksim/library/Makefile.am	4 Jan 2003 20:44:18 -0000	1.1.1.2
++++ ksim/library/Makefile.am	4 Jan 2003 20:48:14 -0000	1.3
+@@ -4,10 +4,9 @@
+                                         chart.cpp label.cpp \
+                                         led.cpp progress.cpp \
+                                         pluginglobal.cpp pluginloader.cpp \
+-                                        pluginmodule.cpp ksimconfig.cpp
+-
+-libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
+-libksimcore_la_LIBADD = $(LIB_KDEUI)
++                                        pluginmodule.cpp ../ksimconfig.cpp
++libksimcore_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEFX) $(LIB_KDEUI)
++libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined $(QT_LDFLAGS)
+ 
+ ksiminclude_HEADERS = common.h themeloader.h \
+                                         chart.h led.h label.h \
+--- ksim/monitors/Makefile.am	10 Jul 2002 05:33:19 -0000	1.1.1.1
++++ ksim/monitors/Makefile.am	12 Jul 2002 23:23:29 -0000	1.2
+@@ -1 +1 @@
+-SUBDIRS = filesystem net lm_sensors cpu disk
++SUBDIRS = filesystem net lm_sensors cpu
+--- ksim/monitors/cpu/ksimcpu.cpp	10 Jul 2002 05:33:19 -0000	1.1.1.1
++++ ksim/monitors/cpu/ksimcpu.cpp	1 Aug 2002 00:24:51 -0000	1.3
+@@ -17,6 +17,9 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <sys/sysctl.h>
++#include <sys/dkstat.h>
++#include <rpcsvc/rstat.h>
+ #include "ksimcpu.h"
+ #include "ksimcpu.moc"
+ 
+@@ -52,6 +55,22 @@
+ #endif
+ #endif
+ 
++#ifndef CP_USER
++#define CP_USER 0
++#endif
++
++#ifndef CP_NICE
++#define CP_NICE 1
++#endif
++
++#ifndef CP_SYS
++#define CP_SYS 2
++#endif
++
++#ifndef CP_IDLE
++#define CP_IDLE 4
++#endif
++
+ #define CPU_NAME(cpu) "Cpu" + QString::number(cpu) + "_options"
+ #define CPU_SPEED 1000
+ 
+@@ -260,7 +279,7 @@
+   }
+ 
+   if (sysctl(oidCpuTime, oidCpuTimeLen,
+-     cpuTime, &cpuTimeLen, 0, 0) < 0)
++     cpuTime, (long unsigned int)&cpuTimeLen, 0, 0) < 0)
+     return;
+ 
+   cpu.user = cpuTime[CP_USER];
+--- ksim/monitors/disk/ksimdisk.cpp	5 Nov 2002 03:08:27 -0000	1.1.1.3
++++ ksim/monitors/disk/ksimdisk.cpp	5 Nov 2002 03:10:51 -0000	1.4
+@@ -42,7 +42,6 @@
+ 
+ #ifdef Q_OS_FREEBSD
+ #include <sys/dkstat.h>
+-#include <devstat.h>
+ #include <stdlib.h>
+ #endif
+ 
