Make openoffice compile with gcc from ports, or just with CC=$CC and

CXX=$CXX, like it should normally be. Usable options are:

USEPORTGCC295=YES, USEPORTGCC31=YES and USEPORTGCC32=YES

Add a lot off gcc3.x fixes, make included stlport compile with CURRENT.

Next step will be to include a mozilla build, so we can link openoffice
against mozilla librarys without c++ compat problems.

12 files changed, 1228 insertions, 26 deletions

diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
index c580d786d05..fecb7f038d5 100644
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Wed Mar 27 20:32:56 2002
-+++ configure.in	Tue Apr  2 23:56:37 2002
+--- configure.in.orig	Wed Apr 17 22:37:42 2002
++++ configure.in	Tue May 28 11:44:41 2002
 @@ -103,6 +103,12 @@
  
                            Usage: --with-asm-home=<path to ml.exe directory>
@@ -13,6 +13,15 @@
  AC_ARG_WITH(unzip-home,
  [  --with-unzip-home         For Windows users, please supply the path for 
                            unzip.exe.
+@@ -241,7 +247,7 @@
+ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
+    AC_PROG_CC
+ fi
+-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
++if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
+    dnl ******************************************
+    dnl Testing for GNU compiler and version...
+    dnl ******************************************
 @@ -277,13 +283,13 @@
  
     if test $GCC; then
@@ -46,17 +55,91 @@
                if test "$_gcc_minor" = "false"; then
                   AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
                   AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-@@ -367,7 +373,8 @@
+@@ -366,8 +372,9 @@
+                      _gcc_include_path="NO_GCC_INCLUDE"
                    fi
                 else
- 		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+-		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
 -                  _gcc_include_path="/usr/include/g++"
++		if test "$_os" = "NetBSD" ; then
 +                  _gcc_include_path="/usr"
 +                  _gxx_include_path="/usr/include/g++"
  		else
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
-@@ -815,6 +822,10 @@
+@@ -408,6 +415,71 @@
+       fi
+    fi
+ fi
++if test "$_os" = "FreeBSD"; then
++       dnl ******************************************
++       dnl Testing for GNU compiler and version...
++       dnl Adapted to the FreeBSD ports system
++       dnl ******************************************
++       dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
++       if test -n "$enable_gcc3"; then
++               _gccincname1="g++-v3"
++       else
++               _gccincname1="g++-3"
++       fi
++       if test -z "$CC"; then
++               CC="cc";
++       fi
++       if test -z "$CXX"; then
++               CXX="c++";
++       fi
++       if which $CC; then
++               _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'`
++               _gcc_version=`$CC -dumpversion`
++               _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'`
++               _gcc_machine=`$CC -dumpmachine`
++       else
++               COMPATH="NO_GCC"
++       fi
++       if test -n "$enable_gcc3"; then
++               if test "$_gcc_major" != "3"; then
++                       AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested])
++                       COMPATH="NO_GCC"
++               fi
++       else
++               if test "$_gcc_major" != "2"; then
++                       AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
++                       AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
++                      COMPATH="NO_GCC"
++               else
++                       _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
++                       if test "$_gcc_middle" = "false"; then
++                               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
++                               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
++                               COMPATH="NO_GCC"
++                       else
++                               _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
++                               if test "$_gcc_minor" = "false"; then
++                                       AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
++                                       AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
++                                       COMPATH="NO_GCC"
++                               fi
++                       fi
++               fi
++       fi
++       if test "$COMPATH" != "NO_GCC"; then
++               if test $CC != "gcc" -o $CC != "cc"; then
++                       _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include"
++                       _gxx_include_path="$_gcc_include_path/g++"
++               else
++                       _gcc_include_path="$PREFIX"
++                       _gxx_include_path="$_gcc_include_path/g++"
++               fi
++       else
++               AC_MSG_WARN([no gcc compiler found])
++               AC_MSG_WARN([no gcc compiler found]) >> warn
++       fi
++fi
++
+ if test "$_os" = "Darwin"; then
+    if test "$CC" = "cc"; then
+       AC_PATH_PROGS(_cc, cc)
+@@ -815,6 +887,10 @@
     fi
     if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -67,12 +150,12 @@
     fi
     if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -1182,7 +1193,7 @@
+@@ -1201,7 +1277,7 @@
  
  # Executing the set_soenv script to setup the environment variables.
  if test -z "$enable_check_only"; then
 -   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
