remove 1.0.1

author: Seth Chandler <sethbc@gentoo.org> 2003-03-31 23:08:03 +0000
committer: Seth Chandler <sethbc@gentoo.org> 2003-03-31 23:08:03 +0000
commit: 3d37927b2579c35da6927b1b92c19fb035b86b8e (patch)
tree: c07be917e1b12ec200e8915dba32650d29b48ab3 /app-office
parent: added dev version, marked 1.0.5 x86 (diff)
download: historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.tar.gz
historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.tar.bz2
historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.zip
24 files changed, 0 insertions, 3538 deletions
diff --git a/app-office/openoffice/files/1.0.1/freetype-2.1.2.patch b/app-office/openoffice/files/1.0.1/freetype-2.1.2.patch
deleted file mode 100644
index 21202e315309..000000000000
--- a/app-office/openoffice/files/1.0.1/freetype-2.1.2.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ru misc/freetype-2.1.2/builds/compiler/visualc.mk misc/build/freetype-2.1.2/builds/compiler/visualc.mk
---- misc/freetype-2.1.2/builds/compiler/visualc.mk	2000-12-14 00:44:33.000000000 +0100
-+++ misc/build/freetype-2.1.2/builds/compiler/visualc.mk	2002-09-20 10:20:11.000000000 +0200
-@@ -63,7 +63,7 @@
- #   ANSI compliance.
- #
- ifndef CFLAGS
--  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
- endif
- 
- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-diff -ru misc/freetype-2.1.2/builds/unix/ltmain.sh misc/build/freetype-2.1.2/builds/unix/ltmain.sh
---- misc/freetype-2.1.2/builds/unix/ltmain.sh	2002-03-05 16:09:59.000000000 +0100
-+++ misc/build/freetype-2.1.2/builds/unix/ltmain.sh	2002-09-20 10:20:11.000000000 +0200
-@@ -643,7 +643,7 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $srcfile -DPIC $pic_flag"
-       else
- 	# All platforms use -DPIC, to notify preprocessed assembler code.
- 	command="$base_compile $srcfile $pic_flag -DPIC"
-@@ -2274,7 +2274,7 @@
- 	  ;;
- 
- 	irix)
--	  major=`expr $current - $age + 1`
-+	  major=`expr $current - $age`
- 	  verstring="sgi$major.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
-diff -ru misc/freetype-2.1.2/include/freetype/config/ftmodule.h misc/build/freetype-2.1.2/include/freetype/config/ftmodule.h
---- misc/freetype-2.1.2/include/freetype/config/ftmodule.h	2002-05-21 16:13:00.000000000 +0200
-+++ misc/build/freetype-2.1.2/include/freetype/config/ftmodule.h	2002-09-20 10:21:40.000000000 +0200
-@@ -1,7 +1,9 @@
- FT_USE_MODULE(autohint_module_class)
- FT_USE_MODULE(cff_driver_class)
- FT_USE_MODULE(t1cid_driver_class)
-+/*
- FT_USE_MODULE(pcf_driver_class)
-+*/
- FT_USE_MODULE(bdf_driver_class)
- FT_USE_MODULE(psaux_module_class)
- FT_USE_MODULE(psnames_module_class)
-@@ -13,4 +15,6 @@
- FT_USE_MODULE(t1_driver_class)
- FT_USE_MODULE(t42_driver_class)
- FT_USE_MODULE(pfr_driver_class)
-+/*
- FT_USE_MODULE(winfnt_driver_class)
-+*/
-diff -ru misc/freetype-2.1.2/include/freetype/config/ftoption.h misc/build/freetype-2.1.2/include/freetype/config/ftoption.h
---- misc/freetype-2.1.2/include/freetype/config/ftoption.h	2002-09-20 09:58:44.000000000 +0200
-+++ misc/build/freetype-2.1.2/include/freetype/config/ftoption.h	2002-09-20 10:20:11.000000000 +0200
-@@ -101,7 +101,10 @@
-   /*   All convenience functions are declared as such in their             */
-   /*   documentation.                                                      */
-   /*                                                                       */
-+/*
- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+*/
-+#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
- 
- 
-   /*************************************************************************/
-@@ -139,8 +142,10 @@
-   /*   use a vector `plotter' format that isn't supported when this        */
-   /*   macro is undefined.                                                 */
-   /*                                                                       */
-+/*
- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
--
-+*/
-+#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
- 
-   /*************************************************************************/
-   /*                                                                       */
---- misc/freetype-2.1.2/include/freetype/config/ftoption.h.orig	Sun Sep  8 13:10:22 2002
-+++ misc/build/freetype-2.1.2/include/freetype/config/ftoption.h	Sun Sep  8 13:31:32 2002
-@@ -375,7 +375,7 @@
-   /* By undefining this, you will only compile the code necessary to load  */
-   /* TrueType glyphs without hinting.                                      */
-   /*                                                                       */
--#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- 
- 
-   /*************************************************************************/
diff --git a/app-office/openoffice/files/1.0.1/ooffice-wrapper b/app-office/openoffice/files/1.0.1/ooffice-wrapper
deleted file mode 100644
index 4791ddd4b191..000000000000
--- a/app-office/openoffice/files/1.0.1/ooffice-wrapper
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-#     Modifications by Chris Halls
-
-# This program is free software; you can redistribute it and/or modify         
-# it under the terms of the GNU General Public License as published by         
-# the Free Software Foundation; either version 2 of the License, or            
-# (at your option) any later version.                                          
-#                                                                             
-# This program is distributed in the hope that it will be useful,              
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             
-# General Public License for more details.                                     
-#                                                                             
-# You should have received a copy of the GNU General Public License            
-# along with this program; if not, write to the Free Software                  
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
-
-# this string should be exactly as in ~/.sversionrc
-OOVERSION="OpenOffice.org <pv>"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-##
-## where does OO live for this user ?
-##
-OOHOME=""
-if [ -e ~/.sversionrc ] && grep -q "$OOVERSION" ~/.sversionrc ; then
-  # already installed for this user (warning, .sversionrc is DOS encoded)
-  OOHOME=`grep "^$OOVERSION=" ~/.sversionrc| \
-          sed "s|^$OOVERSION=file://||"  | \
-	  xargs echo`
-  if [ ! -e $OOHOME ] ; then
-    echo "I'm confused because I can't find OpenOffice's user files."
-    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
-    echo "but they are not. Please fix the situation manually."
-    echo "You may want to edit ~/.sversionrc to indicate where is OO"
-    echo "installed, or remove it if you did remove your installation"
-    echo "directory manually (you bad one)."
-    exit 1
-  fi
-fi
-
-##
-## Unset SESSION_MANAGER if gnome-session is the session manager
-## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
-##
-SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
-if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
-  SESMGR="`readlink -f /proc/$SMPID/exe`"
-  if [ "$SESMGR" = "/usr/bin/gnome-session" ]; then
-      echo "Gnome session manager detected - session management disabled"
-      unset SESSION_MANAGER
-  fi
-fi
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
-  if [ -e /etc/openoffice/autoresponse.conf ] && \
-    grep -q DESTINATIONPATH /etc/openoffice/autoresponse.conf ; then
-    # first install
-    OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse.conf | \
-           sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
-    if [ -d "$OOHOME" ]; then
-      echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
-      echo "yet the directory $OOHOME exists." 
-      echo "Please remove $OOHOME and try again."
-      exit 1
-    fi
-    echo "running openoffice.org setup..."
-    if ! /opt/OpenOffice.org<pv>/program/setup -R:/etc/openoffice/autoresponse.conf ; then
-      echo "setup failed.. abort"
-      exit 1
-    fi
-    echo "Setup complete. Running openoffice.org..."
- else
-    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
-    echo "the /etc/openoffice/autoresponse.conf file manually ?"
-    echo "This file should contain DESTINATIONPATH"
-    exit 1
-  fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?  
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
-  case `basename $0` in
-    oocalc) set -- private:factory/scalc;;
-    oodraw) set -- private:factory/sdraw;;
-    ooimpress) set -- private:factory/simpress;;
-    oomath) set -- private:factory/smath;;
-    oowriter) set -- private:factory/swriter;;
-  esac
-fi
-
-##
-##
-## Change the config files to conform to current locale used
-##
-
-# Fix some variable to make the paths shorter in the rest
-LINGFILE="$OOHOME/user/config/registry/instance/org/openoffice/Office/Linguistic.xml"
-SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
-
-
-# Search the right locale
-OLDLOCALE=""
-if [ -e $LINGFILE ] ; then
-  OLDLOCALE=`grep 'DefaultLocale cfg' $LINGFILE|sed 's/<[^>]*>//g'|sed 's/[[:blank:]]//g'`
-fi 
-if [ -z $OLDLOCALE ]; then  OLDLOCALE="en-US";  fi
-if [ "x$OLDLOCALE" = "xC" ]; then  OLDLOCALE="en-US";  fi
-
-LOCALE=$LC_ALL
-if [ -z $LOCALE ] ; then LOCALE="$LC_MESSAGES"; fi
-if [ -z $LOCALE ] ; then LOCALE="$LANG"; fi
-if [ -z $LOCALE ] ; then LOCALE="en-US"; fi
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en-US"; fi
-
-if [ $LOCALE != $OLDLOCALE ] ; then 
-
-  # Change instdb.ins
-  cp $OOHOME/instdb.ins $OOHOME/instdb.ins.$OLDLOCALE
-  sed "s/>$OLDLOCALE</>$LOCALE</" $OOHOME/instdb.ins.$OLDLOCALE > $OOHOME/instdb.ins
-  
-  # Create Linguistic.xml if don't exists
-  if [ ! -e $LINGFILE.$OLDLOCALE ] ; then
-    # get a default one, and change en-US to OLDLOCALE inside. I guess this is a noop, but I'm not sure
-    sed "s/>en-US</>$OLDLOCALE</" \
-      < /opt/OpenOffice.org<pv>/share/config/registry/instance/org/openoffice/Office/Linguistic.xml \
-      > $LINGFILE.$OLDLOCALE
-  fi
-  
-  # change Linguistic.xml
-  sed "s/>$OLDLOCALE</>$LOCALE</" $LINGFILE.$OLDLOCALE > $LINGFILE
-
-  # Change Setup.xml
-  if grep -q '<ooLocale cfg:type' $SETUPFILE ; then 
-    cp $SETUPFILE $SETUPFILE.$OLDLOCALE
-    sed "s/>$OLDLOCALE</>$LOCALE</" $SETUPFILE.$OLDLOCALE > $SETUPFILE
-  else # ooLocale entry does not exists in Setup.xml
-    cp $SETUPFILE $SETUPFILE.tmp
-     
-    cat $SETUPFILE.tmp | \
-      perl -e "while (<>) { /<Office>/ && print \"<L10N>\n<ooLocale cfg:type=\\\"string\\\">$LOCALE</ooLocale>\n</L10N>\n\";print \$_;}" > \
-      $SETUPFILE 
-    # this perl command is to add a <L10N> section if it does not exists.
-    # On my machine, it produce the following patch:
-    
-    # <Setup state="modified" cfg:package="org.openoffice" xmlns="http://openoffice.org/2000/registry/components/Setup" xmlns:cfg="http://openoffice.org/2000/registry/instance" xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance">
-    #+ <L10N>
-    #+  <ooLocale cfg:type="string">fr_FR@euro</ooLocale>
-    #+ </L10N>
-    #  <Office>
-   
-    rm $SETUPFILE.tmp
-  fi # change Setup.xml
-  
-fi # LOCALE != OLDLOCALE
-
-## Previous dead installation?
-[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
-
-##
-## That's it. Launch the beast (with the given args)
-##
-case `basename $0` in
-  oosetup) exec "$OOHOME/setup" ;;
-  oopadmin) exec "$OOHOME/spadmin" ;;
-  *) exec "$OOHOME/soffice" "$@" ;;
-esac
-	  
-## Changelog
-# 07/10 challs
-#   * use 1.0.1 directory and improve error checking
-# 07/02 challs
-#   * use readlink in /proc/PID/exe to get
-#     real session manager name
-# 06/12 challs
-#   * merge into main package
-#   * change $@ to "$@"
-#   * source configuration file: 
-#       /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-#   * strace only when DEBUG is set to yes
-#   * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-#   * Make sure the OLDLOCALE is never empty
-#   * handle the case where the locale is C
diff --git a/app-office/openoffice/files/1.0.1/ooffice-wrapper-1.1 b/app-office/openoffice/files/1.0.1/ooffice-wrapper-1.1
deleted file mode 100644
index 2eb895332520..000000000000
--- a/app-office/openoffice/files/1.0.1/ooffice-wrapper-1.1
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-#     Modifications by Chris Halls
-
-# This program is free software; you can redistribute it and/or modify         
-# it under the terms of the GNU General Public License as published by         
-# the Free Software Foundation; either version 2 of the License, or            
-# (at your option) any later version.                                          
-#                                                                             
-# This program is distributed in the hope that it will be useful,              
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             
-# General Public License for more details.                                     
-#                                                                             
-# You should have received a copy of the GNU General Public License            
-# along with this program; if not, write to the Free Software                  
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
-
-# this string should be exactly as in ~/.sversionrc
-OOVERSION="OpenOffice.org <pv>"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-##
-## where does OO live for this user ?
-##
-OOHOME=""
-if [ -e ~/.sversionrc ] && grep -q "$OOVERSION" ~/.sversionrc ; then
-  # already installed for this user (warning, .sversionrc is DOS encoded)
-  OOHOME=`grep "^$OOVERSION=" ~/.sversionrc| \
-          sed "s|^$OOVERSION=file://||"  | \
-	  xargs echo`
-  if [ ! -e $OOHOME ] ; then
-    echo "I'm confused because I can't find OpenOffice's user files."
-    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
-    echo "but they are not. Please fix the situation manually."
-    echo "You may want to edit ~/.sversionrc to indicate where is OO"
-    echo "installed, or remove it if you did remove your installation"
-    echo "directory manually (you bad one)."
-    exit 1
-  fi
-fi
-
-##
-## Unset SESSION_MANAGER if gnome-session is the session manager
-## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
-##
-SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
-if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
-  SESMGR="`readlink -f /proc/$SMPID/exe`"
-  if [ "$SESMGR" = "/usr/bin/gnome-session" ]; then
-      echo "Gnome session manager detected - session management disabled"
-      unset SESSION_MANAGER
-  fi
-fi
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
-  if [ -e /etc/openoffice/autoresponse.conf ] && \
-    grep -q DESTINATIONPATH /etc/openoffice/autoresponse.conf ; then
-    # first install
-    OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse.conf | \
-           sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
-    if [ -d "$OOHOME" ]; then
-      echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
-      echo "yet the directory $OOHOME exists." 
-      echo "Please remove $OOHOME and try again."
-      exit 1
-    fi
-    echo "running openoffice.org setup..."
-    if ! /opt/OpenOffice.org<pv>/program/setup -R:/etc/openoffice/autoresponse.conf >& /dev/null; then
-      echo "setup failed.. abort"
-      exit 1
-    fi
-    echo "Setup complete. Running openoffice.org..."
- else
-    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
-    echo "the /etc/openoffice/autoresponse.conf file manually ?"
-    echo "This file should contain DESTINATIONPATH"
-    exit 1
-  fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?  
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
-  case `basename $0` in
-    oocalc) set -- private:factory/scalc;;
-    oodraw) set -- private:factory/sdraw;;
-    ooimpress) set -- private:factory/simpress;;
-    oomath) set -- private:factory/smath;;
-    oowriter) set -- private:factory/swriter;;
-  esac
-fi
-
-##
-##
-## Change the config files to conform to current locale used
-##
-
-# Fix some variable to make the paths shorter in the rest
-LINGFILE="$OOHOME/user/config/registry/instance/org/openoffice/Office/Linguistic.xml"
-SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
-
-
-# Search the right locale
-OLDLOCALE=""
-if [ -e $LINGFILE ] ; then
-  OLDLOCALE=`grep 'DefaultLocale cfg' $LINGFILE|sed 's/<[^>]*>//g'|sed 's/[[:blank:]]//g'`
-fi 
-if [ -z $OLDLOCALE ]; then  OLDLOCALE="en-US";  fi
-if [ "x$OLDLOCALE" = "xC" ]; then  OLDLOCALE="en-US";  fi
-
-LOCALE=$LC_ALL
-if [ -z $LOCALE ] ; then LOCALE="$LC_MESSAGES"; fi
-if [ -z $LOCALE ] ; then LOCALE="$LANG"; fi
-if [ -z $LOCALE ] ; then LOCALE="en-US"; fi
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en-US"; fi
-
-if [ $LOCALE != $OLDLOCALE ] ; then 
-
-  # Change instdb.ins
-  cp $OOHOME/instdb.ins $OOHOME/instdb.ins.$OLDLOCALE
-  sed "s/>$OLDLOCALE</>$LOCALE</" $OOHOME/instdb.ins.$OLDLOCALE > $OOHOME/instdb.ins
-  
-  # Create Linguistic.xml if don't exists
-  if [ ! -e $LINGFILE.$OLDLOCALE ] ; then
-    # get a default one, and change en-US to OLDLOCALE inside. I guess this is a noop, but I'm not sure
-    sed "s/>en-US</>$OLDLOCALE</" \
-      < /opt/OpenOffice.org<pv>/share/config/registry/instance/org/openoffice/Office/Linguistic.xml \
-      > $LINGFILE.$OLDLOCALE
-  fi
-  
-  # change Linguistic.xml
-  sed "s/>$OLDLOCALE</>$LOCALE</" $LINGFILE.$OLDLOCALE > $LINGFILE
-
-  # Change Setup.xml
-  if grep -q '<ooLocale cfg:type' $SETUPFILE ; then 
-    cp $SETUPFILE $SETUPFILE.$OLDLOCALE
-    sed "s/>$OLDLOCALE</>$LOCALE</" $SETUPFILE.$OLDLOCALE > $SETUPFILE
-  else # ooLocale entry does not exists in Setup.xml
-    cp $SETUPFILE $SETUPFILE.tmp
-     
-    cat $SETUPFILE.tmp | \
-      perl -e "while (<>) { /<Office>/ && print \"<L10N>\n<ooLocale cfg:type=\\\"string\\\">$LOCALE</ooLocale>\n</L10N>\n\";print \$_;}" > \
-      $SETUPFILE 
-    # this perl command is to add a <L10N> section if it does not exists.
-    # On my machine, it produce the following patch:
-    
-    # <Setup state="modified" cfg:package="org.openoffice" xmlns="http://openoffice.org/2000/registry/components/Setup" xmlns:cfg="http://openoffice.org/2000/registry/instance" xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance">
-    #+ <L10N>
-    #+  <ooLocale cfg:type="string">fr_FR@euro</ooLocale>
-    #+ </L10N>
-    #  <Office>
-   
-    rm $SETUPFILE.tmp
-  fi # change Setup.xml
-  
-fi # LOCALE != OLDLOCALE
-
-## Previous dead installation?
-[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
-
-##
-## That's it. Launch the beast (with the given args)
-##
-
-export LD_PRELOAD=/usr/lib/libfreetype.so
-case `basename $0` in
-  oosetup) exec "$OOHOME/setup" ;;
-  oopadmin) exec "$OOHOME/spadmin" ;;
-  *) exec "$OOHOME/soffice" "$@" ;;
-esac
-	  
-## Changelog
-# 07/10 challs
-#   * use 1.0.1 directory and improve error checking
-# 07/02 challs
-#   * use readlink in /proc/PID/exe to get
-#     real session manager name
-# 06/12 challs
-#   * merge into main package
-#   * change $@ to "$@"
-#   * source configuration file: 
-#       /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-#   * strace only when DEBUG is set to yes
-#   * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-#   * Make sure the OLDLOCALE is never empty
-#   * handle the case where the locale is C
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch
deleted file mode 100644
index 9b48befffc26..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urNd oo_641d_src/config_office/configure.in oo_641d_src/config_office/configure.in.new
---- oo_641d_src/config_office/configure.in	Sat Mar 30 23:18:04 2002
-+++ oo_641d_src/config_office/configure.in.new	Sat Mar 30 22:31:31 2002
-@@ -808,10 +808,14 @@
-    if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-       _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+      _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
- 
-       if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-          _jdk_minor="true"
-       fi
-+      if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
-+         _jdk_minor="true"
-+      fi
-    fi
-    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-diff -urNd oo_641d_src/config_office/configure oo_641d_src/config_office/configure.new
---- oo_641d_src/config_office/configure	Sat Mar 30 23:18:02 2002
-+++ oo_641d_src/config_office/configure.new	Sat Mar 30 22:31:26 2002
-@@ -2296,10 +2296,14 @@
-    if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-       _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+      _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
- 
-       if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-          _jdk_minor="true"
-       fi
-+      if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
-+         _jdk_minor="true"
-+      fi
-    fi
-    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch
deleted file mode 100644
index ac482f222a7a..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- oo_stable1_cvs20020418_src/solenv/inc/unxlngppc.mk~	Fri Apr 19 00:09:21 2002
-+++ oo_stable1_cvs20020418_src/solenv/inc/unxlngppc.mk	Fri Apr 19 00:24:30 2002
-@@ -31,7 +31,7 @@
- cc=$(CCCOMP)
- 
- # source code is still not signed versus unsigned char clean 
--CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
-+CFLAGS=-fsigned-char -w -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
- CFLAGSCC=-fsigned-char
- 
- # Flags for enabling exception handling
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch
deleted file mode 100644
index 3803e159c1ee..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- oo_641c_src/solenv/inc/_tg_zip.mk.zipdep	Fri Nov  2 18:59:44 2001
-+++ oo_641c_src/solenv/inc/_tg_zip.mk	Sat Feb 16 16:59:57 2002
-@@ -163,7 +163,8 @@
- 	+-zipdep $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
- .ENDIF			# "$(ZIP2DIR)" != ""
- .ENDIF			# "$(common_build_zip)"!=""
--	@+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
-+# (gb) workaround for setup2/script/makefile.mk
-+#	@+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
- .ENDIF			# "$(make_zip_deps)" != ""
- .ENDIF
- 
---- oo_641c_src/tools/bootstrp/makefile.mk.zipdep	Tue Oct 16 16:21:13 2001
-+++ oo_641c_src/tools/bootstrp/makefile.mk	Fri Feb 15 17:02:24 2002
-@@ -147,7 +147,7 @@
- APP4LIBS=       $(LB)$/bootstrp.lib
- APP4DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
- 
--#APP5TARGET= zipdep
-+APP5TARGET= zipdep
- APP5OBJS=	$(OBJ)$/zipdep.obj
- APP5LIBS=	$(LB)$/bootstrp.lib
- APP5STDLIBS=$(STATIC_LIBS) 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch
deleted file mode 100644
index 32e2a170f3cb..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch
+++ /dev/null
@@ -1,484 +0,0 @@
---- oo_1.0_src/sd/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:29:42 2002
-+++ oo_1.0_src/sd/source/ui/app/makefile.mk	Fri Jun 14 11:33:27 2002
-@@ -132,15 +132,15 @@
- $(INCCOM)$/sddll0.hxx: makefile.mk
- 	+@echo $@
- .IF "$(GUI)"=="OS2"
--	echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX)" >$@
-+	echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- 	echo "$(HASHMARK)define DLL_NAME �"sd$(UPD)$(DLLPOSTFIX).dll�"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
--	echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
--	echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@
-+	echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX).DLL\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/sch/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:29:53 2002
-+++ oo_1.0_src/sch/source/ui/app/makefile.mk	Fri Jun 14 11:34:03 2002
-@@ -113,16 +113,16 @@
- 
- $(INCCOM)$/schlib.hxx: makefile.mk
- .IF "$(GUI)"=="OS2"
--	echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)" >$@
-+	echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- 	echo "$(HASHMARK)define DLL_NAME �"sch$(UPD)$(DLLPOSTFIX).dll�"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
- 	$(RM) $@
--	echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
--	echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+	echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/sal/util/makefile.mk.suxx	Fri Jun 14 11:30:06 2002
-+++ oo_1.0_src/sal/util/makefile.mk	Fri Jun 14 11:35:42 2002
-@@ -245,14 +245,14 @@
- .IF "$(GUI)"=="WNT"
- 
- $(OUT)$/inc$/udkversion.h: 
--	echo #ifndef _SAL_UDKVERSION_H_           >  $@
--	echo #define _SAL_UDKVERSION_H_           >> $@
--	echo.                                     >> $@
--	echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
--	echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
--	echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
--	echo.                                     >> $@
--	echo #endif                               >> $@
-+	echo "#ifndef _SAL_UDKVERSION_H_"         >  $@
-+	echo "#define _SAL_UDKVERSION_H_"         >> $@
-+	echo                                      >> $@
-+	echo "#define SAL_UDK_MAJOR $(UDK_MAJOR)" >> $@
-+	echo "#define SAL_UDK_MINOR $(UDK_MINOR)" >> $@
-+	echo "#define SAL_UDK_MICRO $(UDK_MICRO)" >> $@
-+	echo                                      >> $@
-+	echo "#endif"                             >> $@
- 
- .ELSE
- 
---- oo_1.0_src/sc/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:30:24 2002
-+++ oo_1.0_src/sc/source/ui/app/makefile.mk	Fri Jun 14 11:36:11 2002
-@@ -115,15 +115,15 @@
- 
- $(INCCOM)$/scdll0.hxx: makefile.mk
- .IF "$(GUI)"=="OS2"
--	echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)" >$@
-+	echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- 	echo "$(HASHMARK)define DLL_NAME �"sc$(UPD)$(DLLPOSTFIX).dll�"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
--	echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
--	echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+	echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/basctl/source/basicide/makefile.mk.suxx	Fri Jun 14 05:11:03 2002
-+++ oo_1.0_src/basctl/source/basicide/makefile.mk	Fri Jun 14 05:12:32 2002
-@@ -153,7 +153,7 @@
- .ELSE
- .IF "$(GUI)"=="UNX"
- 	$(RM) $@
--        echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
-         echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
- .ENDIF
---- oo_1.0_src/sw/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:30:36 2002
-+++ oo_1.0_src/sw/source/ui/app/makefile.mk	Fri Jun 14 11:36:31 2002
-@@ -152,12 +152,12 @@
- 
- .IF "$(GUIBASE)"=="WIN"
- $(INCCOM)$/swdll0.hxx: makefile.mk
--	echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@
-+	echo "#define DLL_NAME "\"sw$(UPD)$(DLLPOSTFIX).DLL\" >$@
- .ENDIF
- 
- .IF "$(GUI)"=="UNX"
- $(INCCOM)$/swdll0.hxx: makefile.mk
--	echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- 
- 
---- oo_1.0_src/starmath/source/makefile.mk.suxx	Fri Jun 14 11:30:45 2002
-+++ oo_1.0_src/starmath/source/makefile.mk	Fri Jun 14 11:36:46 2002
-@@ -140,9 +140,9 @@
- $(INCCOM)$/dllname.hxx: makefile.mk
- .IF "$(GUI)"=="UNX"
- 	$(RM) $@
--	echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+	echo "#define DLL_NAME "\"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
--	echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+	echo "#define DLL_NAME "\"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- 
- $(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
---- oo_1.0_src/solenv/inc/_tg_app.mk.suxx	Fri Jun 14 11:30:57 2002
-+++ oo_1.0_src/solenv/inc/_tg_app.mk	Fri Jun 14 11:39:21 2002
-@@ -113,8 +113,8 @@
- 	@-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF
- .IF "$(APP1VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
--	@-+echo #include  "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP1LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP1VERINFO)\" >> $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF			# "$(APP1LINKRES)" != ""
-@@ -309,8 +309,8 @@
- 	@-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF
- .IF "$(APP2VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
--	@-+echo #include  "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP2LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP2VERINFO)\" >> $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF			# "$(APP2LINKRES)" != ""
-@@ -505,8 +505,8 @@
- 	@-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF
- .IF "$(APP3VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
--	@-+echo #include  "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP3LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP3VERINFO)\" >> $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF			# "$(APP3LINKRES)" != ""
-@@ -701,8 +701,8 @@
- 	@-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF
- .IF "$(APP4VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
--	@-+echo #include  "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP4LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP4VERINFO)\" >> $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF			# "$(APP4LINKRES)" != ""
-@@ -897,8 +897,8 @@
- 	@-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF
- .IF "$(APP5VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
--	@-+echo #include  "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP5LINKRES:b).rc
-+	@-+echo "#include  \"$(APP5VERINFO)\" >> $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF			# "$(APP5LINKRES)" != ""
-@@ -1093,8 +1093,8 @@
- 	@-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF
- .IF "$(APP6VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
--	@-+echo #include  "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP6LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP6VERINFO)\" >> $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF			# "$(APP6LINKRES)" != ""
-@@ -1289,8 +1289,8 @@
- 	@-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF
- .IF "$(APP7VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
--	@-+echo #include  "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP7LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP7VERINFO)\" >> $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF			# "$(APP7LINKRES)" != ""
-@@ -1485,8 +1485,8 @@
- 	@-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF
- .IF "$(APP8VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
--	@-+echo #include  "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP8LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP8VERINFO)\" >> $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF			# "$(APP8LINKRES)" != ""
-@@ -1681,8 +1681,8 @@
- 	@-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF
- .IF "$(APP9VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
--	@-+echo #include  "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP9LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP9VERINFO)\" >> $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF			# "$(APP9LINKRES)" != ""
-@@ -1877,8 +1877,8 @@
- 	@-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF
- .IF "$(APP10VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
--	@-+echo #include  "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP10LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP10VERINFO)\" >> $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF			# "$(APP10LINKRES)" != ""
---- oo_1.0_src/solenv/inc/_tg_shl.mk.suxx	Fri Jun 14 11:31:07 2002
-+++ oo_1.0_src/solenv/inc/_tg_shl.mk	Fri Jun 14 11:43:39 2002
-@@ -226,10 +226,10 @@
- 	@-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL1TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL1TARGET:b)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ENDIF			# "$(SHL1DEFAULTRES)"!=""
-@@ -651,10 +651,10 @@
- 	@-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL2TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL2TARGET:b)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ENDIF			# "$(SHL2DEFAULTRES)"!=""
-@@ -1076,10 +1076,10 @@
- 	@-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL3TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL3TARGET:b)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ENDIF			# "$(SHL3DEFAULTRES)"!=""
-@@ -1501,10 +1501,10 @@
- 	@-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL4TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL4TARGET:b)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ENDIF			# "$(SHL4DEFAULTRES)"!=""
-@@ -1926,10 +1926,10 @@
- 	@-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL5TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL5TARGET:b)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ENDIF			# "$(SHL5DEFAULTRES)"!=""
-@@ -2351,10 +2351,10 @@
- 	@-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL6TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL6TARGET:b)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ENDIF			# "$(SHL6DEFAULTRES)"!=""
-@@ -2776,10 +2776,10 @@
- 	@-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL7TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL7TARGET:b)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ENDIF			# "$(SHL7DEFAULTRES)"!=""
-@@ -3201,10 +3201,10 @@
- 	@-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL8TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL8TARGET:b)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ENDIF			# "$(SHL8DEFAULTRES)"!=""
-@@ -3626,10 +3626,10 @@
- 	@-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL9TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL9TARGET:b)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ENDIF			# "$(SHL9DEFAULTRES)"!=""
-@@ -4051,10 +4051,10 @@
- 	@-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL10TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL10TARGET:b)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ENDIF			# "$(SHL10DEFAULTRES)"!=""
---- oo_1.0_src/solenv/inc/settings.mk.suxx	Fri Jun 14 11:31:14 2002
-+++ oo_1.0_src/solenv/inc/settings.mk	Fri Jun 14 11:43:58 2002
-@@ -617,14 +617,14 @@
- .IF "$(GUI)"=="UNX"
- 	@+echo \# > $(OUT)$/inc$/myworld.mk
- .ELSE			# "$(GUI)"=="UNX"
--	@+echo # > $(OUT)$/inc$/myworld.mk
-+	@+echo "#" > $(OUT)$/inc$/myworld.mk
- .ENDIF			# "$(GUI)"=="UNX"
- .IF "$(common_build)"!=""
- 	@+$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
- .IF "$(GUI)"=="UNX"
- 	@+echo \# > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
- .ELSE			# "$(GUI)"=="UNX"
--	@+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
-+	@+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
- .ENDIF			# "$(GUI)"=="UNX"
- .ENDIF			# "$(common_build)"!=""
- 
-@@ -638,10 +638,10 @@
- 
- %worldremote.mk :
- 	@+$(MKOUT) -r $(ROUT)
--	@+echo # > $(OUT)$/inc$/myworldremote.mk
-+	@+echo "#" > $(OUT)$/inc$/myworldremote.mk
- .IF "$(common_build)"!=""
- 	@+$(MKOUT) -r $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
--	@+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
-+	@+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
- .ENDIF			# "$(common_build)"!=""
- 
- .INCLUDE .IGNORE : $(OUT)$/inc$/myworldremote.mk
---- oo_1.0_src/solenv/inc/tg_app.mk.suxx	Fri Jun 14 11:31:29 2002
-+++ oo_1.0_src/solenv/inc/tg_app.mk	Fri Jun 14 11:44:23 2002
-@@ -208,8 +208,8 @@
- 	@-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF
- .IF "$(APP$(TNR)VERINFO)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
--	@-+echo #include  "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-+	@-+echo "#include  "\"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF
- 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
---- oo_1.0_src/solenv/inc/tg_dep.mk.suxx	Fri Jun 14 11:31:37 2002
-+++ oo_1.0_src/solenv/inc/tg_dep.mk	Fri Jun 14 11:44:35 2002
-@@ -124,9 +124,9 @@
- 	@echo "#" > $(MISC)$/$(TARGET).dpw
- .ENDIF
- .ELSE			# "$(GUI)"=="UNX"
--	@echo # > $(MISC)$/$(TARGET).dpc
-+	@echo "#" > $(MISC)$/$(TARGET).dpc
- .IF "$(GROUP)"=="WRITER"
--	@echo # > $(MISC)$/$(TARGET).dpw
-+	@echo "#" > $(MISC)$/$(TARGET).dpw
- .ENDIF
- .ENDIF			# "$(GUI)"=="UNX"
- 
---- oo_1.0_src/solenv/inc/tg_shl.mk.suxx	Fri Jun 14 11:31:45 2002
-+++ oo_1.0_src/solenv/inc/tg_shl.mk	Fri Jun 14 11:45:07 2002
-@@ -326,10 +326,10 @@
- 	@-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ENDIF
- .IF "$(use_shl_versions)" != ""
--	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
--	@-+echo #define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
--	@-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
--	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+	@-+echo "#define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+	@-+echo "#define INTERNAL_NAME $(SHL$(TNR)TARGET:b)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ENDIF			# "$(use_shl_versions)" != ""
- 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
---- oo_1.0_src/tools/os2/source/wps/makefile.mk.suxx	Fri Jun 14 11:47:53 2002
-+++ oo_1.0_src/tools/os2/source/wps/makefile.mk	Fri Jun 14 11:48:23 2002
-@@ -211,8 +211,8 @@
-     @+if exist $(INCCOM)$/wpsdll.h rm -f $(INCCOM)$/wpsdll.h
-     @echo ----------------------------
-     @echo Making: $@
--    @echo #define _WPS_DLL_NAME "$(SHL1TARGET).dll" > $(INCCOM)$/wpsdll.h
--    @echo #define _TEMPLATES_DLL_NAME "$(SHL2TARGET)" >> $(INCCOM)$/wpsdll.h
-+    @echo "#define _WPS_DLL_NAME "\"$(SHL1TARGET).dll\" > $(INCCOM)$/wpsdll.h
-+    @echo "#define _TEMPLATES_DLL_NAME "\"$(SHL2TARGET)\" >> $(INCCOM)$/wpsdll.h
- 
- $(SHL1DEF):
-     @echo ----------------------------
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch
deleted file mode 100644
index a96de2cdfe40..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- oo_1.0_src/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx~	Tue Jul 16 20:19:57 2002
-+++ oo_1.0_src/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	Tue Jul 16 20:46:22 2002
-@@ -736,16 +736,16 @@
-                 // get method
-                 *slots = code;
-                 codeSnippet( (long *)code, vtable_pos++, simple_ret );
-+		flush_range( code, nSnippetSize );
-                 code += nSnippetSize;
--                flush_range((char *) slots, nSnippetSize);
-                 slots++;
-                 if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-                 {
-                     // set method
-                     *slots = code;
-                     codeSnippet( (long *)code, vtable_pos++, true );
-+		    flush_range( code, nSnippetSize );
-                     code += nSnippetSize;
--                    flush_range((char *) slots, nSnippetSize);
-                     slots++;
-                 }
-             }
-@@ -755,8 +755,8 @@
-                     ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-                 *slots = code;
-                 codeSnippet( (long *)code, vtable_pos++, simple_ret );
-+		flush_range( code, nSnippetSize );
-                 code += nSnippetSize;
--                flush_range((char *) slots, nSnippetSize);
-                 slots++;
-             }
-             TYPELIB_DANGER_RELEASE( pTD );
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch
deleted file mode 100644
index 9500d07402b2..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: oo_cvs/solenv/inc/unxlngi4.mk
-===================================================================
-RCS file: /cvs/oo/tools/solenv/inc/unxlngi4.mk,v
-retrieving revision 1.13
-diff -u -3 -p -u -r1.13 unxlngi4.mk
---- oo_cvs/solenv/inc/unxlngi4.mk	2002/03/04 15:53:59	1.13
-+++ oo_cvs/solenv/inc/unxlngi4.mk	2002/08/12 08:59:08
-@@ -96,14 +96,14 @@ CFLAGS=
- .ENDIF
- CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
- # flags for the C++ Compiler
--CFLAGSCC= -pipe -mcpu=pentiumpro
-+CFLAGSCC= -pipe
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
- # Flags for disabling exception handling
- CFLAGS_NO_EXCEPTIONS=-fno-exceptions
- 
- # -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti 
-+CFLAGSCXX= -pipe -fno-for-scope -fpermissive 
- 
- # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
- .IF "$(BUILD_SOSL)"==""
---- oo_1.0.1_src/solenv/inc/unxlngppc4.mk~	2002-08-20 09:50:00.000000000 +0200
-+++ oo_1.0.1_src/solenv/inc/unxlngppc4.mk	2002-08-20 10:25:18.000000000 +0200
-@@ -107,7 +107,7 @@
- CFLAGS_NO_EXCEPTIONS=-fno-exceptions
- 
- # -fpermissive should be removed as soon as possible
--CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti 
-+CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
- 
- 
- # Compiler flags for compiling static object in single threaded environment with graphical user interface
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch
deleted file mode 100644
index 454b1d2a7de1..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: oo_cvs/config_office/set_soenv.1
-===================================================================
-RCS file: /cvs/oo/tools/config_office/set_soenv.1,v
-retrieving revision 1.61.2.7
-diff -u -3 -p -r1.61.2.7 set_soenv.1
---- oo_cvs/config_office/set_soenv.1	2002/06/25 15:41:17	1.61.2.7
-+++ oo_cvs/config_office/set_soenv.1	2002/06/28 11:03:55
-@@ -1551,12 +1551,12 @@ if (( $platform eq "$Winnt" ) and ( $USE
-   $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."zipdep.pl");
-   if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
-   ToFile( "set ZIPDEP=$tempstring", $empty, "x" );
-+  ToFile( "HOME",              $WIN_HOME,          "e" );
- } else {
-   ToFile( "DELIVER",           "deliver.pl",       "e" );
-   ToFile( "MKOUT",             "mkout.pl",         "e" );
-   ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
- }
--ToFile( "HOME",              $WIN_HOME,          "e" );
- ToFile( "USE_SHELL",         $USE_SHELL,         "e" );
- #
- # Writing the aliases to file.
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch
deleted file mode 100644
index 476cd704bfec..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- oo_1.0_src/sal/osl/unx/interlck.c.jj	Wed May  2 17:03:13 2001
-+++ oo_1.0_src/sal/osl/unx/interlck.c	Thu May 30 10:45:19 2002
-@@ -83,9 +83,11 @@ oslInterlockedCount SAL_CALL osl_increme
- 		"lock\n\t" 
- 		"xadd %0, %2\n\t"
- 		"incl %0"
--	:	"=a" (nCount), "=m" (*pCount)
-+	:	"=&r" (nCount), "=m" (*pCount)
- 	:	"m" (*pCount)
- 	:	"memory");
-+
-+	return nCount;
- }
- 
- oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-@@ -97,9 +99,11 @@ oslInterlockedCount SAL_CALL osl_decreme
- 		"lock\n\t"
- 		"xadd %0, %2\n\t"
- 		"decl %0"
--	:	"=a" (nCount), "=m" (*pCount)
-+	:	"=&r" (nCount), "=m" (*pCount)
- 	:	"m" (*pCount)
- 	:	"memory");
-+
-+	return nCount;
- }
- 
- #elif defined ( GCC ) && defined ( POWERPC )
-@@ -117,7 +121,7 @@ oslInterlockedCount SAL_CALL osl_increme
- 		"   addi    %0,%0,1\n\t"
- 		"   stwcx.  %0,0,%2\n\t"
- 		"   bne-    1b"
--		: "=r" (nCount), "=m" (*pCount)
-+		: "=&r" (nCount), "=m" (*pCount)
- 		: "r" (pCount)
- 		: "r4", "memory");
- 
-@@ -134,7 +138,7 @@ oslInterlockedCount SAL_CALL osl_decreme
- 		"   subi  	%0,%0,1\n\t"
- 		"   stwcx.  %0,0,%2\n\t"
- 		"   bne-    1b"
--		: "=r" (nCount), "=m" (*pCount)
-+		: "=&r" (nCount), "=m" (*pCount)
- 		: "r" (pCount)
- 		: "r4", "memory");
- 
---- oo_1.0_src/bridges/source/c_uno/intelx86.cxx.jj	Wed Apr 18 13:05:48 2001
-+++ oo_1.0_src/bridges/source/c_uno/intelx86.cxx	Thu May 30 11:37:26 2002
-@@ -95,24 +95,21 @@ Lcopy:	sub		eax, 4
- 		add		esp, eax
- 	}
- #elif GCC
-+	int ecx, edx;
-+
- 	__asm__
- 	(
--		"mov %2, %%eax\n\t"
--		"mov %%eax, %%ecx\n\t"
--		"shl $2, %%eax\n\t"
--		"add %1, %%eax\n"
--		"Lcopy:\n\t"
--		"sub $4, %%eax\n\t"
--		"pushl (%%eax)\n\t"
--		"dec %%ecx\n\t"
--		"jne Lcopy\n\t"
--		"mov %0, %%eax\n\t"
--		"call *%%eax\n\t"
--		"mov %%eax, %3\n"
--		"mov %2, %%eax\n\t"
--		"shl $2, %%eax\n\t"
--		"add %%eax, %%esp\n\t"
--		: : "m"(fptr), "m"(pParams), "m"(nParams), "m"(retVal)
-+		"1:\n\t"
-+		"subl $4, %0\n\t"
-+		"pushl (%0)\n\t"
-+		"decl %1\n\t"
-+		"jne 1b\n\t"
-+		"call *%2\n\t"
-+		"leal 0(%%esp,%3,4), %%esp\n\t"
-+		: "=a"(retVal), "=c"(ecx), "=d"(edx)
-+		: "S"(nParams),
-+		  "0" (((int *) pParams) + nParams), "1" (nParams), "2"(fptr)
-+		: "memory", "cc"
- 	);
- #else
- #error "### unsupported x86 compiler!"
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch
deleted file mode 100644
index ff9fe8b5dd7a..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig	2002-12-02 22:59:26.000000000 -0500
-+++ XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java	2002-12-02 23:01:49.000000000 -0500
-@@ -79,7 +79,7 @@
- 		Class.forName(className != null
- 			      ? className
- 			      : "sun.net.www.protocol." + protocol + ".Handler");
--	    return (URLStreamHandler)handlerClass.newInstance();;
-+	    return (URLStreamHandler)handlerClass.newInstance();
- 	}
- 	catch (Exception e) {
- 	    System.err.println(e);
-
---- sj2/stardiv/app/AppletViewer.java.orig	2002-11-25 15:30:49.000000000 -0500
-+++ sj2/stardiv/app/AppletViewer.java	2002-11-25 15:29:15.000000000 -0500
-@@ -196,7 +196,7 @@
-     public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
- //  		resourceViewer = new stardiv.util.ResourceViewer();
- //  		resourceViewer.show();
--		System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
-+//		System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
- 		this.statusMsgStream = statusMsgStream;
- 		this.atts = atts;
- 
---- sj2/stardiv/applet/DocumentProxy.java.orig	2002-11-25 22:11:41.000000000 -0500
-+++ sj2/stardiv/applet/DocumentProxy.java	2002-11-25 22:16:25.000000000 -0500
-@@ -73,6 +73,8 @@
- import java.util.Hashtable;
- import java.util.Observer;
- import java.util.Observable;
-+import java.util.Iterator;
-+import java.io.InputStream;
- 
- import java.net.URL;
- 
-@@ -96,6 +98,22 @@
-         return documentProxy;
-     }
- 
-+	// AppletContext. This method is new since 1.4. We insert it so as to
-+	// have the project buildable
-+	public void setStream( String key,InputStream stream)
-+		throws java.io.IOException {
-+	}
-+	// AppletContext. This method is new since 1.4. We insert it so as to
-+	// have the project buildable
-+	public InputStream getStream( String key) {
-+		return null;
-+	}
-+	// AppletContext. This method is new since 1.4. We insert it so as to
-+	// have the project buildable
-+	public Iterator getStreamKeys() {
-+		return null;
-+	}
-+		
- 
-     /*
-     ** interface cachable methods
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch
deleted file mode 100644
index 1040e54e5702..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- oo_1.0_src/config_office/configure.in~	Tue Jun 25 22:44:47 2002
-+++ oo_1.0_src/config_office/configure.in	Tue Jun 25 23:27:46 2002
-@@ -241,18 +241,16 @@
- 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" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "gcc" \) ; then
-    dnl ******************************************
-    dnl Testing for GNU compiler and version...
-    dnl ******************************************
-    dnl Check whether the gnu gcc compiler is used.
-    if test -z "$with_gcc_home"; then
--      if test "$CC" = "gcc"; then
--         AC_PATH_PROG(GCC, gcc)
--         COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"`
--         _gcc_include_start=/usr/lib/gcc-lib
--         _gxx_include_start=/usr/include
--      fi
-+      AC_PROG_CC
-+      COMPATH=`echo $CC | $SED -n "s,/[^/]\+$,,p"`
-+      _gcc_include_start=/usr/lib/gcc-lib
-+      _gxx_include_start=/usr/include
-    else
-       dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home
-       _gcc_path="$with_gcc_home/bin/gcc"
-@@ -343,7 +343,7 @@
-                               AC_MSG_WARN([found multiple g++-2 directories, please rename so you have one distinct]) >> warn
-                            fi
-                         else
--                           _gxx_include_path3=`find $_gxx_include_start -name "g++" -print 2> /dev/null`
-+			   _gxx_include_path3=`find $_gxx_include_start -name "g++-v3*" -print 2> /dev/null`
-                            if test "$_gxx_include_path3"; then
-                               _multiple=`echo $_gxx_include_path3 | $AWK '{ if ($2) print "true"; else print "false" }'`
-                               if test "$_multiple" = "false"; then
-@@ -758,7 +756,8 @@ if test -d "$with_stlport4_home"; then
- 				fi
- 			fi
- 		else
--			if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-+			_stl_suffix="gcc`$CC -dumpversion`"
-+			if test -f "$STLPORT4/lib/libstlport_$_stl_suffix.so"; then
- 				AC_MSG_RESULT([checked])
- 			else
- 				AC_MSG_ERROR([STLport4 libraries not found])
-@@ -821,6 +820,12 @@ if test "$JAVA"; then
-    fi
-    if test "$_os" = "Linux" -a "$_machine_type" = "ppc"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-+      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+
-+      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-+         _jdk_minor="true"
-+      fi
-+
-    fi
-    if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -1197,12 +1198,14 @@
- echo "\$MINGWIN32="$WITH_MINGWIN
- echo "\$with_use_shell="$with_use_shell
- echo "\$USE_GCC3="$USE_GCC3
-+echo "\$CC="$CC
-+echo "\$CXX="$CXX
- echo
- fi
- 
- # 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 "$CC" "$CXX"
- else
-    echo
-    echo Test Complete
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch
deleted file mode 100644
index 542253fb1b86..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- oo_1.0_src/connectivity/prj/build.lst.no-mozab	2001-11-07 12:00:01.000000000 +0100
-+++ oo_1.0_src/connectivity/prj/build.lst	2002-05-02 13:25:49.000000000 +0200
-@@ -1,4 +1,4 @@
--cn	connectivity	:	comphelper moz svtools NULL
-+cn	connectivity	:	comphelper svtools NULL
- cn	connectivity							usr1	-	all	cn_mkout NULL
- cn	connectivity\source\types				nmake	-	all	cn_types NULL
- cn	connectivity\source\commontools			nmake	-	all	cn_cmtools cn_types NULL
-@@ -7,8 +7,6 @@ cn	connectivity\source\cpool				nmake	-	
- cn	connectivity\source\resource			nmake	-	all	cn_res NULL
- cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx cn_types NULL
- cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
--cn	connectivity\source\drivers\mozab\mozillasrc		nmake	-	all	cn_mozab_mozillasrc cn_file NULL
--cn	connectivity\source\drivers\mozab	nmake	-	all	cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
- cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
- cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
- cn	connectivity\source\drivers\jdbc		nmake	-	all	cn_jdbc cn_dbtools NULL
---- oo_1.0_src/scp/source/office/files.scp.no-mozab	2002-04-17 10:18:19.000000000 +0200
-+++ oo_1.0_src/scp/source/office/files.scp	2002-05-06 11:13:47.000000000 +0200
-@@ -453,17 +453,6 @@ File GID_FILE_LIB_DBODBCBASE
-     Dir             = GID_DIR_PROGRAM;
- 	Styles			= (PACKED);
- End
--File GID_FILE_LIB_MOZABDRV
--	BIN_FILE_BODY;
--	#ifdef UNX
--    Name            = "libmozabdrv2.so";
--	#else
--    Name            = "mozabdrv2.dll";
--	#endif
--    Dir             = GID_DIR_PROGRAM;
--	Styles			= (PACKED);
--End
--
- 
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
-@@ -852,18 +841,6 @@ File GID_FILE_LIB_ODBC_2
-         #endif
- End
- 
--File GID_FILE_LIB_MOZAB_2
--        BIN_FILE_BODY;
--        Styles          = (PACKED,UNO_COMPONENT);
--        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
--        Dir             = GID_DIR_PROGRAM;
--        #ifdef UNX
--        Name            = "libmozab2.so";
--        #else
--        Name            = "mozab2.dll";
--        #endif
--End
--
- File GID_FILE_LIB_SDBC_2
-         BIN_FILE_BODY;
-         Styles          = (PACKED,UNO_COMPONENT);
-@@ -2954,11 +2931,3 @@ End
- #endif
- 
- #endif                                  // of #ifdef SOLAR_JAVA
--
--File GID_FILE_MOZILLA_RUNTIME
--        BIN_FILE_BODY;
--        Styles = (ARCHIVE);
--        Dir    = GID_DIR_PROGRAM;
--        Name	= "mozruntime.zip";
--End
--
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch
deleted file mode 100644
index febeb479afc0..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch
+++ /dev/null
@@ -1,908 +0,0 @@
-Index: oo_cvs/solenv/bin/build.pl
-===================================================================
-RCS file: /cvs/oo/tools/solenv/bin/build.pl,v
-retrieving revision 1.41
-retrieving revision 1.61
-diff -u -3 -p -u -r1.41 -r1.61
---- oo_cvs/solenv/bin/build.pl	2002/01/10 17:18:59	1.41
-+++ oo_cvs/solenv/bin/build.pl	2002/07/05 12:54:19	1.61
-@@ -1,13 +1,13 @@
- :
--eval 'exec perl -wS $0 ${1+"$@"}'
-+eval 'exec perl -S $0 ${1+"$@"}'
-     if 0;
- #*************************************************************************
- #
- #   $RCSfile: build.pl,v $
- #
--#   $Revision: 1.41 $
-+#   $Revision: 1.61 $
- #
--#   last change: $Author: vg $ $Date: 2002/01/10 17:18:59 $
-+#   last change: $Author: vg $ $Date: 2002/07/05 12:54:19 $
- #
- #   The Contents of this file are made available subject to the terms of
- #   either of the following licenses
-@@ -67,61 +67,115 @@ eval 'exec perl -wS $0 ${1+"$@"}'
- # build - build entire project 
- #
- 
-+use Config;
-+use POSIX;
- use Cwd;
- 
- #### script id #####
- 
- ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
- 
--$id_str = ' $Revision: 1.41 $ ';
-+$id_str = ' $Revision: 1.61 $ ';
- $id_str =~ /Revision:\s+(\S+)\s+\$/
-   ? ($script_rev = $1) : ($script_rev = "-");
- 
- print "$script_name -- version: $script_rev\n";
- 
-+if ($ENV{GUI} eq 'UNX') {
-+	use Cwd 'chdir';
-+};
-+
- #########################
- #                       #
- #   Globale Variablen   #
- #                       #
- #########################
- $QuantityToBuild = 0;
-+# delete $pid when not needed
-+%projects_deps_hash = ();	# hash of undependent projects,
-+							# that could be built now
-+%broken_build = ();			# hash of hashes of the modules, 
-+							# where build was broken (error occurred)
-+%folders_hashes = ();
-+%running_children = ();
-+$dependencies_hash = 0;
-+$handler_set = 0;
-+$cmd_file = '';
- $BuildAllParents = 0;
- $show = 0;
- $deliver = 0;
- %LocalDepsHash = ();
--%DepsArchive = ();
- %BuildQueue = ();
- %PathHash = ();
- %PlatformHash = ();
--%DeadDependencies = ();
- %AliveDependencies = ();
- %ParentDepsHash = (); # hash of dependencies of the current project
- @UnresolvedParents = ();
- @dmake_args = ();
- %DeadParents = ();
- $CurrentPrj = '';
-+$no_projects = 0;
-+$only_dependent = 0;
- $StandDir = &get_stand_dir();
- $build_from = '';
- $build_from_opt = '';
- $build_since = '';
-+$dlv_switch = '';
-+$child = 0;
-+%processes_hash = ();
-+%module_annonced = ();
-+
- &get_options;
-+
-+$deliver_commando = $ENV{DELIVER};
-+$deliver_commando .= ' '. $dlv_switch if ($dlv_switch);
- $ENV{mk_tmp}++;
- %prj_platform = ();
--
-+$check_error_string = '';
-+$dmake = '';
-+$echo = '';
-+$new_line = "\n";
- #### main ####
- 
--$dmake = &GetDmakeCommando();
-+&get_commands();
-+unlink ($cmd_file);
-+if ($cmd_file) {
-+	if (open (CMD_FILE, ">>$cmd_file")) {
-+		select CMD_FILE;
-+		$echo = 'echo ';
-+		$new_line = $echo."\"\"\n";
-+		print "\@$echo off\npushd\n" if ($ENV{GUI} ne 'UNX');
-+	} else {
-+		&print_error ("Cannot open file $cmd_file");
-+	};
-+} elsif ($show) {
-+	select STDERR;
-+};
-+
-+print $new_line;
-+
- &BuildAll();
- @TotenEltern = keys %DeadParents;
- if ($#TotenEltern != -1) {
- 	my ($DeadPrj);
--	print "\nWARNING! Project(s):\n\n";
-+	print $new_line.$new_line;
-+	print $echo."WARNING! Project(s):\n";
- 	foreach $DeadPrj (@TotenEltern) {
--		print "$DeadPrj\n";
-+		print $echo."$DeadPrj\n";
- 	};
--	print "\nnot found and couldn't be built. Correct build.lsts.\n";
-+	print $new_line;
-+	print $echo."not found and couldn't be built. Correct build.lsts.\n";
-+	print $new_line;
-+};
-+if (($ENV{GUI} ne 'UNX') && $cmd_file) {
-+	print "popd\n";
- };
- $ENV{mk_tmp} = '';
-+if ($cmd_file) {
-+	close CMD_FILE;
-+	print STDOUT "Script $cmd_file generated\n";
-+};
-+exit(0);
- 
- #########################
- #                       #
-@@ -171,6 +225,10 @@ sub BuildAll {
- 		if ($build_from) {
- 			&remove_extra_prjs(\%ParentDepsHash);
- 		};
-+		if ($QuantityToBuild) {
-+			&build_multiprocessing;
-+			return;
-+		};
- 		while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
- 			if ($build_from_opt) {
- 				if ($build_from_opt ne $Prj) {
-@@ -189,56 +247,62 @@ sub BuildAll {
- 				};
- 				next;
- 			};
--			print "\n=============\n";	
--			print "Building project $Prj\n";
--			print   "=============\n";	
-+			print $new_line;
-+			print $echo.	"=============\n";	
-+			print $echo.	"Building project $Prj\n";
-+			print $echo.	"=============\n";	
- 			$PrjDir = &CorrectPath($StandDir.$Prj);
--			if ($ENV{GUI} eq "UNX") {
--				use Cwd 'chdir';
-+			&get_deps_hash($PrjDir, \%LocalDepsHash);
-+			&BuildDependent(\%LocalDepsHash);
-+			if ($cmd_file) {
-+				print "$deliver_commando\n";
-+			} else {
-+				system ("$deliver_commando") if (!$show && ($Prj ne $CurrentPrj));
- 			};
--			chdir $PrjDir;
--			cwd();
--			&BuildPrj($PrjDir) if (!$deliver);
--			system ("$ENV{DELIVER}") if (!$show);
-+			print $check_error_string;
- 			&RemoveFromDependencies($Prj, \%ParentDepsHash);
-+        	$no_projects = 0;
- 		};
- 	} else {
--		&BuildPrj('.');
-+		&get_deps_hash('.', \%LocalDepsHash);
-+		&BuildDependent(\%LocalDepsHash);
- 	};
- };
- 
- #
- # Start build given project
- #
--sub MakeDir {
--	my ($DirToBuild, $BuildDir, $error);
--	$DirToBuild = shift;
--	$BuildDir = &CorrectPath($StandDir.$PathHash{$DirToBuild});
--	if ($ENV{GUI} eq 'UNX') {
--		use Cwd 'chdir';
--	};
--	if (chdir ($BuildDir)) {
--		print "$BuildDir\n";
-+sub dmake_dir {
-+	my ($folder_nick, $BuildDir);
-+	$folder_nick = shift;
-+	$BuildDir = &CorrectPath($StandDir . $PathHash{$folder_nick});
-+	&print_error("\n$BuildDir not found!!\n") if (!(-d $BuildDir));
-+	if ($cmd_file) {
-+		print "cd $BuildDir\n";
-+		print $check_error_string;
-+		print $echo.$BuildDir."\n";
-+		print "$dmake\n";
-+		print $check_error_string;
- 	} else {
--		&print_error("\n$BuildDir not found!!\n");
--		exit (1);
-+		print "$BuildDir\n";
- 	};
--	cwd();
--	if (!$show) {
--		$error = system ("$dmake");
--		if (!$error) {
--			&RemoveFromDependencies($DirToBuild, \%LocalDepsHash);
--		} else {
--			&print_error("Error $error occurred while making $BuildDir");
--			$ENV{mk_tmp} = '';
--			exit(1);
-+	&RemoveFromDependencies($folder_nick, \%LocalDepsHash) if (!$child);
-+	if (!$cmd_file && !$show) {
-+		chdir $BuildDir;
-+		cwd();
-+		system ("$dmake");
-+		if ($? && ($? != -1) && (!$child)) {
-+			&print_error("Error $? occurred while making $BuildDir");
- 		};
--	} else {
--		&RemoveFromDependencies($DirToBuild, \%LocalDepsHash);	
- 	};
-+    if ($child) {
-+        my $oldfh = select STDERR;
-+        $| = 1;
-+        _exit($? >> 8) if ($? && ($? != -1));
-+		_exit(0);
-+    };
- };
- 
--
- #
- # Get string (list) of parent projects to build
- #
-@@ -246,10 +310,8 @@ sub GetParentsString {
- 	my ($PrjDir);
- 	$PrjDir = shift;
- 	$PrjDir = '.' if ($PrjDir eq $CurrentPrj);
--	if (!open (PrjBuildFile, $PrjDir.'/prj/build.lst')) {
--		return '';
--	};
--	while (<PrjBuildFile>) {
-+	return '' if (!open (BUILD_LST, $PrjDir.'/prj/build.lst'));
-+	while (<BUILD_LST>) {
- 		if ($_ =~ /#/) {
- 			if ($`) {
- 				$_ = $`;
-@@ -259,11 +321,11 @@ sub GetParentsString {
- 		};
- 		s/\r\n//;
- 		if ($_ =~ /\:+\s+/) {
--			close PrjBuildFile;
-+			close BUILD_LST;
- 			return $';
- 		};
- 	};
--	close PrjBuildFile;
-+	close BUILD_LST;
- 	return 'NULL';
- };
- 
-@@ -272,37 +334,45 @@ sub GetParentsString {
- #
- sub get_prj_platform {
- 	my ($prj_alias, $line);
--	while(<PrjBuildFile>) {
-+	while(<BUILD_LST>) {
- 		s/\r\n//;
- 		$line++;
- 		if ($_ =~ /nmake/) {
- 			if ($' =~ /\s+-\s+(\w+)[,\S+]*\s+(\S+)/ ) {
- 				my $platform = $1;
- 				my $alias = $2;
--				if ($alias eq 'NULL') {
--					&print_error ("There is no correct alias set in the line $line!");
--					exit (1);
--				};
-+				&print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
- 				&mark_platform($alias, $platform);
- 			} else {
- 				&print_error("Misspelling in line: \n$_");
--				exit(1);
- 			};
- 		};
- 	};
--	seek(PrjBuildFile, 0, 0);
-+	seek(BUILD_LST, 0, 0);
- };
- 
- #
- # Getting hashes of all internal dependencies and additional 
- # infos for given project
- #
--sub BuildPrj {
-+sub get_deps_hash {
- 	my ($dummy, $PrjToBuild);
-+	%DeadDependencies = ();
- 	$PrjToBuild = shift;
--	open (PrjBuildFile, 'prj/build.lst');
-+	my $dependencies_hash = shift;
-+	chdir $PrjToBuild;
-+	cwd();
-+	if ($deliver) {
-+		if ($cmd_file) {
-+			print "$deliver_commando\n";
-+		} else {
-+			system ("$deliver_commando") if (!$show);
-+		};
-+		return;
-+	};
-+	open (BUILD_LST, 'prj/build.lst');
- 	&get_prj_platform;
--	while (<PrjBuildFile>) {
-+	while (<BUILD_LST>) {
- 		if ($_ =~ /#/) {
- 			if ($`) {
- 				$_ = $`;
-@@ -331,22 +401,20 @@ sub BuildPrj {
- 			};
- 			$PlatformHash{$DirAlias}++;
- 			$Dependencies = $';
--			@Array = GetDependenciesArray($Dependencies);
--			$LocalDepsHash{$DirAlias} = [@Array];
-+			@Array = &GetDependenciesArray($Dependencies);
-+			$$dependencies_hash{$DirAlias} = [@Array];
- 			$BuildQueue{$DirAlias}++;
- 			$PathHash{$DirAlias} = $Dir;
- 		};
- 	};
--	close PrjBuildFile;
--	%DepsArchive = %LocalDepsHash;
-+	close BUILD_LST;
- 	foreach $Dir (keys %DeadDependencies) {
- 		next if defined $AliveDependencies{$Dir};
- 		if (!&IsHashNative($Dir)) {
--			&RemoveFromDependencies($Dir, \%LocalDepsHash);
-+			&RemoveFromDependencies($Dir, $dependencies_hash);
- 			delete $DeadDependencies{$Dir};
- 		};
- 	};
--	&BuildDependent();
- };
- 
- #  
-@@ -361,33 +429,40 @@ sub mark_platform {
- 	};
- };
- 
--
- #
- # Convert path from abstract (with '\' and/or '/' delimiters) 
- # to system-independent
- #
- sub CorrectPath {
- 	$_ = shift;
--	s/\\/\//g;
-+	if (($ENV{GUI} ne 'UNX') && $cmd_file) {
-+		s/\//\\/g;
-+	} else {;
-+		s/\\/\//g;
-+	};
- 	return $_;
- };
- 
- 
- #
--# Get platform-dependent dmake commando 
-+# Get platform-dependent commands 
- #
--sub GetDmakeCommando {
--	my ($dmake, $arg);
--	
-+sub get_commands {
-+	my $arg = '';
- 	# Setting alias for dmake
- 	$dmake = 'dmake';
- 	while ($arg = pop(@dmake_args)) {
- 		$dmake .= ' '.$arg;
- 	};
--	return $dmake;
-+	if ($cmd_file) {
-+		if ($ENV{GUI} eq 'UNX') {
-+			$check_error_string = "if \"\$?\" != \"0\" exit\n";
-+		} else {
-+			$check_error_string = "if \"\%?\" != \"0\" quit\n";
-+		};
-+	};
- };
- 
--
- #
- # Procedure prooves if current dir is a root dir of the drive	
- #
-@@ -408,7 +483,6 @@ sub IsRootDir {
- 	};
- };
- 
--
- #
- # Procedure retrieves list of projects to be built from build.lst	
- #
-@@ -420,33 +494,21 @@ sub get_stand_dir {
- 	my ($StandDir);
- 	do {
- 		$StandDir = cwd();
--		if (open(PrjBuildFile, 'prj/build.lst')) {
-+		if (open(BUILD_LST, 'prj/build.lst')) {
- 			$StandDir =~ /(\w+$)/;
- 			$StandDir = $`;
- 			$CurrentPrj = $1;
--			close(PrjBuildFile);
-+			close(BUILD_LST);
- 			return $StandDir;
- 		} elsif (&IsRootDir($StandDir)) {
- 			$ENV{mk_tmp} = '';
- 			&print_error ('Found no project to build');
--			exit (1);
- 		};
- 	}
- 	while (chdir '..');
- };
- 
- #
--# Build the entire project according to queue of dependencies
--#
--sub BuildDependent {
--	my ($Dir);
--	while ($Dir = &PickPrjToBuild(\%LocalDepsHash)) {
--		&MakeDir($Dir);
--		$Dir = '';
--	};
--};
--
--#
- # Removes projects which it is not necessary to build
- #
- sub remove_extra_prjs {
-@@ -467,11 +529,11 @@ sub PickPrjToBuild {
- 	my ($Prj, $DepsHash);
- 	$DepsHash = shift;
- 	$Prj = &FindIndepPrj($DepsHash);
--	delete $$DepsHash{$Prj};
-+	delete $$DepsHash{$Prj} if (defined $$DepsHash{$Prj});
-+    #print "$Prj removed from dependencies hash\n";
- 	return $Prj;
- };
- 
--
- #
- # Make a decision if the project should be built on this platform
- #
-@@ -487,7 +549,7 @@ sub CheckPlatform {
- 		return 1;
- 	} elsif	(($ENV{GUI} eq 'UNX') && ($Platform eq 'u')) {
- 		return 1;
--	} elsif	(($ENV{GUI} eq 'MACOSX') && ($Platform eq 'm')) {
-+	} elsif	(($ENV{GUI} eq 'MAC') && ($Platform eq 'm')) {
- 		return 1;
- 	} elsif	(($ENV{GUI} eq 'OS2') && ($Platform eq 'p')) {
- 		return 1;
-@@ -495,7 +557,6 @@ sub CheckPlatform {
- 	return 0;
- };
- 
--
- #
- # Remove project to build ahead from dependencies and make an array
- # of all from given project dependent projects
-@@ -515,12 +576,13 @@ sub RemoveFromDependencies {
- 	};
- };
- 
--
- #
- # Find undependent project 
- #
- sub FindIndepPrj {
- 	my ($Prj, @Prjs, @PrjDeps, $Dependencies, $i);
-+	my $children = &children_number;
-+	return '' if ($children && ($children >= $QuantityToBuild));
- 	$Dependencies = shift;
- 	@Prjs = keys %$Dependencies;
- 	if ($#Prjs != -1) {
-@@ -528,21 +590,19 @@ sub FindIndepPrj {
- 			if (&IsHashNative($Prj)) {
- 				next;
- 			};
--			if (!(defined $$Dependencies{$Prj})) {
--				return $Prj;
--			};
- 			@PrjDeps = @{$$Dependencies{$Prj}};
--			if ($#PrjDeps == -1) {
--				return $Prj;
--			};
-+			return $Prj if ($#PrjDeps == -1);
- 		};
- 		# If there are only dependent projects in hash - generate error
--		return '' if ($build_from);
-+		return '' if ($BuildAllParents);
-+        if ($children) {
-+            $only_dependent = 1;
-+            return '';
-+        };
- 		print STDERR "\nError: projects";
--		DeadPrjLoop:
- 		foreach $Prj (keys %$Dependencies) {
--			if (IsHashNative($Prj)) {
--				next DeadPrjLoop;
-+			if (&IsHashNative($Prj)) {
-+				next;
- 			};
- 			$i = 0;
- 			print STDERR "\n$Prj depends on:";
-@@ -551,12 +611,12 @@ sub FindIndepPrj {
- 			};
- 		};
- 		&print_error ("\nhave dead or circular dependencies\n");
--		$ENV{mk_tmp} = '';
--		exit (1);
--	};
-+	} else {
-+        $no_projects = 1;
-+        return '';
-+    };
- };
- 
--
- #
- # Check if given entry is HASH-native, that is not a user-defined data
- #
-@@ -570,7 +630,6 @@ sub IsHashNative {
- 	};
- };
- 
--
- #
- # Getting array of dependencies from the string given
- #
-@@ -581,10 +640,7 @@ sub GetDependenciesArray {
- 	$string = $DepString;
- 	$prj = shift;
- 	while (!($DepString =~ /^NULL/)) {
--		if (!$DepString) {
--			&print_error("Project $prj has wrong written dependencies string:\n $string");
--			exit (1);
--		};
-+		&print_error("Project $prj has wrong written dependencies string:\n $string") if (!$DepString);
- 		$DepString =~ /(\S+)\s*/;
- 		$ParentPrj = $1;
- 		$DepString = $';
-@@ -593,17 +649,13 @@ sub GetDependenciesArray {
- 			if (($prj_platform{$ParentPrj} ne $1) && 
- 				($prj_platform{$ParentPrj} ne 'all')) {
- 				&print_error ("$ParentPrj\.$1 is a wrong dependency identifier!\nCheck if it is platform dependent");
--				exit (1);
- 			};
--			if (&CheckPlatform($1)) {
--				$AliveDependencies{$ParentPrj}++;
--			}
-+			$AliveDependencies{$ParentPrj}++ if (&CheckPlatform($1));
- 			push(@Dependencies, $ParentPrj);
- 		} else {
- 			if ((exists($prj_platform{$ParentPrj})) && 
- 				($prj_platform{$ParentPrj} ne 'all') ) {
- 				&print_error("$ParentPrj is a wrong used dependency identifier!\nCheck if it is platform dependent");
--				exit (1);
- 			};
- 			push(@Dependencies, $ParentPrj);
- 		};
-@@ -624,59 +676,284 @@ sub GetDirectoryList {
- 	return @DirectoryList;
- };
- 
-+sub print_error {
-+    my $message = shift;
-+    print STDERR "\nERROR: $message\n";
-+	$ENV{mk_tmp} = '';
-+	close CMD_FILE if ($cmd_file);
-+	unlink ($cmd_file);
-+	exit(1) if (!$child);
-+};
-+
-+sub usage {
-+	print STDERR "\nbuild\n";
-+    print STDERR "Syntax:	build [--help|-all|-from|-from_opt|since prj_name|-file file_name|-PP processes|-dlv[_switch] dlvswitch] \n";
-+    print STDERR "Example:	build -from sfx2\n";
-+    print STDERR "				- build all projects including current one from sfx2\n";
-+    print STDERR "Example:	build -from_opt sfx2\n";
-+    print STDERR "				- the same as -from, but skip all projects that could have been built (no secure way, use ONLY when -all or -from is already been run and there no external dependencies\' changes occurred)\n";
-+    print STDERR "Keys:		-all		- build all projects from very beginning till current one\n";
-+    print STDERR "		-from		- build all projects beginning from the specified till current one\n";
-+    print STDERR "		-from_opt	- build all projects beginning from the specified till current one (optimized version)\n";
-+    print STDERR "		-since		- build all projects beginning from the specified till current one (optimized version, skips specified project)\n";
-+    print STDERR "		-show		- show what is going to be built\n";
-+    print STDERR "		-file		- generate command file file_name\n";
-+    print STDERR "		-deliver	- only deliver, no build (usable for \'-all\' and \'-from\' keys)\n";
-+    print STDERR "		-PP			- start multiprocessing build, with number of processes passed (UNIXes only)\n";
-+    print STDERR "		-dlv[_switch]	- use deliver with the switch specified\n";
-+    print STDERR "		--help		- print help info\n";
-+    print STDERR "Default:			- build current project\n";
-+    print STDERR "Keys that are not listed above would be passed to dmake\n";
-+};
-+
- #
- # Get all options passed
- #
- sub get_options {
- 	my $arg;
--	#&usage() && exit(0) if ($#ARGV == -1);
--	#$QuantityToBuild
- 	while ($arg = shift @ARGV) {
--		$arg =~ /^PP$/			and $QuantityToBuild = shift @ARGV 	and next;
-+		$arg =~ /^-PP$/			and $QuantityToBuild = shift @ARGV 	and next;
-+		$arg =~ /^-PP(\d+)$/			and $QuantityToBuild = $1 and next;
- 		$arg =~ /^-all$/		and $BuildAllParents = 1 			and next;
- 		$arg =~ /^-show$/		and $show = 1			 			and next;
- 		$arg =~ /^-deliver$/	and $deliver = 1		 			and next;
-+		$arg =~ /^-dlv_switch$/	and $dlv_switch = &get_switch_options	and next;
-+		$arg =~ /^-dlv$/		and $dlv_switch = &get_switch_options	and next;
-+		$arg =~ /^-file$/		and $cmd_file = shift @ARGV	 		and next;
- 		$arg =~ /^-from$/		and $BuildAllParents = 1 
- 								and $build_from = shift @ARGV 		and next;
- 		$arg =~ /^-from_opt$/	and $BuildAllParents = 1 
- 								and $build_from_opt = shift @ARGV	and next;
- 		
--		$arg =~ /^-since$/	and $BuildAllParents = 1 
-+		$arg =~ /^-since$/		and $BuildAllParents = 1 
- 								and $build_since = shift @ARGV 		and next;
--		$arg =~ /^-help$/		and &usage							and exit(0);
-+		$arg =~ /^--help$/		and &usage							and exit(0);
- 		push (@dmake_args, $arg);
--	};
--	if ($build_from && $build_from_opt) {
--		&print_error('Switches -from an -from_opt collision');
--		exit(1);
- 	};
-+	&print_error('Switches -from and -from_opt collision') if ($build_from && $build_from_opt);
- 	
--	if ($build_from && $build_since) {
--		&print_error('Switches -from an -since collision');
--		exit(1);
--	};
-+	&print_error('Switches -from and -since collision') if ($build_from && $build_since);
- 	@ARGV = @dmake_args;
-+	$cmd_file = '' if ($show);
-+	if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) {
-+		$QuantityToBuild = 0;
-+		&print_error('-PP switch is unusable under windows!\n');
-+	};
- };
- 
--sub print_error {
--    my $message = shift;
--    print STDERR "\nERROR: $message\n";
-+#
-+# get all options without '-'
-+#
-+sub get_switch_options {
-+	my $string = '';
-+	my $option = '';
-+	while ($option = shift @ARGV) {
-+		if (!($option =~ /^-/)) {
-+			$string .= '-' . $option;
-+			$string .= ' ';
-+		} else {
-+			unshift(@ARGV, $option);
-+			last;
-+		};
-+	};
-+	$string =~ s/\s$//;
-+	return $string;
- };
- 
--sub usage {
--	print STDERR "\nbuild\n";
--    print STDERR "Syntax:	build [-help|-all|-from|-from_opt|since prj_name] \n";
--    print STDERR "Example:	build -from sfx2\n";
--    print STDERR "				- build all projects including current one from sfx2\n";
--    print STDERR "Example:	build -from_opt sfx2\n";
--    print STDERR "				- the same as -from, but skip all projects that could have been built (no secure way, use ONLY when -all or -from is already been run and there no external dependensies\' changes occurred)\n";
--    print STDERR "Keys:		-all		- build all projects from very beginning till current one\n";
--    print STDERR "		-from		- build all projects beginning from the specified till current one\n";
--    print STDERR "		-from_opt	- build all projects beginning from the specified till current one (optimized version)\n";
--    print STDERR "		-since		- build all projects beginning from the specified till current one (optimized version, skips specified project)\n";
--    print STDERR "		-show		- show what is gonna be built\n";
--    print STDERR "		-deliver	- only deliver, no build (usable for \'-all\' and \'-from\' keys)\n";
--    print STDERR "		-help		- print help info\n";
--    print STDERR "Default:			- build current project\n";
--    print STDERR "Keys that are not listed above would be passed to dmake\n";
-+#
-+# cancel build when one of children has error exit code
-+#
-+sub cancel_build {
-+	while (&children_number) {sleep(1)};
-+	print STDERR "\n";
-+	foreach (keys %broken_build) {
-+		print STDERR "ERROR: error $_ occurred while making ", $broken_build{$_}, "\n";
-+	};
-+    exit(1);
-+};
-+
-+#
-+# Function for storing error in multiprocessing AllParents build
-+#
-+sub store_error {
-+	my ($pid, $error_code) = @_;
-+	my $child_nick = $processes_hash{$pid};
-+	$broken_build {$error_code} = &CorrectPath($StandDir . $PathHash{$child_nick});
- };
-+
-+#
-+# child handler (clears (or stores info about) the terminated child)
-+#
-+sub handle_dead_child {
-+    my $pid = 0;
-+    foreach (keys %processes_hash) {
-+        if (($pid = waitpid($_, &WNOHANG)) > 0) {
-+			&store_error($pid, $?) if ($?);
-+			&clear_from_child($pid);
-+        };
-+    };
-+};
-+
-+sub clear_from_child {
-+    my $pid = shift;
-+	my $child_nick = $processes_hash{$pid};
-+  	&RemoveFromDependencies($child_nick, 
-+                            $folders_hashes{$child_nick});
-+	$running_children{$folders_hashes{$child_nick}}--; 
-+    delete $processes_hash{$pid};
-+	$only_dependent = 0;
-+};
-+
-+#
-+# Register signal handler & unblock SIGALRM
-+# 
-+sub register_signal_handler {
-+	$sigaction = POSIX::SigAction->new('main::handle_dead_child');
-+	sigaction(SIGCHLD, $sigaction);
-+	$handler_set = 1;
-+};
-+
-+#
-+# Build the entire project according to queue of dependencies
-+#
-+sub BuildDependent {
-+	$dependencies_hash = shift;
-+	my $pid = 0;
-+	my $child_nick = '';
-+	while ($child_nick = &PickPrjToBuild($dependencies_hash)) {
-+        if (($QuantityToBuild) ) { # multyprocessing not for $BuildAllParents (-all etc)!!
-+			&register_signal_handler if (!$handler_set);
-+            do {
-+                # start current child & all
-+				# that could be started now				
-+                &start_child($child_nick) if ($child_nick);	 
-+				sleep if (&children_number() >= $QuantityToBuild);
-+    			$child_nick = &PickPrjToBuild($dependencies_hash);
-+				if ($only_dependent) {
-+					return if ($BuildAllParents);
-+					sleep; 
-+				}; 
-+            } while (!$no_projects);
-+			return if ($BuildAllParents);
-+            while (&children_number()) {
-+                sleep(5);
-+            };
-+            print STDERR "Multiprocessing build is finished\n";
-+        } else {
-+		    &dmake_dir($child_nick);
-+        };
-+		$child_nick = '';
-+	};
-+};
-+
-+sub children_number {
-+	return scalar (keys %processes_hash);
-+};
-+
-+sub start_child {
-+	&cancel_build if (scalar keys %broken_build);
-+	my $child_nick = shift;
-+	my $pid;
-+	if ($pid = fork) { # parent
-+        $processes_hash{$pid} = $child_nick;
-+		print 'Running processes: ', &children_number(), "\n";
-+		$folders_hashes{$child_nick} = $dependencies_hash;
-+		$running_children{$dependencies_hash}++; 
-+		sleep(1) if ($BuildAllParents);
-+	} elsif (defined $pid) { # child
-+		$child = 1;
-+		#print "$child_nick\n";
-+		&dmake_dir($child_nick);
-+	};
-+};
-+
-+#
-+# Build everything that should be built multiprocessing version 
-+#
-+sub build_multiprocessing {
-+	my $Prj;
-+	my @build_queue = ();		# array, containing queue of projects
-+								# to build
-+	do {
-+		while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
-+			if ($build_from_opt) {
-+				if ($build_from_opt ne $Prj) {
-+					&RemoveFromDependencies($Prj, \%ParentDepsHash);
-+					next;
-+				} else {
-+					$build_from_opt = '';
-+				};
-+			};
-+			if ($build_since) {
-+				if ($build_since ne $Prj) {
-+					&RemoveFromDependencies($Prj, \%ParentDepsHash);
-+				} else {
-+					&RemoveFromDependencies($Prj, \%ParentDepsHash);
-+					$build_since = '';
-+				};
-+				next;
-+			};
-+			push @build_queue, $Prj;
-+			$projects_deps_hash{$Prj} = {};
-+			&get_deps_hash(&CorrectPath($StandDir.$Prj), $projects_deps_hash{$Prj});
-+		};
-+		sleep(1) if (!$Prj);
-+		&build_actual_queue(\@build_queue);
-+	} while (scalar (keys %ParentDepsHash));
-+    while (&children_number()) {
-+        sleep(5);
-+    };
-+	&cancel_build if (scalar keys %broken_build);
-+    print STDERR "Multiprocessing build is finished\n";
-+	exit(0);
-+};
-+
-+#
-+# Here the built queue is built as long as possible
-+#
-+sub build_actual_queue {
-+	my $build_queue = shift;
-+	my $i = 0;
-+	do {
-+		while ($i <= (scalar(@$build_queue) - 1)) {
-+			&cancel_build if (scalar keys %broken_build);
-+			$Prj = $$build_queue[$i];
-+			&annonce_module($Prj) if (!(defined $module_annonced{$Prj}));
-+			$only_dependent = 0;
-+			$no_projects = 0;
-+			&BuildDependent($projects_deps_hash{$Prj});
-+			if ($no_projects && ($running_children{$projects_deps_hash{$Prj}} == 0)) {
-+				chdir(&CorrectPath($StandDir.$Prj));
-+				system ("$deliver_commando") if (!$show && ($Prj ne $CurrentPrj));
-+				delete $projects_deps_hash{$Prj};
-+				&RemoveFromDependencies($Prj, \%ParentDepsHash);
-+				splice (@$build_queue, $i, 1);
-+				next;
-+			};
-+			$i++;
-+		};
-+		$i = 0;
-+	} while (!&are_all_dependent($build_queue));
-+};
-+
-+#
-+# Print announcement for module just started
-+#
-+sub annonce_module {
-+	my $Prj = shift;
-+	print $echo.	"=============\n";	
-+	print $echo.	"Building project $Prj\n";
-+	print $echo.	"=============\n";	
-+	$module_annonced{$Prj}++;
-+};
-+
-+sub are_all_dependent {
-+	my $build_queue = shift;
-+	my $folder = '';
-+	foreach my $prj (@$build_queue) {
-+		$folder = &FindIndepPrj($projects_deps_hash{$prj});
-+		return '' if ($folder);
-+	};
-+	return '1';
-+};
-+
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch
deleted file mode 100644
index 389258da07dc..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur oo_cvs/config_office/set_soenv.1 oo_stable1_cvs20020411_src/config_office/set_soenv.1
---- oo_cvs/config_office/set_soenv.1	Wed Mar 20 19:10:58 2002
-+++ oo_stable1_cvs20020411_src/config_office/set_soenv.1	Fri Apr 12 16:45:11 2002
-@@ -40,7 +40,7 @@
- #
- # Set this value equal to the corresponding amount of
- # command line arguments. 
--my $numArgs = 20;
-+my $numArgs = 22;
- # Determining the amount of arguments in the call.
- my $numEnter = $#ARGV + 1;
- if ( $numEnter != $numArgs ) 
-@@ -96,7 +96,7 @@
-      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, 
-      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
--     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
-+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $CC, $CXX );
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -146,6 +146,8 @@
- $MINGWIN32	= $ARGV [ 17 ];     # use MINGWIN32
- $use_shell	= $ARGV [ 18 ];     # preferred shell
- $USE_GCC3	= $ARGV [ 19 ];     # use gcc3 (only for unxlngi4 at the moment)
-+$CC		= '"'.$ARGV [ 20 ].'"'; # C compiler
-+$CXX		= '"'.$ARGV [ 21 ].'"'; # C++ compiler
- #
- #---------------------------------------------------------------
- # IIIb. Initialising the variables for the system commands, etc.
-@@ -1464,6 +1466,8 @@
- ToFile( "SOLARINC",          $SOLARINC,          "e" );
- ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
- ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
-+ToFile( "CCCOMP",            $CC,                "e" );
-+ToFile( "CXXCOMP",           $CXX,               "e" );
- ToFile( "BISON_HAIRY",       $BISON_HAIRY,       "e" );
- ToFile( "BISON_SIMPLE",      $BISON_SIMPLE,      "e" );
- ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,"e" );
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
deleted file mode 100644
index f5ebf7ea2ad1..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -urN stlport/STLport-4.5.3.patch stlport.azarah/STLport-4.5.3.patch
---- stlport/STLport-4.5.3.patch	Thu Jan  1 02:00:00 1970
-+++ stlport.azarah/STLport-4.5.3.patch	Tue Sep 10 22:50:10 2002
-@@ -0,0 +1,247 @@
-+*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
-+***************
-+*** 293,299 ****
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern _CRTIMP ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+--- 293,299 ----
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
-+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! #
-+! CC = $(CCCOMP) 
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
-+! 
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXXCOMP) --fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! 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) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! 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.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
-+--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
-+***************
-+*** 10,16 ****
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+--- 10,16 ----
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
-+***************
-+*** 62,68 ****
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+--- 62,68 ----
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+***************
-+*** 79,87 ****
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+--- 79,87 ----
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+***************
-+*** 95,101 ****
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+--- 95,101 ----
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
-+--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
-+***************
-+*** 49,54 ****
-+--- 49,59 ----
-+  
-+  _STLP_BEGIN_NAMESPACE
-+  
-++ /* maybe limit to gcc 3.x */
-++ #if defined( __GNUC__)
-++ #define _STLP_NOTHROW_INHERENTLY throw()
-++ #endif
-++ 
-+  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+  public:
-+    __Named_exception(const string& __str) 
-+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
-+***************
-+*** 226,233 ****
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 285,298 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # 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) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 285,298 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
-+--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
-+***************
-+*** 84,90 ****
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-+--- 84,90 ----
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-diff -urN stlport/makefile.mk stlport.azarah/makefile.mk
---- stlport/makefile.mk	Tue Sep 10 22:38:00 2002
-+++ stlport.azarah/makefile.mk	Tue Sep 10 22:39:11 2002
-@@ -83,8 +83,8 @@
- TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
- .ELSE
--TARFILE_NAME=STLport-4.5
--PATCH_FILE_NAME=STLport-4.5.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=STLport-4.5.3.patch
- .ENDIF
- 
- .IF "$(GUI)"=="WNT"
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch
deleted file mode 100644
index 2a4baf0cf6bc..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -urN stlport/STLport-4.5.3.patch stlport.azarah/STLport-4.5.3.patch
---- stlport/STLport-4.5.3.patch	Thu Jan  1 02:00:00 1970
-+++ stlport.azarah/STLport-4.5.3.patch	Tue Sep 10 22:50:10 2002
-@@ -0,0 +1,247 @@
-+*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
-+***************
-+*** 293,299 ****
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern _CRTIMP ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+--- 293,299 ----
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
-+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! #
-+! CC = $(CCCOMP) 
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
-+! 
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXXCOMP) --fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! 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) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! 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.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
-+--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
-+***************
-+*** 10,16 ****
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+--- 10,16 ----
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
-+***************
-+*** 62,68 ****
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+--- 62,68 ----
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+***************
-+*** 79,87 ****
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+--- 79,87 ----
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+***************
-+*** 95,101 ****
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+--- 95,101 ----
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
-+--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
-+***************
-+*** 49,54 ****
-+--- 49,59 ----
-+  
-+  _STLP_BEGIN_NAMESPACE
-+  
-++ /* maybe limit to gcc 3.x */
-++ #if defined( __GNUC__)
-++ #define _STLP_NOTHROW_INHERENTLY throw()
-++ #endif
-++ 
-+  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+  public:
-+    __Named_exception(const string& __str) 
-+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
-+***************
-+*** 226,233 ****
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v32/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 285,298 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # 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) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 285,298 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v32
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
-+--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
-+***************
-+*** 84,90 ****
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-+--- 84,90 ----
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-diff -urN stlport/makefile.mk stlport.azarah/makefile.mk
---- stlport/makefile.mk	Tue Sep 10 22:38:00 2002
-+++ stlport.azarah/makefile.mk	Tue Sep 10 22:39:11 2002
-@@ -83,8 +83,8 @@
- TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
- .ELSE
--TARFILE_NAME=STLport-4.5
--PATCH_FILE_NAME=STLport-4.5.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=STLport-4.5.3.patch
- .ENDIF
- 
- .IF "$(GUI)"=="WNT"
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch
deleted file mode 100644
index 581770a87466..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru oo_cvs/solenv/inc/unxlngi3.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk
---- oo_cvs/solenv/inc/unxlngi3.mk	Wed Oct 24 19:21:47 2001
-+++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk	Fri Apr 12 21:15:30 2002
-@@ -85,9 +85,9 @@
- .ENDIF 
- 
- # name of C++ Compiler
--CC=g++
-+CC=$(CXXCOMP)
- # name of C Compiler
--cc=gcc
-+cc=$(CCCOMP)
- # flags for C and C++ Compiler
- # do not use standard header search paths
- # if installed elsewhere
-@@ -138,7 +138,7 @@
- DYNAMIC		= -Wl,-Bdynamic
- 
- # name of linker
--LINK=gcc
-+LINK=$(CXXCOMP)
- # default linker flags
- LINKFLAGS=
- 
-Only in oo_stable1_cvs20020411_src/solenv/inc: unxlngi3.mk.orig
-diff -ru oo_cvs/solenv/inc/unxlngi4.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk
---- oo_cvs/solenv/inc/unxlngi4.mk	Fri Dec 21 13:24:32 2001
-+++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk	Fri Apr 12 19:58:42 2002
-@@ -85,9 +85,9 @@
- .ENDIF 
- 
- # name of C++ Compiler
--CC=g++
-+CC=$(CXXCOMP)
- # name of C Compiler
--cc=gcc
-+cc=$(CCCOMP)
- # flags for C and C++ Compiler
- # do not use standard header search paths
- # if installed elsewhere
-@@ -147,7 +147,7 @@
- DYNAMIC		= -Wl,-Bdynamic
- 
- # name of linker
--LINK=gcc
-+LINK=$(CXXCOMP)
- # default linker flags
- LINKFLAGS=
- 
-diff -ru oo_cvs/solenv/inc/unxlngppc.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk
---- oo_cvs/solenv/inc/unxlngppc.mk	Thu Feb 28 21:39:42 2002
-+++ oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk	Fri Apr 12 21:14:54 2002
-@@ -26,9 +26,9 @@
- 
- 
- # name of C++ Compiler
--CC=g++ 
-+CC=$(CXXCOMP)
- # name of C Compiler
--cc=gcc
-+cc=$(CCCOMP)
- 
- # source code is still not signed versus unsigned char clean 
- CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
-@@ -81,7 +81,7 @@
- DYNAMIC = -Wl,-Bdynamic 
- 
- # name of linker
--LINK=gcc 
-+LINK=$(CXXCOMP) 
- # default linker flags
- LINKFLAGS= 
- 
---- oo_1.0_src/solenv/inc/unxlngppc4.mk~	Wed Jun 26 01:40:37 2002
-+++ oo_1.0_src/solenv/inc/unxlngppc4.mk	Wed Jun 26 01:46:15 2002
-@@ -85,9 +85,9 @@
- .ENDIF 
- 
- # name of C++ Compiler
--CC=g++
-+CC=$(CXXCOMP)
- # name of C Compiler
--cc=gcc
-+cc=$(CCCOMP)
- 
- # flags for C and C++ Compiler
- # do not use standard header search paths
-@@ -151,7 +151,7 @@
- DYNAMIC		= -Wl,-Bdynamic
- 
- # name of linker
--LINK=gcc
-+LINK=$(CXXCOMP)
- # default linker flags
- LINKFLAGS=
- 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-freetype-2.1.2.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-freetype-2.1.2.patch
deleted file mode 100644
index 8500b73d0dfd..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-freetype-2.1.2.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Index: oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx
-===================================================================
-RCS file: /cvs/oo/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
-retrieving revision 1.69
-diff -u -3 -p -r1.69 gcach_ftyp.cxx
---- oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx	2002/01/02 10:38:06	1.69
-+++ oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx	2002/06/17 14:37:50
-@@ -104,6 +104,13 @@
- #include "freetype/internal/sfnt.h"
- #include "freetype/internal/ftstream.h"
- 
-+// Freetype versions < 2.1 used different stream macro names
-+#ifndef FT_NEXT_USHORT
-+#define FT_NEXT_USHORT NEXT_UShort
-+#define FT_NEXT_SHORT NEXT_Short
-+#define FT_NEXT_LONG NEXT_Long
-+#endif
-+
- #include <svapp.hxx>
- #include <settings.hxx>
- #include <tools/lang.hxx>
-@@ -1200,29 +1207,29 @@ ULONG FreetypeServerFont::GetKernPairs( 
-     ImplKernPairData aKernPair;
- 
-     const FT_Byte* pBuffer = pKern;
--    USHORT nVersion = NEXT_UShort( pBuffer );
--    USHORT nTableCnt = NEXT_UShort( pBuffer );
-+    USHORT nVersion = FT_NEXT_USHORT( pBuffer );
-+    USHORT nTableCnt = FT_NEXT_USHORT( pBuffer );
-     if( nVersion != 0 )     // ignore Apple's versions for now
-         nTableCnt = 0;
-     for( USHORT nTableIdx = 0; nTableIdx < nTableCnt; ++nTableIdx )
-     {
--        USHORT nSubVersion  = NEXT_UShort( pBuffer );
--        USHORT nSubLength   = NEXT_UShort( pBuffer );
--        USHORT nSubCoverage = NEXT_UShort( pBuffer );
-+        USHORT nSubVersion  = FT_NEXT_USHORT( pBuffer );
-+        USHORT nSubLength   = FT_NEXT_USHORT( pBuffer );
-+        USHORT nSubCoverage = FT_NEXT_USHORT( pBuffer );
-         if( (nSubCoverage&0x03) != 0x01 )	// no interest in minimum info here
-             continue;
-         switch( nSubCoverage >> 8 )
-         {
-             case 0: // version 0, kerning format 0
-             {
--                USHORT nPairs = NEXT_UShort( pBuffer );
-+                USHORT nPairs = FT_NEXT_USHORT( pBuffer );
-                 pBuffer += 6;   // skip search hints
-                 aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
-                 for( int i = 0; i < nPairs; ++i )
-                 {
--                    aKernPair.mnChar1 = NEXT_UShort( pBuffer );
--                    aKernPair.mnChar2 = NEXT_UShort( pBuffer );
--                    /*long nUnscaledKern=*/ NEXT_Short( pBuffer );
-+                    aKernPair.mnChar1 = FT_NEXT_USHORT( pBuffer );
-+                    aKernPair.mnChar2 = FT_NEXT_USHORT( pBuffer );
-+                    /*long nUnscaledKern=*/ FT_NEXT_SHORT( pBuffer );
-                     aKernGlyphVector.push_back( aKernPair );
-                 }
-             }
-@@ -1231,18 +1238,18 @@ ULONG FreetypeServerFont::GetKernPairs( 
-             case 2:	// version 0, kerning format 2
-             {
-                 const FT_Byte* pSubTable = pBuffer;
--                /*USHORT nRowWidth	=*/ NEXT_UShort( pBuffer );
--                USHORT nOfsLeft     = NEXT_UShort( pBuffer );
--                USHORT nOfsRight    = NEXT_UShort( pBuffer );
--                USHORT nOfsArray    = NEXT_UShort( pBuffer );
-+                /*USHORT nRowWidth	=*/ FT_NEXT_USHORT( pBuffer );
-+                USHORT nOfsLeft     = FT_NEXT_USHORT( pBuffer );
-+                USHORT nOfsRight    = FT_NEXT_USHORT( pBuffer );
-+                USHORT nOfsArray    = FT_NEXT_USHORT( pBuffer );
- 
-                 const FT_Byte* pTmp = pSubTable + nOfsLeft;
--                USHORT nFirstLeft   = NEXT_UShort( pTmp );
--                USHORT nLastLeft    = NEXT_UShort( pTmp ) + nFirstLeft - 1;
-+                USHORT nFirstLeft   = FT_NEXT_USHORT( pTmp );
-+                USHORT nLastLeft    = FT_NEXT_USHORT( pTmp ) + nFirstLeft - 1;
- 
-                 pTmp = pSubTable + nOfsRight;
--                USHORT nFirstRight  = NEXT_UShort( pTmp );
--                USHORT nLastRight   = NEXT_UShort( pTmp ) + nFirstRight - 1;
-+                USHORT nFirstRight  = FT_NEXT_USHORT( pTmp );
-+                USHORT nLastRight   = FT_NEXT_USHORT( pTmp ) + nFirstRight - 1;
- 
-                 ULONG nPairs = (ULONG)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1);
-                 aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
-@@ -1253,7 +1260,7 @@ ULONG FreetypeServerFont::GetKernPairs( 
-                     aKernPair.mnChar1 = nLeft;
-                     for( int nRight = 0; nRight < nLastRight; ++nRight )
-                     {
--                        if( NEXT_Short( pTmp ) != 0 )
-+                        if( FT_NEXT_SHORT( pTmp ) != 0 )
-                         {
-                             aKernPair.mnChar2 = nRight;
-                             aKernGlyphVector.push_back( aKernPair );
-@@ -1531,10 +1538,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 	// parse GSUB header
- 	const FT_Byte* pGsubHeader = pGsubBase;
--	const ULONG nVersion			= NEXT_Long( pGsubHeader );
--	const USHORT nOfsScriptList		= NEXT_UShort( pGsubHeader );
--	const USHORT nOfsFeatureTable	= NEXT_UShort( pGsubHeader );
--	const USHORT nOfsLookupList		= NEXT_UShort( pGsubHeader );
-+	const ULONG nVersion			= FT_NEXT_LONG( pGsubHeader );
-+	const USHORT nOfsScriptList		= FT_NEXT_USHORT( pGsubHeader );
-+	const USHORT nOfsFeatureTable	= FT_NEXT_USHORT( pGsubHeader );
-+	const USHORT nOfsLookupList		= FT_NEXT_USHORT( pGsubHeader );
- 
- 	typedef std::vector<USHORT> UshortList;
- 	UshortList aFeatureIndexList;
-@@ -1542,22 +1549,22 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 	// parse Script Table
- 	const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
--	const USHORT nCntScript	= NEXT_UShort( pScriptHeader );
-+	const USHORT nCntScript	= FT_NEXT_USHORT( pScriptHeader );
- 	for( USHORT nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex )
- 	{
--		const ULONG nTag			= NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang
--		const USHORT nOfsScriptTable= NEXT_UShort( pScriptHeader );
-+		const ULONG nTag			= FT_NEXT_LONG( pScriptHeader ); // e.g. hani/arab/kana/hang
-+		const USHORT nOfsScriptTable= FT_NEXT_USHORT( pScriptHeader );
- 		if( (nTag != nRequestedScript) && (nRequestedScript != 0) )
- 			continue;
- 
- 		const FT_Byte* pScriptTable		= pGsubBase + nOfsScriptList + nOfsScriptTable;
--		const USHORT nDefaultLangsysOfs	= NEXT_UShort( pScriptTable );
--		const USHORT nCntLangSystem		= NEXT_UShort( pScriptTable );
-+		const USHORT nDefaultLangsysOfs	= FT_NEXT_USHORT( pScriptTable );
-+		const USHORT nCntLangSystem		= FT_NEXT_USHORT( pScriptTable );
- 		USHORT nLangsysOffset = 0;
- 		for( USHORT nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
- 		{
--			const ULONG nTag	= NEXT_Long( pScriptTable );	// e.g. KOR/ZHS/ZHT/JAN
--			const USHORT nOffset= NEXT_UShort( pScriptTable );
-+			const ULONG nTag	= FT_NEXT_LONG( pScriptTable );	// e.g. KOR/ZHS/ZHT/JAN
-+			const USHORT nOffset= FT_NEXT_USHORT( pScriptTable );
- 			if( (nTag != nRequestedLangsys) && (nRequestedLangsys != 0) )
- 				continue;
- 			nLangsysOffset = nOffset;
-@@ -1567,13 +1574,13 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 		if( (nDefaultLangsysOfs != 0) && (nDefaultLangsysOfs != nLangsysOffset) )
- 		{
- 			const FT_Byte* pLangSys	= pGsubBase + nOfsScriptList + nOfsScriptTable + nDefaultLangsysOfs;
--			const USHORT nLookupOrder	= NEXT_UShort( pLangSys );
--			const USHORT nReqFeatureIdx	= NEXT_UShort( pLangSys );
--			const USHORT nCntFeature	= NEXT_UShort( pLangSys );
-+			const USHORT nLookupOrder	= FT_NEXT_USHORT( pLangSys );
-+			const USHORT nReqFeatureIdx	= FT_NEXT_USHORT( pLangSys );
-+			const USHORT nCntFeature	= FT_NEXT_USHORT( pLangSys );
- 			aFeatureIndexList.push_back( nReqFeatureIdx );
- 			for( USHORT i = 0; i < nCntFeature; ++i )
- 			{
--				const USHORT nFeatureIndex = NEXT_UShort( pLangSys );
-+				const USHORT nFeatureIndex = FT_NEXT_USHORT( pLangSys );
- 				aFeatureIndexList.push_back( nFeatureIndex );
- 			}
- 		}
-@@ -1581,13 +1588,13 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 		if( nLangsysOffset != 0 )
- 		{
- 			const FT_Byte* pLangSys	= pGsubBase + nOfsScriptList + nOfsScriptTable + nLangsysOffset;
--			const USHORT nLookupOrder	= NEXT_UShort( pLangSys );
--			const USHORT nReqFeatureIdx	= NEXT_UShort( pLangSys );
--			const USHORT nCntFeature	= NEXT_UShort( pLangSys );
-+			const USHORT nLookupOrder	= FT_NEXT_USHORT( pLangSys );
-+			const USHORT nReqFeatureIdx	= FT_NEXT_USHORT( pLangSys );
-+			const USHORT nCntFeature	= FT_NEXT_USHORT( pLangSys );
- 			aFeatureIndexList.push_back( nReqFeatureIdx );
- 			for( USHORT i = 0; i < nCntFeature; ++i )
- 			{
--				const USHORT nFeatureIndex = NEXT_UShort( pLangSys );
-+				const USHORT nFeatureIndex = FT_NEXT_USHORT( pLangSys );
- 				aFeatureIndexList.push_back( nFeatureIndex );
- 			}
- 		}
-@@ -1601,11 +1608,11 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 	// parse Feature Table
- 	const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
--	const USHORT nCntFeature = NEXT_UShort( pFeatureHeader );
-+	const USHORT nCntFeature = FT_NEXT_USHORT( pFeatureHeader );
- 	for( USHORT nFeatureIndex = 0; nFeatureIndex < nCntFeature; ++nFeatureIndex )
- 	{
--		const ULONG nTag	= NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
--		const USHORT nOffset= NEXT_UShort( pFeatureHeader );
-+		const ULONG nTag	= FT_NEXT_LONG( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
-+		const USHORT nOffset= FT_NEXT_USHORT( pFeatureHeader );
- 
- 		// feature (required && (requested || available))?
- 		if( (aFeatureIndexList[0] != nFeatureIndex)
-@@ -1614,10 +1621,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 			continue;
- 
- 		const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset;
--		const USHORT nCntLookups = NEXT_UShort( pFeatureTable );
-+		const USHORT nCntLookups = FT_NEXT_USHORT( pFeatureTable );
- 		for( USHORT i = 0; i < nCntLookups; ++i )
- 		{
--			const USHORT nLookupIndex = NEXT_UShort( pFeatureTable );
-+			const USHORT nLookupIndex = FT_NEXT_USHORT( pFeatureTable );
- 			aLookupIndexList.push_back( nLookupIndex );
- 		}
- 		if( nCntLookups == 0 ) //### hack needed by Mincho/Gothic/Mingliu/Simsun/...
-@@ -1626,10 +1633,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 	// parse Lookup List
- 	const FT_Byte* pLookupHeader = pGsubBase + nOfsLookupList;
--	const USHORT nCntLookupTable = NEXT_UShort( pLookupHeader );
-+	const USHORT nCntLookupTable = FT_NEXT_USHORT( pLookupHeader );
- 	for( USHORT nLookupIdx = 0; nLookupIdx < nCntLookupTable; ++nLookupIdx )
- 	{
--		const USHORT nOffset = NEXT_UShort( pLookupHeader );
-+		const USHORT nOffset = FT_NEXT_USHORT( pLookupHeader );
- 		if( std::count( aLookupIndexList.begin(), aLookupIndexList.end(), nLookupIdx ) )
- 			aLookupOffsetList.push_back( nOffset );
- 	}
-@@ -1639,9 +1646,9 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 	{
- 		const USHORT nOfsLookupTable = *it;
- 		const FT_Byte* pLookupTable = pGsubBase + nOfsLookupList + nOfsLookupTable;
--		const USHORT eLookupType		= NEXT_UShort( pLookupTable );
--		const USHORT eLookupFlag		= NEXT_UShort( pLookupTable );
--		const USHORT nCntLookupSubtable	= NEXT_UShort( pLookupTable );
-+		const USHORT eLookupType		= FT_NEXT_USHORT( pLookupTable );
-+		const USHORT eLookupFlag		= FT_NEXT_USHORT( pLookupTable );
-+		const USHORT nCntLookupSubtable	= FT_NEXT_USHORT( pLookupTable );
- 
- 		// TODO: switch( eLookupType )
- 		if( eLookupType != 1 )	// TODO: once we go beyond SingleSubst
-@@ -1649,28 +1656,28 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 		for( USHORT nSubTableIdx = 0; nSubTableIdx < nCntLookupSubtable; ++nSubTableIdx )
- 		{
--			const USHORT nOfsSubLookupTable	= NEXT_UShort( pLookupTable );
-+			const USHORT nOfsSubLookupTable	= FT_NEXT_USHORT( pLookupTable );
- 			const FT_Byte* pSubLookup = pGsubBase + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable;
- 
- 
--			const USHORT nFmtSubstitution	= NEXT_UShort( pSubLookup );
--			const USHORT nOfsCoverage		= NEXT_UShort( pSubLookup );
-+			const USHORT nFmtSubstitution	= FT_NEXT_USHORT( pSubLookup );
-+			const USHORT nOfsCoverage		= FT_NEXT_USHORT( pSubLookup );
- 
- 			typedef std::pair<USHORT,USHORT> GlyphSubst;
- 			typedef std::vector<GlyphSubst> SubstVector;
- 			SubstVector aSubstVector;
- 
- 			const FT_Byte* pCoverage	= pGsubBase + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable + nOfsCoverage;
--			const USHORT nFmtCoverage	= NEXT_UShort( pCoverage );
-+			const USHORT nFmtCoverage	= FT_NEXT_USHORT( pCoverage );
- 			switch( nFmtCoverage )
- 			{
- 				case 1:			// Coverage Format 1
- 					{
--						const USHORT nCntGlyph = NEXT_UShort( pCoverage );
-+						const USHORT nCntGlyph = FT_NEXT_USHORT( pCoverage );
- 						aSubstVector.reserve( nCntGlyph );
- 						for( USHORT i = 0; i < nCntGlyph; ++i )
- 						{
--							const USHORT nGlyphId = NEXT_UShort( pCoverage );
-+							const USHORT nGlyphId = FT_NEXT_USHORT( pCoverage );
- 							aSubstVector.push_back( GlyphSubst( nGlyphId, 0 ) );
- 						}
- 					}
-@@ -1678,12 +1685,12 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 				case 2:			// Coverage Format 2
- 					{
--						const USHORT nCntRange = NEXT_UShort( pCoverage );
-+						const USHORT nCntRange = FT_NEXT_USHORT( pCoverage );
- 						for( int i = nCntRange; --i >= 0; )
- 						{
--							const USHORT nGlyph0 = NEXT_UShort( pCoverage );
--							const USHORT nGlyph1 = NEXT_UShort( pCoverage );
--							const USHORT nCovIdx = NEXT_UShort( pCoverage );
-+							const USHORT nGlyph0 = FT_NEXT_USHORT( pCoverage );
-+							const USHORT nGlyph1 = FT_NEXT_USHORT( pCoverage );
-+							const USHORT nCovIdx = FT_NEXT_USHORT( pCoverage );
- 							for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
- 								aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
- 						}
-@@ -1697,7 +1704,7 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 			{
- 				case 1:		// Single Substitution Format 1
- 					{
--						const USHORT nDeltaGlyphId = NEXT_UShort( pSubLookup );
-+						const USHORT nDeltaGlyphId = FT_NEXT_USHORT( pSubLookup );
- 						for(; it != aSubstVector.end(); ++it )
- 							(*it).second = (*it).first + nDeltaGlyphId;
- 					}
-@@ -1705,10 +1712,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
- 
- 				case 2:		// Single Substitution Format 2
- 					{
--						const USHORT nCntGlyph = NEXT_UShort( pSubLookup );
-+						const USHORT nCntGlyph = FT_NEXT_USHORT( pSubLookup );
- 						for( int i = nCntGlyph; (it != aSubstVector.end()) && (--i>=0); ++it )
- 						{
--							const USHORT nGlyphId = NEXT_UShort( pSubLookup );
-+							const USHORT nGlyphId = FT_NEXT_USHORT( pSubLookup );
- 							(*it).second = nGlyphId;
- 						}
- 					}
---- oo_1.0.1_src/freetype/makefile.mk.orig	Sun Sep 22 10:37:16 2002
-+++ oo_1.0.1_src/freetype/makefile.mk	Sun Sep 22 10:37:42 2002
-@@ -71,9 +71,9 @@
- 
- # --- Files --------------------------------------------------------
- 
--TARFILE_NAME=freetype-2.0.5
-+TARFILE_NAME=freetype-2.1.2
- 
--PATCH_FILE_NAME=freetype-2.0.5.patch
-+PATCH_FILE_NAME=freetype-2.1.2.patch
- 
- CONFIGURE_DIR=
- #relative to CONFIGURE_DIR
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch
deleted file mode 100644
index 975335a0173a..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- oo_1.0.1_src/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_1.0.1_src.azarah/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -113,12 +113,12 @@
- BINDINGDLL=$(COMNAME)_uno
- 
- .IF "$(COMID)"=="gcc3"
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- ADDITIONAL_DLLS= \
-        $(DESTDIRDLL)$/libgcc_s.so.1            \
-        $(DESTDIRDLL)$/libgcc_s.so              \
--       $(DESTDIRDLL)$/libstdc++.so.4           \
--       $(DESTDIRDLL)$/libstdc++.so.4.0.0
-+       $(DESTDIRDLL)$/libstdc++.so.5           \
-+       $(DESTDIRDLL)$/libstdc++.so.5.0.0
- .ELSE
- ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
-@@ -498,15 +498,15 @@
- #---------------------------------------------------------
- # special targets for linux gcc3
- 
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- 
--$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5.0.0 : $(DLLOUT)$/libstdc++.so.5.0.0 $(DIRLIST)
-        -rm -f $@
--       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
-+       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.0 $@
- 
--$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.0 $(DIRLIST)
-        -rm -f $@
--       +ln -s libstdc++.so.4.0.0 $@
-+       +ln -s libstdc++.so.5.0.0 $@
- 
- .ELSE
-  
---- oo_1.0.1_src/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:10 2002
-+++ oo_1.0.1_src.azarah/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:40 2002
-@@ -11,11 +11,11 @@
-     Styles		= (PACKED, SETUPZIP);
- End
- 
--#if ( CCNUMVER >= 000300010000 )
-+#if ( CCNUMVER >= 000300020000 )
- 
- File gid_File_Lib_Stdc
-     BIN_FILE_BODY;
--    Name               = STRING(libstdc++.so.4.0.0);
-+    Name               = STRING(libstdc++.so.5.0.0);
-     Dir                        = GCFG_BINARY_DIR;
-     Styles             = (PACKED, SETUPZIP);
- End
-@@ -24,7 +24,7 @@
- Shortcut gid_Shortcut_Lib_Stdc
-     FileID      = gid_File_Lib_Stdc;
-     Dir         = GCFG_BINARY_DIR;
--    Name        = STRING(libstdc++.so.4);
-+    Name        = STRING(libstdc++.so.5);
-     Styles      = (NETWORK,RELATIVE);
- End
- 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.1.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.1.patch
deleted file mode 100644
index a434222bdf40..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- oo_1.0.1_src/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_1.0.1_src.azarah/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -113,12 +113,12 @@
- BINDINGDLL=$(COMNAME)_uno
- 
- .IF "$(COMID)"=="gcc3"
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- ADDITIONAL_DLLS= \
-        $(DESTDIRDLL)$/libgcc_s.so.1            \
-        $(DESTDIRDLL)$/libgcc_s.so              \
--       $(DESTDIRDLL)$/libstdc++.so.4           \
--       $(DESTDIRDLL)$/libstdc++.so.4.0.0
-+       $(DESTDIRDLL)$/libstdc++.so.5           \
-+       $(DESTDIRDLL)$/libstdc++.so.5.0.1
- .ELSE
- ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
-@@ -498,15 +498,15 @@
- #---------------------------------------------------------
- # special targets for linux gcc3
- 
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- 
--$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5.0.1 : $(DLLOUT)$/libstdc++.so.5.0.1 $(DIRLIST)
-        -rm -f $@
--       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
-+       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.1 $@
- 
--$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.1 $(DIRLIST)
-        -rm -f $@
--       +ln -s libstdc++.so.4.0.0 $@
-+       +ln -s libstdc++.so.5.0.1 $@
- 
- .ELSE
-  
---- oo_1.0.1_src/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:10 2002
-+++ oo_1.0.1_src.azarah/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:40 2002
-@@ -11,11 +11,11 @@
-     Styles		= (PACKED, SETUPZIP);
- End
- 
--#if ( CCNUMVER >= 000300010000 )
-+#if ( CCNUMVER >= 000300020000 )
- 
- File gid_File_Lib_Stdc
-     BIN_FILE_BODY;
--    Name               = STRING(libstdc++.so.4.0.0);
-+    Name               = STRING(libstdc++.so.5.0.1);
-     Dir                        = GCFG_BINARY_DIR;
-     Styles             = (PACKED, SETUPZIP);
- End
-@@ -24,7 +24,7 @@
- Shortcut gid_Shortcut_Lib_Stdc
-     FileID      = gid_File_Lib_Stdc;
-     Dir         = GCFG_BINARY_DIR;
--    Name        = STRING(libstdc++.so.4);
-+    Name        = STRING(libstdc++.so.5);
-     Styles      = (NETWORK,RELATIVE);
- End
- 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-generic.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-generic.patch
deleted file mode 100644
index 9fad0cc0039f..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-generic.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- oo_1.0.1_src/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_1.0.1_src.azarah/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -113,12 +113,12 @@
- BINDINGDLL=$(COMNAME)_uno
- 
- .IF "$(COMID)"=="gcc3"
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- ADDITIONAL_DLLS= \
-        $(DESTDIRDLL)$/libgcc_s.so.1            \
-        $(DESTDIRDLL)$/libgcc_s.so              \
--       $(DESTDIRDLL)$/libstdc++.so.4           \
--       $(DESTDIRDLL)$/libstdc++.so.4.0.0
-+       $(DESTDIRDLL)$/libstdc++.so.5           \
-+       $(DESTDIRDLL)$/libstdc++.so.<libversion>
- .ELSE
- ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
-@@ -498,15 +498,15 @@
- #---------------------------------------------------------
- # special targets for linux gcc3
- 
--.IF "$(CCNUMVER)">="000300010000"
-+.IF "$(CCNUMVER)">="000300020000"
- 
--$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.<libversion> : $(DLLOUT)$/libstdc++.so.<libversion> $(DIRLIST)
-        -rm -f $@
--       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
-+       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.<libversion> $@
- 
--$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.<libversion> $(DIRLIST)
-        -rm -f $@
--       +ln -s libstdc++.so.4.0.0 $@
-+       +ln -s libstdc++.so.<libversion> $@
- 
- .ELSE
-  
---- oo_1.0.1_src/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:10 2002
-+++ oo_1.0.1_src.azarah/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:40 2002
-@@ -11,11 +11,11 @@
-     Styles		= (PACKED, SETUPZIP);
- End
- 
--#if ( CCNUMVER >= 000300010000 )
-+#if ( CCNUMVER >= 000300020000 )
- 
- File gid_File_Lib_Stdc
-     BIN_FILE_BODY;
--    Name               = STRING(libstdc++.so.4.0.0);
-+    Name               = STRING(libstdc++.so.<libversion>);
-     Dir                        = GCFG_BINARY_DIR;
-     Styles             = (PACKED, SETUPZIP);
- End
-@@ -24,7 +24,7 @@
- Shortcut gid_Shortcut_Lib_Stdc
-     FileID      = gid_File_Lib_Stdc;
-     Dir         = GCFG_BINARY_DIR;
--    Name        = STRING(libstdc++.so.4);
-+    Name        = STRING(libstdc++.so.5);
-     Styles      = (NETWORK,RELATIVE);
- End
- 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch
deleted file mode 100644
index 6420d54a929e..000000000000
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- oo_1.0.1_src/unoil/prj/build.lst~	2001-12-06 16:19:28.000000000 +0100
-+++ oo_1.0.1_src/unoil/prj/build.lst	2002-09-15 21:28:58.000000000 +0200
-@@ -10,8 +10,8 @@
- ul	unoil\com\sun\star\datatransfer			nmake	-	all	ul_dattrans ul_genall NULL
- ul	unoil\com\sun\star\datatransfer\clipboard	nmake	-	all	ul_dattrans_clip ul_dattrans NULL
- ul	unoil\com\sun\star\datatransfer\dnd		nmake	-	all	ul_dattrans_dnd ul_dattrans NULL
--ul	unoil\com\sun\star\document			nmake	-	all	ul_document ul_genall NULL
- ul	unoil\com\sun\star\task				nmake	-	all	ul_task ul_genall NULL
-+ul	unoil\com\sun\star\document			nmake	-	all	ul_document ul_genall NULL
- ul	unoil\com\sun\star\sdbc				nmake	-	all	ul_sdbc ul_cssutil ul_task NULL
- ul	unoil\com\sun\star\sdbcx			nmake	-	all	ul_sdbx ul_sdbc NULL
- ul	unoil\com\sun\star\sdb				nmake	-	all	ul_sdb ul_sdbx NULL
---- oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk~	2000-09-18 17:28:26.000000000 +0200
-+++ oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk	2002-09-15 23:13:13.000000000 +0200
-@@ -64,6 +64,7 @@
- PRJ		= ..$/..$/..$/..
- TARGET	= unoil_document
- PACKAGE	= com$/sun$/star$/document
-+GENJAVAFILES += $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
- 
- # --- Settings -----------------------------------------------------
- 
---- oo_1.0.1_src/unoil/makefile.pmk~	2001-08-31 18:04:43.000000000 +0200
-+++ oo_1.0.1_src/unoil/makefile.pmk	2002-09-15 23:21:53.000000000 +0200
-@@ -74,7 +74,7 @@
- JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF          # "$(L10N_framework)"==""
- 
--GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
- GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
- 
- # --- Targets ------------------------------------------------------
-
author	Seth Chandler <sethbc@gentoo.org>	2003-03-31 23:08:03 +0000
committer	Seth Chandler <sethbc@gentoo.org>	2003-03-31 23:08:03 +0000
commit	3d37927b2579c35da6927b1b92c19fb035b86b8e (patch)
tree	c07be917e1b12ec200e8915dba32650d29b48ab3 /app-office
parent	added dev version, marked 1.0.5 x86 (diff)
download	historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.tar.gz historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.tar.bz2 historical-3d37927b2579c35da6927b1b92c19fb035b86b8e.zip