--- set_soenv.1.orig	Thu Mar  7 16:23:57 2002
+++ set_soenv.1	Thu Mar  7 16:24:14 2002
@@ -954,7 +954,7 @@
                         $ps.$USR.$LIB.
                         $ps.$USR_LOCAL.$BIN;
 }
-elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
 {  $PATH              = $cur_dir.
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -968,6 +968,22 @@
                         $ps.$USR.$BIN.$ds."X11".
                         $ps.$USR.$LIB;
 }
+elsif ($platform eq "$FreeBSD")
+{  $PATH              = $cur_dir.
+                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+                        $ps.'$SOLARENV'.$BIN.
+                        $ps.'$JAVA_HOME'.$BIN.
+			$ps.$USR_LOCAL.$BIN.
+			$ps.$USR_LOCAL.$ds."sbin";
+
+   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
+
+   $PATH             .= $ps.$USR.$ds."sbin".
+                        $ps.$USR.$ds."X11R6".$ds."bin".
+                        $ps.$USR.$LIB;
+}
+
 elsif ($platform eq "$Winnt")
 {  $COMPATH_ROOT      = $COMPATH;
    $COMPATH_ROOT      =~ s/\/vc98$//;
@@ -1067,25 +1083,19 @@
 {
 $SOLARINC            .= $I.$USR.$INCLUDE.
 			$STLPORT_stlport;
-if ($platform eq "$Linux")
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC            .= $STLPORT_inc_stlport;
-}
+
 if ($platform eq "$Solaris")
 {
 $SOLARINC            .= '/SC5 ';
-}
-# Platform dependent include path at the top of this list of include paths
-if ($platform eq "$Solaris") 
-{  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
+$SOLARINC         .= $I.'$COMPATH'.$ds."include";
 }
 
-if ($platform eq "$Linux")
+if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
 {
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
 }
+
 $SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
                         $I.'$JAVA_HOME'.$INCLUDE;