--- compile/server/Makefile.orig	2004-12-14 07:20:53.569878872 +0930
+++ compile/server/Makefile	2004-12-14 07:22:33.991612448 +0930
@@ -10,9 +10,9 @@
 LIB = ../lib
 
 LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-INCLUDE = -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2
-CFLAGS = -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1
-CPPFLAGS = -fexceptions -Wall -Wno-deprecated
+INCLUDE =-I/usr/include/db4.1 -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2
+CFLAGS+= -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1
+CPPFLAGS+= -fexceptions -Wall -Wno-deprecated
 
 CLEANFILES = *.o core *~ *.so *.o.lib
 
@@ -76,11 +76,11 @@
 plugins: ${PLUGINS} ${PLUGINSCPP}
 
 ${PLUGINS}: %.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile
-	${CPP} -shared \
+	${CPP} ${CFLAGS} -shared \
 		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc
 
 ${PLUGINSCPP}:	%.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile
-	${CPP} -shared \
+	${CPP} ${CFLAGS} -shared \
 		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc
 
 clean: 
@@ -102,12 +102,7 @@
 	${CPP} -fpic -c ${CFLAGS} ${CPPFLAGS} ../../shared/`basename $@ .o`.cc
 
 depend: makedep
-	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-	echo '$$r makedep' >>eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ex - Makefile < eddep
-	rm eddep makedep makedep1 makedeperrs
+	cat makedep >> Makefile
 
 CFILES  = ../../server/*.c ../../server/*.cpp ../../shared/*.c ../../shared/*.cc \
 	  ../../server/plugins/*.c ../../server/plugins/*.cc
--- compile/client/Makefile.orig	2003-05-20 13:02:58.000000000 +0930
+++ compile/client/Makefile	2004-12-14 07:33:16.770091248 +0930
@@ -13,8 +13,8 @@
 
 LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 INCLUDE = -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2
-CFLAGS = -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1 -D`uname -m`
-CPPFLAGS = -fexceptions -D`uname -m`
+CFLAGS+= -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1 -D`uname -m`
+CPPFLAGS+= -fexceptions -D`uname -m`
 
 CLEANFILES = *.o core *~ *.so *.o.lib
 
@@ -68,12 +68,7 @@
 #	${CC} -fpic -c ${CFLAGS} ../shared/llseek_pic.c
 
 depend: makedep
-	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-	echo '$$r makedep' >>eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ex - Makefile < eddep
-	rm eddep makedep makedep1 makedeperrs
+	cat makedep >> Makefile
 
 CFILES  = ../../shared/*.c ../../shared/*.cc ../../client/network/*.c \
 	  ../../client/sysinfo/*.c ../../client/gui/*.cc 
--- h/hardware.h.orig	2004-12-14 07:59:53.156291016 +0930
+++ h/hardware.h	2004-12-14 08:00:11.667476888 +0930
@@ -105,7 +105,7 @@
        throw std::runtime_error("Unable to parse input stream.");
     }
 
-    friend class Parser : public xml::event_parser
+    class Parser : public xml::event_parser
     {
     public:
       Parser(drive_info *d) : di_(d) {}
@@ -141,7 +141,7 @@
 
     private:
       drive_info *di_;
-    }; // friend class Parser
+    }; // class Parser
 
   };
 
--- server/plugins/hash.c.orig	2004-12-14 08:01:55.161743368 +0930
+++ server/plugins/hash.c	2004-12-14 08:07:55.666590864 +0930
@@ -197,7 +197,7 @@
   /* Figure out how many hash types we have. */
   for (hid = static_cast<hashid>(0);
        hid <= static_cast<hashid>(mhash_count());
-       ++(static_cast<int>(hid))) {
+       ++hid) {
 
     const char *name = 0;
 
--- h/ButtonDlg.hpp.orig	2004-12-14 08:23:04.695922224 +0930
+++ h/ButtonDlg.hpp	2004-12-14 08:23:22.528211304 +0930
@@ -30,7 +30,7 @@
 #define Uses_TEvent
 #define Uses_MsgBox
 #include <tvision/tv.h>
-#include <tvision/dialogs.h>
+#include <tvision/tv/dialogs.h>
 
 class ButtonDlg : public TDialog
 {
--- h/FileTransferDlg.hpp.orig	2004-12-14 08:25:58.963429536 +0930
+++ h/FileTransferDlg.hpp	2004-12-14 08:26:14.771026416 +0930
@@ -30,7 +30,7 @@
 #define Uses_TEvent
 #define Uses_TStaticText
 #include <tvision/tv.h>
-#include <tvision/dialogs.h>
+#include <tvision/tv/dialogs.h>
 
 #include "ProgressBar.hpp"
 
--- h/SelectDiskDlg.hpp.orig	2004-12-14 08:26:29.287819528 +0930
+++ h/SelectDiskDlg.hpp	2004-12-14 08:26:38.650396200 +0930
@@ -34,7 +34,7 @@
 #define Uses_TFilterValidator
 
 #include <tvision/tv.h>
-#include <tvision/msgbox.h>
+#include <tvision/tv/msgbox.h>
 #include "ButtonDlg.hpp"
 
 
--- h/InfoBox.hpp.orig	2004-12-14 19:37:25.032224672 +0930
+++ h/InfoBox.hpp	2004-12-14 19:37:37.225371032 +0930
@@ -37,7 +37,7 @@
 #define Uses_TStaticText
 
 #include <tvision/tv.h>
-
+#include <tvision/tv/sttctext.h>
 
 extern void postInfo(int, const char *);