--- Make/makedefs.orig	Sun Dec  5 11:03:43 2004
+++ Make/makedefs	Mon Feb  7 10:59:22 2005
@@ -402,24 +402,35 @@
 
 #### FreeBSD specific definitions
 ifeq ($(OS),FreeBSD)
-  C++               = g++
+  C++               = ${CXX}
   DEPARG            = -MM
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
+  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
   DEF               += -W -Wall
-  OPTF              = -O2 
+  OPTF              ?= -O2
   DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
   SHARED            = -shared
   ARCH              = 
   ARCHINST          = 
   ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread
  DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXmu -lX11
   SOCKET_LIBS       = 
-  OTHER_LIBS        = -lOpenThreads
+  OTHER_LIBS        = -lOpenThreads ${PTHREAD_LIBS}
+  # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port
+  INST_LOCATION     = ${PREFIX}
+  INST_SHARE        = ${PREFIX}/share
+  INST_EXAMPLES     = ${EXAMPLESDIR}/bin
+  INST_EXAMPLE_SRC  = ${EXAMPLESDIR}/src
+  INST_DOC          = ${DOCSDIR}
+  INST_SRC          = ${EXAMPLESDIR}/src
+  INST_DATA         = ${DATADIR}
+  INSTBINCMD        = ${BSD_INSTALL_PROGRAM}
+  INSTDEVCMD        = ${BSD_INSTALL_DATA}
+  LIBXML2_INCLUDE   = -I${LOCALBASE}/include/libxml2
   PNG_LIBS          = -lpng
   JPEG_LIBS         = -ljpeg
   TIFF_LIB          = -ltiff