--- Make/makedefs.freebsd.orig	Wed Jan 16 04:08:27 2002
+++ Make/makedefs.freebsd	Tue May  7 18:34:36 2002
@@ -6,20 +6,20 @@
 DEPFILES = $(OBJS:.o=.d)
 
 
-C++ = g++
+C++ = ${CXX}
 YFLAGS = -d
 LCINCS += -I/usr/local/include -I/usr/X11R6/include
 LC++INCS += ${LCINCS}
-CFLAGS   = -O2 -W -Wall $(LCINCS)
+CFLAGS   += -W -Wall $(LCINCS)
 C++FLAGS = ${CFLAGS}
 CPPFLAGS = ${CFLAGS}
 
 SO_EXT = so
 DL_EXT = so
 
-FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib
+FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib -L/usr/X11R6/lib -rpath /usr/X11R6/lib
 
-LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib
+LDFLAGS = -W -Wall -pthread $(FREEBSD_LOCALLIBS)
 
 DYNAMICLIBRARYLIB = 
 PFLIBS = 
