--- config/cf/host.def.orig	Fri May  7 20:22:03 2004
+++ config/cf/host.def	Wed May 12 21:58:55 2004
@@ -5,8 +5,8 @@
 #define XFree86CustomVersion "DRI trunk"
 
 /* You need this now */
-#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa
-#define DRMSrcDir /X11R6/SourceForge/DRI-freedesktop/drm
+#define MesaSrcDir $(TOP)/../Mesa
+#define DRMSrcDir $(TOP)/../drm
 
 
 /* Don't use any special flags by default, but leave this here commented out
@@ -25,6 +25,13 @@
 #endif
 */
 
+#define DefaultGcc2AxpOpt ${FBSDCFLAGS}
+#define DefaultGcc2PpcOpt ${FBSDCFLAGS}
+#define DefaultGcc2i386Opt ${FBSDCFLAGS}
+#define LibraryCDebugFlags ${FBSDCFLAGS}
+
+#define CcCmd ${FBSDCC}
+#define CplusplusCmd ${FBSDCXX}
 
 #define BuildXFree86ConfigTools YES
 
@@ -52,15 +59,17 @@
 
 #if defined(FreeBSDArchitecture) && defined(HasGcc3) && HasGcc3
 #define NoSystemWarn		-Wno-system-headers
+#define AliasingArg		-fno-strict-aliasing
 #else
 #define NoSystemWarn
+#define AliasingArg
 #endif
 
 #define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
                           -Wmissing-prototypes -Wmissing-declarations \
                           -Wredundant-decls -Wnested-externs -Wundef \
 			  NoSystemWarn
-#define DefaultCCOptions -ansi -pedantic GccWarningOptions -pipe -g
+#define DefaultCCOptions AliasingArg GccWarningOptions
 
 #define NormalLibGlx NO
 
@@ -87,7 +96,7 @@
 /* Optionally turn this on to change the place where you install the build.
  * Warning: trailing blanks will cause build failures.
  */
-/* #define ProjectRoot /usr/X11R6-DRI */
+#include "projectroot.def"
 
 /* #define UsrLibDir /usr/X11R6/lib */
 
