--- Xmakefile.orig	Fri Jan 31 23:47:59 1997
+++ Xmakefile	Tue Aug 19 11:56:52 2003
@@ -77,17 +77,27 @@
 #UILFLAGS=-I/usr/include/uil -I/usr/include/Motif1.2/uil
 ###
 
+## FreeBSD
+##
+XINCLUDES=-I$(LOCALBASE)/include
+UILFLAGS=
+CFLAGS+= -fhandle-exceptions -fno-for-scope
+CXXFLAGS+= $(XINCLUDES)
+LDFLAGS+=-L$(LOCALBASE)/lib
+LDLIBS=
+MOTIFLIBS=-lXm -lXmu -lXt -lX11 ${MOTIFLIB}
+
 #LDLIBS = -lPW
 # Program configuration
 # ---------------------
 
-LDFLAGS = ${XLIBS} $(MRMLIBS)
-MOTIFLIBS = -lXm -lXmu -lXt -lX11
+#LDFLAGS = ${XLIBS} $(MRMLIBS)
+#MOTIFLIBS = -lXm -lXmu -lXt -lX11
 
-CFLAGS= -g -I. ${XINCLUDES} $(UILFLAGS)
-CCFLAGS=${CFLAGS} 
+#CFLAGS+= ${XINCLUDES} $(UILFLAGS)
+#CCFLAGS=${CFLAGS} 
 
-UIL=uil
+#UIL=uil
 
 #MOTIFLIBS = -lXm -lXt -lX11 -lPW
 
@@ -122,7 +132,7 @@
 
 CaribbeanStud:  $(OBJS)
 	rm -f $@
-	$(CCC) $(CCFLAGS) -o $@  $(OBJS) $(LDFLAGS)  $(LDLIBS)  $(MOTIFLIBS)
+	$(CXX) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS) $(MOTIFLIBS)
  
 depend:: $(SRCS) $(HEADERS)
 	makedepend $(CFLAGS) $(CPPFLAGS) -- $(ALLDEFINES) -- $(SRCS)
@@ -134,5 +144,5 @@
 
 .SUFFIXES:  .cpp $(SUFFIXES)
 .cpp.o:
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
+	$(CXX) -c $(CXXFLAGS) $(OUTPUT_OPTION) $<