-+   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
++   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX
  else
     echo
     echo Test Complete
diff --git a/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh
new file mode 100644
index 00000000000..d60afa8e32e
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh
@@ -0,0 +1,244 @@
+--- ../dmake/unix/linux/gnu/make.sh.orig	Wed Mar 13 20:32:53 2002
++++ ../dmake/unix/linux/gnu/make.sh	Wed Mar 13 20:33:00 2002
+@@ -3,188 +3,188 @@
+ mkdir objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
+ fi
+ mv infer.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
+ fi
+ mv make.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
+ fi
+ mv stat.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
+ fi
+ mv expand.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
+ fi
+ mv dmstring.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
+ fi
+ mv hash.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
+ fi
+ mv dag.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
+ fi
+ mv dmake.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
+ fi
+ mv path.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
+ fi
+ mv imacs.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
+ fi
+ mv sysintf.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
+ fi
+ mv parse.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
+ fi
+ mv getinp.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
+ fi
+ mv quit.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
+ fi
+ mv state.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
+ fi
+ mv dmdump.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
+ fi
+ mv macparse.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
+ fi
+ mv rulparse.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
+ fi
+ mv percent.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
+ fi
+ mv function.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
+ fi
+ mv arlib.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
+ fi
+ mv dirbrk.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
+ fi
+ mv rmprq.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
+ fi
+ mv ruletab.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
+ fi
+ mv runargv.o objects
+ 
+ if test $platform = sparc -o $platform = sparc64; then
+-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
++${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
+ else
+-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
++${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
+ fi
+ mv dcache.o objects
+ 
+-gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
++${CC} ${CFLAGS} -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
+ objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
+ objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
+ objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
diff --git a/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk b/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk
new file mode 100644
index 00000000000..9773406f4ed
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk
@@ -0,0 +1,26 @@
+--- ../product/settings/settings.mk.orig	Wed May 29 00:16:16 2002
++++ ../product/settings/settings.mk	Wed May 29 00:18:00 2002
+@@ -83,9 +83,8 @@
+ 
+ OS=SOLARIS
+ PS=/
+-CC=CC
+-LINK=CC
+-LIB=CC
++LINK=$(CC)
++LIB=$(CC)
+ ECHO=@echo
+ MKDIR=mkdir -p
+ CAT=cat
+@@ -136,9 +135,8 @@
+ OS=LINUX
+ PLATFORM=linux
+ PS=/
+-CC=gcc
+-LINK=gcc
+-LIB=gcc
++LINK=$(CC)
++LIB=$(CC)
+ ECHO=@echo
+ MKDIR=mkdir -p
+ CAT=cat
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk
new file mode 100644
index 00000000000..7a5af08c281
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk
@@ -0,0 +1,282 @@
+--- ../solenv/inc/_tg_shl.mk.orig	Wed Jan  2 12:23:22 2002
++++ ../solenv/inc/_tg_shl.mk	Tue May 28 12:02:12 2002
+@@ -345,22 +345,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -770,22 +770,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -1195,22 +1195,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -1620,22 +1620,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -2045,22 +2045,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -2470,22 +2470,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -2895,22 +2895,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -3320,22 +3320,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -3745,22 +3745,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
+@@ -4170,22 +4170,22 @@
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(OS)"=="SOLARIS"
+ .IF "$(COM)"=="GCC"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE		
+-		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF		
+ .ENDIF
+ .IF "$(OS)"=="MACOSX"
+-		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@echo "------------------------------"
+ 		@echo "Updating static data member initializations"
+ 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+ .ENDIF
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+-		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF
+ .IF "$(OS)"=="IRIX"
+-		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
+ 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
+ .ENDIF			# "$(OS)"=="IRIX"
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk
new file mode 100644
index 00000000000..6c8e958c188
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk
@@ -0,0 +1,141 @@
+--- ../solenv/inc/pstrules.mk.orig	Thu Mar 14 17:40:59 2002
++++ ../solenv/inc/pstrules.mk	Thu Mar 14 17:41:44 2002
+@@ -80,15 +80,15 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ .IF "$(COM)"=="BLC"
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ .ENDIF
+ .ENDIF
+ 
+@@ -108,15 +108,15 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ .IF "$(COM)"=="BLC"
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ .ENDIF
+ .ENDIF
+ 
+@@ -142,15 +142,15 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ .IF "$(COM)"=="BLC"
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ .ENDIF
+ .ENDIF
+ 
+@@ -159,23 +159,23 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
++	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
++	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE
+ .IF "$(GUI)"=="MAC"
+ 	@$(RM) $@
+-	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
++	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ .ELSE
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ 	@+echo.
+ .IF "$(COM)"=="GCC"
+-	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
++	$(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
+ .ELSE
+-	$(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
++	$(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ .ENDIF
+ 	$(SEMADEBUG)
+ .ENDIF
+@@ -195,15 +195,15 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ .IF "$(COM)"=="BLC"
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ .ENDIF
+ .ENDIF
+ 
+@@ -212,19 +212,19 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
++	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ .IF "$(GUI)"=="MAC"
+ 	@$(RM) $@
+-	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
++	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+ .IF "$(COM)"=="GCC"
+-	   $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
++	   $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
+ .ELSE
+ 	   +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+-	   $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
++	   $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+ .ENDIF
+ .ENDIF
+ .ENDIF
+@@ -246,7 +246,7 @@
+ 	@echo Making: $@
+ 	@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
+ .IF "$(GUI)"=="OS2"
+-	$(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
++	$(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ .ENDIF
+ .IF "$(GUI)"=="WNT"
+ 	cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk
new file mode 100644
index 00000000000..181a7130714
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk
@@ -0,0 +1,212 @@
+--- ../solenv/inc/rules.mk.orig	Thu Mar 14 17:31:43 2002
++++ ../solenv/inc/rules.mk	Thu Mar 14 17:38:38 2002
+@@ -78,16 +78,16 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ 	@+echo.
+ .IF "$(COM)"=="GCC"
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
+ .ELSE
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ .ENDIF
+ .ENDIF
+ 
+@@ -98,16 +98,16 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ 	@+echo.
+ .IF "$(COM)"=="GCC"
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
+ .ELSE
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ .ENDIF
+ .ENDIF
+ 
+@@ -122,17 +122,17 @@
+ .ENDIF
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE			# "$(GUI)"=="UNX"
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ 	@+echo.
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ .ENDIF			# "$(GUI)"=="UNX"
+ 
+ $(SLO)$/%.obj : %.cpp
+@@ -140,17 +140,17 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ 	@+echo.
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ .ENDIF
+ 
+ $(SLO)$/%.obj : $(MISC)$/%.cxx
+@@ -158,16 +158,16 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ 	@+echo.
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ .ENDIF
+ 
+ $(OBJ)$/%.obj : $(MISC)$/%.cxx
+@@ -175,16 +175,16 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
++	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ 	@+echo.
+-	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
++	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ .ENDIF
+ 
+ $(OBJ)$/%.obj : %.c
+@@ -192,20 +192,20 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(TEST)"!=""
+-	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
++	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
++	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ENDIF
+ .ELSE
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ 	@+echo.
+ .IF "$(COM)"=="GCC"
+-	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
++	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
+ .ELSE
+ 	+-@echo Cflags: $(CFLAGS)
+-	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
++	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ .ENDIF
+ 	$(SEMADEBUG)
+ .ENDIF
+@@ -215,13 +215,13 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
++	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ 	@+echo.
+-	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
++	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ 	$(SEMADEBUG)
+ .ENDIF
+ 
+@@ -230,16 +230,16 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
++	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+-	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
++	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ 	@+echo.
+ .IF "$(COM)"=="GCC"
+-	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
++	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
+ .ELSE
+-	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
++	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ .ENDIF
+ 	$(SEMADEBUG)
+ .ENDIF
+@@ -249,14 +249,14 @@
+ 	@echo Making: $@
+ .IF "$(GUI)"=="UNX"
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
++	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+ 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
+ .ELSE
+ 	@+if exist $@ $(RM) /q $@ >& nul
+ .IF "$(COM)"=="GCC"
+-	   $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
++	   $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
+ .ELSE
+-	   $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
++	   $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
+ .ENDIF
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk
new file mode 100644
index 00000000000..ea6a898a9a6
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk
@@ -0,0 +1,19 @@
+--- ../solenv/inc/settings.mk.orig	Fri Mar  8 10:23:21 2002
++++ ../solenv/inc/settings.mk	Tue May 28 12:56:27 2002
+@@ -166,7 +166,6 @@
+ CDEFSOPT=
+ HDEFS=
+ 
+-CC=
+ .IF "$(add_cflags)"!=""
+ ENVCFLAGS+=$(add_cflags)
+ .ENDIF
+@@ -264,8 +263,6 @@
+ AS=
+ BC=
+ COBOL=
+-CPP=
+-CXX=
+ FOR=
+ PASCAL=
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk
new file mode 100644
index 00000000000..0c1b107de98
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk
@@ -0,0 +1,5 @@
+--- /dev/null   Mon Mar 11 14:55:01 2002
++++ ../solenv/inc/startup/FREEBSD/macros.mk     Mon Mar 11 14:54:59 2002
+@@ -0,0 +1,2 @@
++
++.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk
new file mode 100644
index 00000000000..958b4abba55
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_shl.mk.orig	Wed Mar 13 20:40:10 2002
++++ ../solenv/inc/tg_shl.mk	Wed Mar 13 20:41:10 2002
+@@ -319,9 +319,9 @@
+ .IF "$(GUI)" == "WNT"
+ .IF "$(UPDATER)"=="YES"
+ .IF "$(COM)"=="GCC"
+-			gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ELSE
+-			cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
++			$(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ .ENDIF			# "$(COM)"=="GCC"
+ .ENDIF			# "$(UPDATER)"=="YES"
+ .IF "$(SHL$(TNR)DEFAULTRES)"!=""
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
index 99a282f3b5c..64c6e700ad1 100644
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -1,12 +1,12 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Wed Oct 24 19:21:47 2001
-+++ ../solenv/inc/unxfbsdi.mk	Sat Mar  9 23:28:50 2002
-@@ -1,84 +1,145 @@
++++ ../solenv/inc/unxfbsdi.mk	Wed May 29 14:32:50 2002
+@@ -1,84 +1,148 @@
 -
  # mak file fuer unxfbsdi
  
 -ASM=
 -AFLAGS=
-+ASM=gcc
++ASM=$(CC)
 +AFLAGS=-x assembler-with-cpp -c $(CDEFS)
  
  SOLAR_JAVA=TRUE
@@ -16,12 +16,6 @@
 +# not needed at the moment
  LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
  
-+# name of C Compiler
-+cc=gcc
-+
-+# name of C++ Compiler
-+CC=g++
-+
 +# options for C and C++ Compiler
 +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION)
 +CDEFS+=$(PTHREAD_CFLAGS)
@@ -57,6 +51,14 @@
 +# Compiler flags for compiling static object in single threaded
 +# environment with character user interface
 +CFLAGSOBJCUIST=-fPIC
++
++# Compiler flags for compiling static object in multi threaded
++# environment with graphical user interface
++CFLAGSOBJGUIMT=-fPIC
++
++# Compiler flags for compiling static object in multi threaded
++# environment with character user interface
++CFLAGSOBJCUIMT=-fPIC
  
 -cc=				gcc
 -CC=				g++
@@ -76,14 +78,6 @@
 -CFLAGSSLOCUIMT=	-fPIC
 -CFLAGSPROF=     -pg
 -CFLAGSDEBUG=	-g
-+# Compiler flags for compiling static object in multi threaded
-+# environment with graphical user interface
-+CFLAGSOBJGUIMT=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
-+CFLAGSOBJCUIMT=-fPIC
-+
 +# Compiler flags for compiling shared object in multi threaded
 +# environment with graphical user interface
 +CFLAGSSLOGUIMT=-fPIC
@@ -124,7 +118,7 @@
 +STATIC=-Wl,-Bstatic
 +DYNAMIC=-Wl,-Bdynamic
 +
-+LINK=gcc
++LINK=$(CC)
  LINKFLAGS=
 +
 +# linker flags for linking applications
@@ -172,6 +166,15 @@
 +# STLport always needs pthread.
 +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
 +LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
++
++.IF "$(CVER)"=="C300"
++STDLIBGUIMT+= -lsupc++
++STDLIBCUIMT+= -lsupc++
++STDSHLGUIMT+= -lsupc++
++STDSHLCUIMT+= -lsupc++
++LIBSTLPORT+= -lsupc++
++LIBSTLPORTST+= -lsupc++
++.ENDIF
  
 +# default objectfilenames to lin
  STDOBJGUI=
@@ -195,7 +198,7 @@
  
  IMPLIB=
  IMPLIBFLAGS=
-@@ -87,12 +148,12 @@
+@@ -87,12 +151,12 @@
  MAPSYMFLAGS=
  
  RC=irc
diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
new file mode 100644
index 00000000000..83b4a7359d1
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
@@ -0,0 +1,141 @@
+--- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
++++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
+@@ -174,3 +174,138 @@
+   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
+   public:
+     __Named_exception(const string& __str) 
++--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
+++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
++@@ -5,8 +5,8 @@
++ #
++ # compiler
++ #
++-CC = gcc -pthread
++-CXX = c++ -pthread -fexceptions
+++CC+= ${PTHREAD_CFLAGS}
+++CXX+= ${PTHREAD_CFLAGS} -fexceptions
++ 
++ #
++ # Basename for libraries
++@@ -19,7 +19,7 @@
++ #
++ LINK=ar cr
++ # 2.95 flag
++-DYN_LINK=c++ -pthread -fexceptions -shared -o
+++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
++ 
++ OBJEXT=o
++ DYNEXT=so
++@@ -41,8 +41,8 @@
++ 
++ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
++ 
++-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
++-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
+++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
++ 
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
++--- /dev/null	Tue May 28 22:55:00 2002
+++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
++@@ -0,0 +1,59 @@
+++#
+++# Note : this makefile is for gcc-3 !
+++#
+++
+++#
+++# compiler
+++#
+++CC+= ${PTHREAD_CFLAGS}
+++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++
+++#
+++# Basename for libraries
+++#
+++LIB_BASENAME = libstlport_gcc
+++
+++#
+++# guts for common stuff
+++#
+++#
+++LINK=ar cr
+++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
+++
+++OBJEXT=o
+++DYNEXT=so
+++STEXT=a
+++RM=rm -rf
+++PATH_SEP=/
+++MKDIR=mkdir -p
+++COMP=GCC-FREEBSD
+++INSTALL_STEP = install_unix 
+++
+++all:  all_dynamic all_static symbolic_links 
+++
+++include common_macros.mak
+++
+++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+++
+++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+++
+++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
+++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
+++
+++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+++
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++
+++include common_percent_rules.mak
+++include common_rules.mak
+++
+++
+++#install: all
+++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+++
+++#%.s: %.cpp
+++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+++
+++
++--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
+++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
++@@ -21,6 +21,9 @@
++ #  include <stl/_prolog.h>
++ # endif
++ 
+++#ifdef __FreeBSD__
+++# include <../wchar.h>
+++#endif
++ # include <stl/_cwchar.h>
++ 
++ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
++--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig	Tue May 28 23:46:40 2002
+++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h	Tue May 28 23:54:30 2002
++@@ -226,8 +226,13 @@
++ 
++ # if (__GNUC__ >= 3)
++ 
+++#ifdef __FreeBSD__
+++#  define _STLP_NATIVE_INCLUDE_PATH ../g++
+++#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
+++#else
++ #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++ #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+++#endif
++ 
++ # elif (__GNUC_MINOR__ < 8)
++ 
++@@ -261,7 +266,11 @@
++ # if defined(__DJGPP)
++ #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
++ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
+++#ifdef __FreeBSD__
+++#   define _STLP_NATIVE_INCLUDE_PATH ../include/g++
+++#else
++ #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
+++#endif
++ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
++ #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
++ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk
new file mode 100644
index 00000000000..c55d863b689
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk
@@ -0,0 +1,32 @@
+--- ../stlport/makefile.mk.orig	Tue Mar 19 15:49:17 2002
++++ ../stlport/makefile.mk	Tue May 28 23:03:45 2002
+@@ -106,11 +106,29 @@
+ 
+ .IF "$(COM)"=="GCC"
+ .IF "$(COMID)"=="gcc3"
++
++.IF "$(OS)"=="FREEBSD"
++BUILD_FLAGS=-f gcc-3.0-freebsd.mak
++.ELSE
+ BUILD_FLAGS=-f gcc-3.0.mak
++.ENDIF
++
+ .ELSE # "$(COMID)"=="gcc3"
++
++.IF "$(OS)"=="FREEBSD"
++BUILD_FLAGS=-f gcc-freebsd.mak
++.ELSE
+ BUILD_FLAGS=-f gcc.mak
++.ENDIF
++
+ .ENDIF # "$(COMID)"=="gcc3"
++
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=gmake
++.ELSE
+ BUILD_ACTION=make
++.ENDIF
++
+ .ENDIF
+ 
+ .IF "$(COM)"=="C52"