diff -ur qtopia-free-1.6.0.orig/src/3rdparty/libraries/rsync/trace.c qtopia-free-1.6.0/src/3rdparty/libraries/rsync/trace.c
--- qtopia-free-1.6.0.orig/src/3rdparty/libraries/rsync/trace.c	Fri Jan 31 10:18:32 2003
+++ qtopia-free-1.6.0/src/3rdparty/libraries/rsync/trace.c	Sun Mar 23 15:54:40 2003
@@ -61,6 +61,10 @@
 
 int rs_trace_level = RS_LOG_INFO;
 
+#ifdef __FreeBSD__
+#undef HAVE_PROGRAM_INVOCATION_NAME
+#endif
+
 #ifdef HAVE_PROGRAM_INVOCATION_NAME
 #  define MY_NAME program_invocation_short_name
 #else
diff -ur qtopia-free-1.6.0.orig/src/3rdparty/libraries/rsync/types.h qtopia-free-1.6.0/src/3rdparty/libraries/rsync/types.h
--- qtopia-free-1.6.0.orig/src/3rdparty/libraries/rsync/types.h	Fri Jan 31 10:18:32 2003
+++ qtopia-free-1.6.0/src/3rdparty/libraries/rsync/types.h	Sun Mar 23 15:53:18 2003
@@ -22,6 +22,10 @@
 
 #include "config_rsync.h"
 
+#ifdef __FreeBSD__
+#undef HAVE_STDINT_H
+#endif
+
 #if defined(HAVE_STDINT_H)
 #  include <stdint.h>
 #elif SIZEOF_UNSIGNED_INT == 4
diff -ur qtopia-free-1.6.0.orig/src/3rdparty/plugins/codecs/libffmpeg/yuv2rgb.cpp qtopia-free-1.6.0/src/3rdparty/plugins/codecs/libffmpeg/yuv2rgb.cpp
--- qtopia-free-1.6.0.orig/src/3rdparty/plugins/codecs/libffmpeg/yuv2rgb.cpp	Fri Jan 31 10:18:32 2003
+++ qtopia-free-1.6.0/src/3rdparty/plugins/codecs/libffmpeg/yuv2rgb.cpp	Sun Mar 23 23:24:12 2003
@@ -706,7 +706,9 @@
 }
 
 
+#ifdef linux
 #include <linux/config.h>
+#endif
 #ifdef CONFIG_ARM
 #include "yuv2rgb_arm.c"
 #endif
diff -ur qtopia-free-1.6.0.orig/src/3rdparty/plugins/obex/openobex/glib.h qtopia-free-1.6.0/src/3rdparty/plugins/obex/openobex/glib.h
--- qtopia-free-1.6.0.orig/src/3rdparty/plugins/obex/openobex/glib.h	Fri Jan 31 10:18:32 2003
+++ qtopia-free-1.6.0/src/3rdparty/plugins/obex/openobex/glib.h	Sun Mar 23 23:09:06 2003
@@ -38,6 +38,8 @@
 #include "glibconfig.h"
 #include "stdlib.h"
 #include "stdio.h"
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 
 
diff -ur qtopia-free-1.6.0.orig/src/Makefile.linux qtopia-free-1.6.0/src/Makefile.linux
--- qtopia-free-1.6.0.orig/src/Makefile.linux	Fri Feb 28 01:02:15 2003
+++ qtopia-free-1.6.0/src/Makefile.linux	Mon Mar 24 00:01:06 2003
@@ -73,7 +73,6 @@
 	plugins/decorations/flat
 
 SUPPORTEDAPPS=\
-	3rdparty/tools/atd \
 	applications/addressbook \
 	applications/calculator \
 	applications/clock \
@@ -108,8 +107,7 @@
 	settings/launcher \
 	settings/language \
 	tools/quickexec \
-	tools/qcop \
-	tools/symlinker
+	tools/qcop
 
 $(SUPPORTEDLIBS): $(CORELIBS)
 
diff -ur qtopia-free-1.6.0.orig/src/applications/mediaplayer/mediaplayer.pro qtopia-free-1.6.0/src/applications/mediaplayer/mediaplayer.pro
--- qtopia-free-1.6.0.orig/src/applications/mediaplayer/mediaplayer.pro	Fri Jan 31 10:18:31 2003
+++ qtopia-free-1.6.0/src/applications/mediaplayer/mediaplayer.pro	Mon Mar 24 00:03:58 2003
@@ -16,6 +16,6 @@
 
 multiprocess:SOURCES += main.cpp
 
