--- set_soenv.1.orig	Wed Feb 27 10:46:41 2002
+++ set_soenv.1	Wed Mar 13 19:13:01 2002
@@ -40,7 +40,7 @@
 #
 # Set this value equal to the corresponding amount of
 # command line arguments. 
-my $numArgs = 19;
+my $numArgs = 24;
 # Determining the amount of arguments in the call.
 my $numEnter = $#ARGV + 1;
 if ( $numEnter != $numArgs ) 
@@ -66,14 +66,15 @@
 my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
      $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, 
-     $TF_CFGDATA, $TF_SVDATA,
+     $TF_CFGDATA, $TF_SVDATA, $CC, $CXX,
      $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, 
      $USE_XPRINT, $BUILD_SOSL_RELEASE );
 #
 # Platform dependent constant values.
 my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, 
-     $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
-     $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
+     $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
+     $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS,
+     $PTHREAD_LIBS );
 #
 #-------------------------------------------
 # IIc. Declaring the environment variables.
@@ -145,6 +146,8 @@
 $STLPORT4	= $ARGV [ 12 ];     # Location of STLport4
 $MINGWIN32	= $ARGV [ 17 ];     # use MINGWIN32
 $USE_GCC3	= $ARGV [ 18 ];     # use gcc3 (only for unxlngi4 at the moment)
+$CC		= $ARGV [ 22 ];     # get cc from environment
+$CXX		= $ARGV [ 23 ];     # use c++ from environment
 #
 #---------------------------------------------------------------
 # IIIb. Initialising the variables for the system commands, etc.
@@ -303,7 +306,7 @@
    $PROSWITCH      = "-DPRODUCT";
    $XPVERSION      = "3";
    $SOLAR_JAVA	   = "TRUE"; 
-      $XPVERSION      = "3";
+   $XPVERSION      = "3";
 } 
 elsif ( $platform eq "$FreeBSD" ) 
 {     print "Setting FreeBSD specific values... ";
@@ -326,6 +329,9 @@
       $PATH_SEPERATOR = $ps;
       $PROSWITCH      = "-DPRODUCT";
       $XPVERSION      = "3";
+      $OSVERSION      = $ARGV[ 19 ];
+      $PTHREAD_CFLAGS = $ARGV[ 20 ];
+      $PTHREAD_LIBS   = $ARGV[ 21 ];
 } 
 elsif ( $platform eq "$Linux" ) 
 {
@@ -889,15 +895,16 @@
                         $D.$COM.
 			$D.$CVER.
                         $D.$GVER.
-                        $D."_PTHREADS".
                         $D.$OS.
                         $D.$CPUNAME;
 if  ($platform eq "$FreeBSD")
-{  $SOLARDEF         .= $D."X86";
+{  $SOLARDEF         .= $D."X86".
+                        $D."OSVERSION=$OSVERSION".
+			" ".$PTHREAD_CFLAGS;
 }
 $SOLARDEF            .= $D."_REENTRANT".
                         $D."_POSIX_PTHREAD_SEMANTICS";
-if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64"))
+if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
 {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
 }
 $SOLARDEF            .= $D."SUPD=$UPD".
@@ -990,7 +997,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.
@@ -1004,6 +1011,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$//;
@@ -1107,21 +1130,14 @@
 	$SOLARINC            .= $I.$USR.$INCLUDE;
 }
 $SOLARINC	     .= $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") || ($platform eq "$FreeBSD"))
 {
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
@@ -1311,8 +1327,13 @@
 ToFile( "GLIBC",             $GLIBC,             "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "GUIENV",            $GUIENV,            "e" );
+ToFile( "CC",                $CC,                "e" );
+ToFile( "CXX",               $CXX,               "e" );
 ToFile( "GVER",              $GVER,              "e" );
 ToFile( "OS",                $OS,                "e" );
+ToFile( "OSVERSION",         $OSVERSION,         "e" );
+ToFile( "PTHREAD_CFLAGS",    $PTHREAD_CFLAGS,    "e" );
+ToFile( "PTHREAD_LIBS",      $PTHREAD_LIBS,      "e" );
 ToFile( "OUTPATH",           $OUTPATH,           "e" );
 ToFile( "INPATH",            $INPATH,            "e" );
 ToFile( "GVERDIR",           $GVERDIR,           "e" );