--- configs/freebsd-g++-shared.orig	Tue Jul 20 11:45:01 1999
+++ configs/freebsd-g++-shared	Thu Aug 12 21:26:28 1999
@@ -1,33 +1,33 @@
 # Compiling
-SYSCONF_CXX		= g++
-SYSCONF_CC		= gcc
+SYSCONF_CXX		= $(SYS_CXX)
+SYSCONF_CC		= $(SYS_CC)
 
 # Compiling with support libraries
-SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_X11	= -I$(X11BASE)/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_OPENGL	= -I$(X11BASE)/include
 
 # Compiline YACC output
 SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
 
 # Linking with support libraries
 # X11
-SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_X11	= -L$(X11BASE)/lib
 SYSCONF_LIBS_X11	= -lXext -lX11 -lm
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
-SYSCONF_LIBS_QT		= -lqt
+SYSCONF_LIBS_QT		= -lqt2
 SYSCONF_LIBS_QT_OPENGL	= -lqgl
 # OpenGL
-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -L$(X11BASE)/lib
 SYSCONF_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
 
 # Linking applications
-SYSCONF_LINK		= g++
+SYSCONF_LINK		= $(SYS_CXX)
 SYSCONF_LFLAGS		= 
-SYSCONF_LIBS		= 
+SYSCONF_LIBS		= -lxpg4
 
 # Link flags shared objects
 SYSCONF_LFLAGS_SHOBJ	= -shared
@@ -40,17 +40,27 @@
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
-SYSCONF_LINK_SHLIB	= g++
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_SHLIB	= $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
 SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
 				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+				     -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
 				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
 				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
 				 cd $(DESTDIR) && \
-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+				 rm -f lib$(TARGET).so; \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
+else
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
+				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
+				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+				 cd $(DESTDIR) && \
+				 rm -f lib$(TARGET).so; \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
+endif
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
@@ -61,8 +71,8 @@
 SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -pipe -DNO_DEBUG -O2
-SYSCONF_CFLAGS		= -pipe -DNO_DEBUG -O2
+SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS) -DNO_DEBUG
+SYSCONF_CFLAGS		= $(SYS_CXXFLAGS) -DNO_DEBUG
 # Compiling library source
 SYSCONF_CXXFLAGS_LIB	= -fPIC
 SYSCONF_CFLAGS_LIB	= -fPIC