-unix:LIBS       += -lpthread
+unix:LIBS       += -lc_r
 
 TRANSLATIONS = mpegplayer-en_GB.ts mpegplayer-de.ts mpegplayer-ja.ts mpegplayer-no.ts
 
diff -ur qtopia-free-1.6.0.orig/src/applications/mediarecorder/audiodevice.cpp qtopia-free-1.6.0/src/applications/mediarecorder/audiodevice.cpp
--- qtopia-free-1.6.0.orig/src/applications/mediarecorder/audiodevice.cpp	Thu Feb  6 11:35:00 2003
+++ qtopia-free-1.6.0/src/applications/mediarecorder/audiodevice.cpp	Sun Mar 23 23:40:11 2003
@@ -43,6 +43,10 @@
 #include <unistd.h>
 #endif
 
+#ifndef AFMT_S16_NE
+#define AFMT_S16_NE AFMT_S16_LE
+#endif
+
 #if defined(Q_OS_WIN32)
 static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000;
 static const int timerResolutionMilliSeconds = 30;
diff -ur qtopia-free-1.6.0.orig/src/applications/mediarecorder/audioinput.cpp qtopia-free-1.6.0/src/applications/mediarecorder/audioinput.cpp
--- qtopia-free-1.6.0.orig/src/applications/mediarecorder/audioinput.cpp	Fri Jan 31 10:18:31 2003
+++ qtopia-free-1.6.0/src/applications/mediarecorder/audioinput.cpp	Sun Mar 23 23:40:41 2003
@@ -41,6 +41,10 @@
 #define	AUDIO_RECORD_SOURCE	SOUND_MIXER_MIC
 #endif
 
+#ifndef AFMT_S16_NE
+#define AFMT_S16_NE AFMT_S16_LE
+#endif
+
 
 // Sound formats, for use by AudioFormatHandler::create().
 #ifndef AFMT_U8
diff -ur qtopia-free-1.6.0.orig/src/applications/mediarecorder/mediarecorder.pro qtopia-free-1.6.0/src/applications/mediarecorder/mediarecorder.pro
--- qtopia-free-1.6.0.orig/src/applications/mediarecorder/mediarecorder.pro	Fri Jan 31 10:18:31 2003
+++ qtopia-free-1.6.0/src/applications/mediarecorder/mediarecorder.pro	Mon Mar 24 00:04:16 2003
@@ -11,4 +11,4 @@
 TARGET		= mediarecorder
 TRANSLATIONS = mediarecorder-en_GB.ts mediarecorder-de.ts mediarecorder-ja.ts mediarecorder-no.ts
 
-unix:LIBS       += -lpthread
+unix:LIBS       += -lc_r
diff -ur qtopia-free-1.6.0.orig/src/configure qtopia-free-1.6.0/src/configure
--- qtopia-free-1.6.0.orig/src/configure	Thu Feb 27 10:25:11 2003
+++ qtopia-free-1.6.0/src/configure	Sun Mar 23 15:25:36 2003
@@ -401,7 +401,7 @@
 		if [ "$f" = server ]
 		then 
 		    # Qt dependancies, plugins, applications, libraries
-		    EXTRALIBS="-ljpeg -Wl,-Bstatic -Wl,-whole-archive $SERVERPLUGINS -Wl,-no-whole-archive -Wl,-Bdynamic $SERVERLIBS $EXTRALIBS"
+		    EXTRALIBS="-Wl,-Bstatic -Wl,-whole-archive $SERVERPLUGINS -Wl,-no-whole-archive -Wl,-Bdynamic $SERVERLIBS $EXTRALIBS"
 		fi
 		MOC_DIR=.moc
 		OBJECTS_DIR=.obj

diff -ur qtopia-free-1.6.0.orig/src/libraries/qtopia/qtopia.pro qtopia-free-1.6.0/src/libraries/qtopia/qtopia.pro
--- qtopia-free-1.6.0.orig/src/libraries/qtopia/qtopia.pro	Thu Feb 20 23:30:34 2003
+++ qtopia-free-1.6.0/src/libraries/qtopia/qtopia.pro	Sun Mar 23 15:40:17 2003
@@ -133,7 +133,7 @@
 
 INCLUDEPATH += $(QPEDIR)/include
 win32:INCLUDEPATH += $(QPEDIR)/src/server
