--- lib/freebsd-g++/tmake.conf.orig	2004-02-29 18:20:42 UTC
+++ lib/freebsd-g++/tmake.conf
@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
 TMAKE_CFLAGS		= -pipe -fno-exceptions
 TMAKE_CFLAGS_WARN_ON	= -Wall -W
 TMAKE_CFLAGS_WARN_OFF	= -w
-TMAKE_CFLAGS_RELEASE	= -O2
+TMAKE_CFLAGS_RELEASE	=
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
@@ -29,12 +29,12 @@ TMAKE_CXXFLAGS_THREAD	= $$TMAKE_CFLAGS_THREAD
 
 TMAKE_INCDIR		= /usr/local/include
 TMAKE_LIBDIR		= /usr/local/lib
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
+TMAKE_INCDIR_X11	= /usr/local/include
+TMAKE_LIBDIR_X11	= /usr/local/lib
 TMAKE_INCDIR_QT		= $(QTDIR)/include
 TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+TMAKE_INCDIR_OPENGL	= /usr/local/include
+TMAKE_LIBDIR_OPENGL	= /usr/local/lib
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++