--- Makefile.in.orig	Wed Apr  9 08:10:49 2003
+++ Makefile.in	Wed Apr  9 08:14:06 2003
@@ -82,8 +82,7 @@
 install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
 
 install:: install-lib install-dev install-aclocal
-	-$(LDCONFIG)
-	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
+	@if false ; \
 	then								\
 		echo "*************************************************" ; \
 		echo "*************************************************" ; \
--- dlls/msi/Makefile.in.orig	Wed Aug 13 03:27:48 2003
+++ dlls/msi/Makefile.in	Fri Aug 15 10:50:59 2003
@@ -26,6 +26,8 @@
 
 @MAKE_DLL_RULES@
 
+tokenize.c: y.tab.h
+
 y.tab.c y.tab.h: sql.y
 	$(YACC) -d -t $(SRCDIR)/sql.y
 
--- scheduler/pthread.c.orig	2003-10-17 12:53:46.000000000 +0200
+++ scheduler/pthread.c	2003-10-17 12:54:16.000000000 +0200
@@ -180,7 +180,9 @@
         descr = &initial_descr;
         writejump( "__errno_location", __errno_location );
         writejump( "__h_errno_location", __h_errno_location );
+#if !defined(__FreeBSD__)
         writejump( "__res_state", __res_state );
+#endif
     }
     descr->cancel_state = PTHREAD_CANCEL_ENABLE;
     descr->cancel_type  = PTHREAD_CANCEL_ASYNCHRONOUS;