--- tmake/lib/freebsd-g++/tmake.conf.orig	Wed Jul 28 11:21:38 1999
+++ tmake/lib/freebsd-g++/tmake.conf	Sun Jun  2 09:46:54 2002
@@ -8,16 +8,16 @@
 CONFIG			= qt warn_on release
 
 TMAKE_CC		= gcc
-TMAKE_CFLAGS		= -pipe
+TMAKE_CFLAGS		= %%CFLAGS%%
 TMAKE_CFLAGS_WARN_ON	= -Wall -W
 TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
-TMAKE_CFLAGS_DEBUG	= -g
+TMAKE_CFLAGS_RELEASE	=
+TMAKE_CFLAGS_DEBUG	=
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
 TMAKE_CXX		= g++
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
+TMAKE_CXXFLAGS		= %%CXXFLAGS%%
 TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
 TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
 TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
@@ -27,12 +27,12 @@
 
 TMAKE_INCDIR		=
 TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/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_X11       = $(X11BASE)/include
+TMAKE_LIBDIR_X11       = $(X11BASE)/lib
+TMAKE_INCDIR_QT                = %%QT_INC%%
+TMAKE_LIBDIR_QT                = %%QT_LIB%%
+TMAKE_INCDIR_OPENGL    = $(X11BASE)/include
+TMAKE_LIBDIR_OPENGL    = $(X11BASE)/lib
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++
@@ -44,13 +44,13 @@
 # soname does not work on fbsd 2.x
 #TMAKE_LFLAGS_SONAME	= -Wl,-soname
 
-TMAKE_LIBS		=
+TMAKE_LIBS		= %%THREADLIBS%%
 TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
-TMAKE_LIBS_QT_OPENGL	= -lqgl
+TMAKE_LIBS_QT          = %%LIBQT%%
+TMAKE_LIBS_QT_OPENGL   = %%QT_OPENGL%%
 TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
 
-TMAKE_MOC		= moc
+TMAKE_MOC              = %%MOC%%
 
 TMAKE_AR		= ar cqs
 TMAKE_RANLIB		=