-dynamic:unix:LIBS	+= -ldl
+dynamic:unix:LIBS	+=
 unix:LIBS	+= -lcrypt -lm
 win32:LIBS	+= rpcrt4.lib
 
diff -ur qtopia-free-1.6.0.orig/src/libraries/qtopia1/timezone.cpp qtopia-free-1.6.0/src/libraries/qtopia1/timezone.cpp
--- qtopia-free-1.6.0.orig/src/libraries/qtopia1/timezone.cpp	Tue Feb 25 14:41:03 2003
+++ qtopia-free-1.6.0/src/libraries/qtopia1/timezone.cpp	Sun Mar 23 15:44:35 2003
@@ -963,6 +963,12 @@
     return fromUtc( utc );
 }
 
+#ifndef linux
+static int daylight = 0;
+#define timezone _timezone
+static long _timezone = 0L;
+#endif
+
 /*!
   Returns the current system time zone.
 */

diff -ur qtopia-free-1.6.0.orig/src/server/applauncher.cpp qtopia-free-1.6.0/src/server/applauncher.cpp
--- qtopia-free-1.6.0.orig/src/server/applauncher.cpp	Tue Feb 25 12:56:22 2003
+++ qtopia-free-1.6.0/src/server/applauncher.cpp	Sun Mar 23 15:48:54 2003
@@ -250,6 +250,9 @@
     for (QMap<int,QString>::ConstIterator it = runningApps.begin(); it != runningApps.end(); ++it) {
 	if ( *it == app ) {
 #ifdef Q_OS_UNIX
+#ifndef linux
+#define __getpgid getpgid
+#endif
 	    pid_t t = ::__getpgid( it.key() );
 	    if ( t == -1 ) {
 		qDebug("appLauncher bug, %s believed running, but pid %d is not existing", app.data(), it.key() );
diff -ur qtopia-free-1.6.0.orig/src/server/packageslave.cpp qtopia-free-1.6.0/src/server/packageslave.cpp
--- qtopia-free-1.6.0.orig/src/server/packageslave.cpp	Thu Feb  6 11:35:35 2003
+++ qtopia-free-1.6.0/src/server/packageslave.cpp	Sun Mar 23 15:51:12 2003
@@ -36,6 +36,10 @@
 #include <stdlib.h>
 #include <sys/stat.h> // mkdir()
 
+#ifdef Q_OS_UNIX
+#include <unistd.h>
+#endif
+
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <unistd.h>
 #include <sys/vfs.h>
diff -ur qtopia-free-1.6.0.orig/src/server/transferserver.cpp qtopia-free-1.6.0/src/server/transferserver.cpp
--- qtopia-free-1.6.0.orig/src/server/transferserver.cpp	Wed Feb 26 11:02:07 2003
+++ qtopia-free-1.6.0/src/server/transferserver.cpp	Sun Mar 23 15:50:08 2003
@@ -28,7 +28,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
+#ifdef linux
 #include <shadow.h>
+#endif
 
 extern "C" {
 #include <uuid/uuid.h>
diff -ur qtopia-free-1.6.0.orig/src/tools/quickexec/quickexec.cpp qtopia-free-1.6.0/src/tools/quickexec/quickexec.cpp
--- qtopia-free-1.6.0.orig/src/tools/quickexec/quickexec.cpp	Fri Jan 31 10:18:27 2003
+++ qtopia-free-1.6.0/src/tools/quickexec/quickexec.cpp	Sun Mar 23 23:51:26 2003
@@ -47,7 +47,7 @@
     typedef int (*Mainfunc)(int, char**);
     Mainfunc mainfunc;
     mainfunc = (Mainfunc) dlsym(handle, "main"); // No tr()
-    char *error;
+    const char *error;
     if ((error = dlerror()) != NULL)  {
 	fprintf (stderr, "%s\n", error);
 	exit(1);

diff -ur qtopia-free-1.6.0.orig/src/tools/quickexec/quickexec.pro qtopia-free-1.6.0/src/tools/quickexec/quickexec.pro
--- qtopia-free-1.6.0.orig/src/tools/quickexec/quickexec.pro	Fri Jan 31 10:18:27 2003
+++ qtopia-free-1.6.0/src/tools/quickexec/quickexec.pro	Mon Mar 24 00:51:22 2003
@@ -5,6 +5,6 @@
 HEADERS		= 
 SOURCES		= quickexec.cpp
 
-LIBS		+= -ldl
+LIBS		+=
 
 TARGET		= quickexec