--- cf/FreeBSD.cf.orig	Wed Jun  9 04:53:53 2004
+++ cf/FreeBSD.cf	Wed Jun  9 04:56:47 2004
@@ -108,14 +108,14 @@
 # endif
 # define HasPosixThreads	YES
 # define ThreadedX		YES
-# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
+# define SystemMTDefines	%%PTHREAD_CFLAGS%%
 /*
  * FreeBSD has tread-safe api but no getpwnam_r yet.
  */
 # define HasThreadSafeAPI	YES
 # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
 # if HasLibPthread
-#  define ThreadsLibraries	-lpthread
+#  define ThreadsLibraries	%%PTHREAD_LIBS%%
 # else
 #  if OSRelVersion >= 500043
 #   define BuildThreadStubLibrary  NO
@@ -125,10 +125,10 @@
 #   define NeedUIThrStubs          YES
 #  endif
 #  if (OSRelVersion >= 500016)
-#   define ThreadsLibraries	-lc_r
+#   define ThreadsLibraries	%%PTHREAD_LIBS%%
 #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
 #  else
-#   define ThreadsLibraries	-pthread
+#   define ThreadsLibraries	%%PTHREAD_LIBS%%
 #  endif
 #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
 #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
@@ -442,14 +442,14 @@
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
 #ifndef DefaultGcc2i386Opt
 #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
+#define DefaultGcc2i386Opt
 #endif
 #endif
 
 #ifdef i386Architecture
 # define OptimizedCDebugFlags DefaultGcc2i386Opt
 #else
-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags
 #endif
 
 #ifndef PreIncDir