cws avmedia102: rebase m83

2010-06-22 13:38:49 +02:00 · 2010-06-22 13:38:49 +02:00 · 9caf879e9e
commit 9caf879e9e
parent 804a4aab70 fc5cd5ec6e
60 changed files with 16511 additions and 13673 deletions
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.

-timestamp='2004-11-30'
+timestamp='2010-01-22'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -21,22 +22,26 @@ timestamp='2004-11-30'
 #
 # 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.

+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@ -70,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -83,11 +89,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
    --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
@ -99,7 +105,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
       echo $1
-       exit 0;;
+       exit ;;

    * )
       break ;;
@ -118,8 +124,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -145,10 +153,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@ -170,6 +181,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -186,6 +201,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -230,22 +249,28 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@ -254,30 +279,40 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@ -297,28 +332,32 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@ -327,26 +366,35 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@ -410,6 +458,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -418,10 +470,26 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@ -450,8 +518,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@ -489,6 +557,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@ -643,6 +715,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@ -654,10 +734,17 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@ -683,6 +770,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@ -758,9 +848,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@ -782,6 +871,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@ -791,6 +888,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@ -847,6 +950,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@ -873,6 +980,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@ -884,6 +995,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@ -973,6 +1087,15 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@ -1048,6 +1171,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@ -1086,13 +1213,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@ -1139,6 +1263,9 @@ case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@ -1159,26 +1286,30 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1196,7 +1327,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@ -1308,6 +1439,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@ -1330,6 +1466,12 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@ -1339,9 +1481,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@ -1367,6 +1509,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@ -1385,6 +1530,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@ -1493,7 +1641,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@ -1556,7 +1704,7 @@ case $basic_machine in
 esac

 echo $basic_machine$os
-exit 0
+exit

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/28123
+++ b/28123
--- a/configure.in
+++ b/configure.in
@ -949,7 +949,7 @@ case "$build_os" in
      			AC_MSG_ERROR([only sparc and i386 processors are supported])
   		fi
 		;;
-	linux-gnu*)
+	linux-gnu*|k*bsd*-gnu*)
 		test_gtk=yes
 		test_cairo=yes
 		test_kde=yes
@ -2406,7 +2406,13 @@ dnl ===================================================================
   if test "$_os" = "Linux"; then
     case "$build_cpu" in
       i?86)
-         DEFAULT_TO_STLPORT="yes"
+	 case "$build_os" in k*bsd*-gnu*)
+	 	DEFAULT_TO_STLPORT="no"
+		;;
+	 *) 
+         	DEFAULT_TO_STLPORT="yes"
+		;;
+	  esac
         ;;
       *)
         DEFAULT_TO_STLPORT="no"
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@ -56,7 +56,6 @@ InstallChangeFolder	Cancel	NewDialog	DestinationFolder	1	2
 InstallChangeFolder	Cancel	Reset	0	1	1
 InstallChangeFolder	OK	NewDialog	DestinationFolder	1	3
 InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	OK	DoAction	SetOfficeInstallLocation	1	4
 InstallChangeFolder	Up	DirectoryListUp	0	1	0
 InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
 InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@ -5,9 +5,6 @@ setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
 SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
 setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
 SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SetOfficeInstallLocation	51	OFFICEINSTALLLOCATION	[OFFICEDIRECTORYGID]
-SetBasisInstallLocation	51	BASISINSTALLLOCATION	[BASISDIRECTORYGID]
-SetUreInstallLocation	51	UREINSTALLLOCATION	[UREDIRECTORYGID]
 NewProductFound	19		OOO_CUSTOMACTION_1
 SameProductFound	19		OOO_CUSTOMACTION_2
 RunningOffice	19		OOO_CUSTOMACTION_4
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@ -56,9 +56,6 @@ ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
 SetARPInstallLocation		990
-SetOfficeInstallLocation	Not Installed	575
-SetBasisInstallLocation	Not Installed	576
-SetUreInstallLocation	Not Installed	577
 SetODBCFolders		550
 StartServices	VersionNT	2800
 StopServices	VersionNT	950
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@ -11,6 +11,3 @@ InstallFinalize		400
 InstallInitialize		250
 InstallValidate		200
 ScheduleReboot	ISSCHEDULEREBOOT	375
-SetOfficeInstallLocation		410
-SetBasisInstallLocation		420
-SetUreInstallLocation		430
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@ -1,17 +1,5 @@
 Property	Signature_
 s72	s72
 AppSearch	Property	Signature_
-UREUNINSTALLLOCATION	ureuninstalluser
-UREUNINSTALLLOCATION	ureuninstallmachine
-BASISUNINSTALLLOCATION	basisuninstalluser
-BASISUNINSTALLLOCATION	basisuninstallmachine
-OFFICEUNINSTALLLOCATION	officeuninstalluser
-OFFICEUNINSTALLLOCATION	officeuninstallmachine
-UREINSTALLLOCATION	ureuninstalluser
-UREINSTALLLOCATION	ureuninstallmachine
-BASISINSTALLLOCATION	basisuninstalluser
-BASISINSTALLLOCATION	basisuninstallmachine
-OFFICEINSTALLLOCATION	officeuninstalluser
-OFFICEINSTALLLOCATION	officeuninstallmachine
 INSTALLLOCATION	installuser
 INSTALLLOCATION	installmachine
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@ -122,9 +122,6 @@ setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
 SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
 setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
 SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SetOfficeInstallLocation	51	OFFICEINSTALLLOCATION	[OFFICEDIRECTORYGID]
-SetBasisInstallLocation	51	BASISINSTALLLOCATION	[BASISDIRECTORYGID]
-SetUreInstallLocation	51	UREINSTALLLOCATION	[UREDIRECTORYGID]
 NewProductFound	19		OOO_CUSTOMACTION_1
 SameProductFound	19		OOO_CUSTOMACTION_2
 SetLanguageSelected	51	LANG_SELECTED	1
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@ -173,9 +173,6 @@ ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
 SetARPInstallLocation		990
-SetOfficeInstallLocation	Not Installed	575
-SetBasisInstallLocation	Not Installed	576
-SetUreInstallLocation	Not Installed	577
 SetODBCFolders		550
 StartServices	VersionNT	2800
 StopServices	VersionNT	950
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@ -44,7 +44,7 @@ Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
 REMOVEOLDPRODUCTS	1
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPENUS;O2LPPT;O2LPRU;O2LPEL;O2LPNL;O2LPFR;O2LPES;O2LPFI;O2LPHU;O2LPCA;O2LPIT;O2LPCS;O2LPSK;O2LPENGB;O2LPDA;O2LPSV;O2LPNO;O2LPPL;O2LPDE;O2LPPTBR;O2LPTH;O2LPET;O2LPJA;O2LPKO;O2LPZHCN;O2LPZHTW;O2LPTR;O2LPHI;O2LPAR;O2LPHE
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPAF;O2LPAR;O2LPASIN;O2LPBEBY;O2LPBO;O2LPBG;O2LPBR;O2LPBRX;O2LPBN;O2LPBNBD;O2LPBNIN;O2LPBS;O2LPBY;O2LPCA;O2LPCS;O2LPCY;O2LPDA;O2LPDE;O2LPDGO;O2LPDZ;O2LPEL;O2LPENGB;O2LPENUS;O2LPENZA;O2LPEO;O2LPES;O2LPET;O2LPEU;O2LPFA;O2LPFI;O2LPFR;O2LPGA;O2LPGD;O2LPGL;O2LPGU;O2LPGUIN;O2LPHE;O2LPHI;O2LPHIIN;O2LPHR;O2LPHU;O2LPIS;O2LPIT;O2LPJA;O2LPKID;O2LPKY;O2LPKA;O2LPKK;O2LPKM;O2LPKN;O2LPKO;O2LPKOK;O2LPKS;O2LPKU;O2LPLO;O2LPLT;O2LPLV;O2LPMAI;O2LPMK;O2LPMN;O2LPMNI;O2LPMS;O2LPMLIN;O2LPMRIN;O2LPMY;O2LPNE;O2LPNB;O2LPNL;O2LPNN;O2LPNO;O2LPNR;O2LPNS;O2LPOM;O2LPOC;O2LPORIN;O2LPPAP;O2LPPAIN;O2LPPL;O2LPPS;O2LPPT;O2LPPTBR;O2LPRU;O2LPRW;O2LPSAT;O2LPSAIN;O2LPSI;O2LPSC;O2LPSD;O2LPSK;O2LPSL;O2LPSH;O2LPSR;O2LPSS;O2LPST;O2LPSV;O2LPSW;O2LPSWTZ;O2LPTEIN;O2LPTIER;O2LPTAIN;O2LPTH;O2LPTN;O2LPTR;O2LPTS;O2LPTG;O2LPUG;O2LPURIN;O2LPUK;O2LPUZ;O2LPVE;O2LPVI;O2LPXH;O2LPZHCN;O2LPZHTW;O2LPZU
 SetupType	Typical
 SELECT_WORD	0
 SELECT_EXCEL	0
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@ -1,11 +1,5 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-ureuninstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	UREINSTALLLOCATION	2
-ureuninstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	UREINSTALLLOCATION	2
-basisuninstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	BASISINSTALLLOCATION	2
-basisuninstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	BASISINSTALLLOCATION	2
-officeuninstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	OFFICEINSTALLLOCATION	2
-officeuninstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	OFFICEINSTALLLOCATION	2
 installuser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
 installmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
--- a/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
@ -11,4 +11,3 @@ InstallFinalize		400
 InstallInitialize		250
 InstallValidate		200
 ScheduleReboot	ISSCHEDULEREBOOT	375
-SetUreInstallLocation		430
--- a/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
@ -6,6 +6,5 @@ setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
 SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
 setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
 SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SetUreInstallLocation	51	UREINSTALLLOCATION	[UREDIRECTORYGID]
 SameProductFound	19		The same version of this product is already installed.
 NewProductFound	19		A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first.
--- a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
@ -56,7 +56,6 @@ ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
 SetARPInstallLocation	Not Installed	990
-SetUreInstallLocation	Not Installed	577
 SetODBCFolders		550
 StartServices	VersionNT	2800
 StopServices	VersionNT	950
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@ -209,7 +209,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
 openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -log
    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml

 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
@ -279,24 +279,12 @@ openoffice:
 .ENDIF			# "$(alllangiso)"!=""

 .IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF			# "$(LOCALPYFILES)"!=""

 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
    @$(COPY) $< $@

-.IF "$(SYSTEM_PYTHON)" != "YES"
-$(BIN)$/cp1251.py : $(SOLARLIBDIR)$/python$/encodings$/cp1251.py
-    @$(COPY) $< $@
-$(BIN)$/iso8859_1.py : $(SOLARLIBDIR)$/python$/encodings$/iso8859_1.py
-    @$(COPY) $< $@
-.ELSE
-$(BIN)$/cp1251.py :
-    @echo "Using system python - nothing more to do here"
-$(BIN)$/iso8859_1.py :
-    @echo "Using system python - nothing more to do here"
-.ENDIF
-
 $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
    $(COPY) $< $@

--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@ -37,6 +37,7 @@ Globals
            UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 			PACKAGEMAP package_names.txt,package_names_ext.txt
 			WINDOWSPATCHLEVEL 6
+            OOOVENDOR Oracle
 			OOODOWNLOADNAME 1
 			STARTCENTER_LAYOUT_STYLE 0
 			BUILDIDCWS {buildidcws}
@ -82,7 +83,6 @@ OpenOffice
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 0
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@ -147,7 +147,6 @@ OpenOffice_wJRE
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@ -217,7 +216,6 @@ OpenOffice_Dev
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@ -266,7 +264,6 @@ URE
            SERVICESPROJEKT 1
            SETSTATICPATH 1
            NOVERSIONINDIRNAME 1
-            PROGRAMFILESROOT 1
            PCPFILENAME ure.pcp
            POOLPRODUCT 0
            GLOBALFILEGID gid_File_Dl_Cppu
@ -425,7 +422,6 @@ BrOffice
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 0
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@ -496,7 +492,6 @@ BrOffice_wJRE
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@ -567,7 +562,6 @@ BrOffice_Dev
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)

 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)

-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)

-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)

-STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)

 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)

--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@ -46,7 +46,7 @@ RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserv
    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End

 RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
@ -106,7 +106,7 @@ RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserv
    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End

 RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserv
    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End

 RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
@ -226,7 +226,7 @@ RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserv
    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End

 RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@ -1190,7 +1190,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
    Section = "Bootstrap";
    Order = 4;
    Key = "UREINSTALLLOCATION";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]URE\\";
    Inifiletablekey = "UreInstallLocation";
    Inifiletableaction = "1";
    Styles = (INIFILETABLE);
@ -1204,7 +1204,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
    Section = "Bootstrap";
    Order = 4;
    Key = "BASISINSTALLLOCATION";
-    Value = "[BASISINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]Basis\\";
    Inifiletablekey = "BasisInstallLocation";
    Inifiletableaction = "1";
    Styles = (INIFILETABLE);
@ -1218,7 +1218,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
    Section = "Bootstrap";
    Order = 4;
    Key = "OFFICEINSTALLLOCATION";
-    Value = "[OFFICEINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
    Inifiletablekey = "OfficeInstallLocation";
    Inifiletableaction = "1";
    Styles = (INIFILETABLE);
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif

-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
+STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)


 #if defined WNT && defined _MSC
@ -228,7 +228,7 @@ End
 File gid_File_Lib_QStart_Gtk
    Name = LIBNAME(qstart_gtk);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)

 File gid_File_Lib_Filterconfig1
    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
    Name = SPECIAL_NAME(filterconfig1);
@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
    Name = LIBNAME(fwk);
    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
 End
@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)

 File gid_File_Lib_I18npool
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
    RegistryID = gid_Starregistry_Services_Rdb;
    Dir = SCP2_OOO_BIN_DIR;
  #ifdef UNX
@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
    Name = LIBNAME(desktop_detector);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
    Name = LIBNAME(vclplug_gen);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@ -1142,7 +1142,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
    Name = LIBNAME(vclplug_gtk);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@ -1151,7 +1151,7 @@ End
 File gid_File_Lib_Vclplug_Kde
    Name = LIBNAME(vclplug_kde);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@ -1161,7 +1161,7 @@ End
 File gid_File_Lib_Vclplug_Kde4
    Name = LIBNAME(vclplug_kde4);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = gid_Dir_Program;
 End
 #endif
@ -1172,7 +1172,7 @@ End
 File gid_File_Lib_AppleRemote
    Name = LIBNAME(AppleRemote);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@ -1181,13 +1181,13 @@ End
 File gid_File_Lib_Basebmp
    Name = LIBNAME(basebmp);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif

 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif

@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )

 File gid_File_Lib_Recentfile
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
    Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
@ -1238,7 +1238,7 @@ End
 File gid_File_Lib_Res
    Name = LIBNAME(res);
    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
 End
@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
    Name = LIBNAME(sfx);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
 End
@ -1381,7 +1381,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 STD_LIB_FILE( gid_File_Lib_Sts , sts)

 STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )

 STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
@ -1390,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)

 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)

-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)

-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )

 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
@ -1514,7 +1514,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 File gid_File_Lib_Vcl
    Name = LIBNAME(vcl);
    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
 End
@ -1539,7 +1539,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
    Name = LIBNAME(xo);
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
    Dir = SCP2_OOO_BIN_DIR;
    RegistryID = gid_Starregistry_Services_Rdb;
 End
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@ -1030,6 +1030,12 @@ File gid_File_Lm_Yiddish_Utf
    Styles = (PACKED);
 End

+File gid_File_Lm_Zulu
+    TXT_FILE_BODY;
+    Name = "zulu.lm";
+    Dir = gid_Dir_Share_Fingerprint;
+    Styles = (PACKED);
+End



@ -1893,7 +1899,7 @@ End
 File gid_File_Extension_Dictionary_Da
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1902,7 +1908,7 @@ End
 File gid_File_Extension_Dictionary_De_AT
 	Dir = gid_Brand_Dir_Share_Extension_Install;
    Name = "dict-de-AT.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1911,7 +1917,7 @@ End
 File gid_File_Extension_Dictionary_De_CH
    Dir = gid_Brand_Dir_Share_Extension_Install;
    Name = "dict-de-CH.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
    UnixRights = 444;
 End
 #endif
@ -1920,7 +1926,7 @@ End
 File gid_File_Extension_Dictionary_De_DE
    Dir = gid_Brand_Dir_Share_Extension_Install;
    Name = "dict-de-DE.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
    UnixRights = 444;
 End
 #endif
@ -1929,7 +1935,7 @@ End
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1947,7 +1953,7 @@ End
 File gid_File_Extension_Dictionary_Et
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1956,7 +1962,7 @@ End
 File gid_File_Extension_Dictionary_Fr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1983,7 +1989,7 @@ End
 File gid_File_Extension_Dictionary_Hu
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -1992,7 +1998,7 @@ End
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2001,7 +2007,7 @@ End
 File gid_File_Extension_Dictionary_Ku_Tr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2037,7 +2043,7 @@ End
 File gid_File_Extension_Dictionary_No
    Dir = gid_Brand_Dir_Share_Extension_Install;
    Name = "dict-no.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
    UnixRights = 444;
 End
 #endif
@ -2046,7 +2052,7 @@ End
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2055,7 +2061,7 @@ End
 File gid_File_Extension_Dictionary_Pt
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2064,7 +2070,7 @@ End
 File gid_File_Extension_Dictionary_Ro
    Dir = gid_Brand_Dir_Share_Extension_Install;
    Name = "dict-ro.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
    UnixRights = 444;
 End
 #endif
@ -2082,7 +2088,7 @@ End
 File gid_File_Extension_Dictionary_Sk
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2091,7 +2097,7 @@ End
 File gid_File_Extension_Dictionary_Sl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@ -2109,7 +2115,7 @@ End
 File gid_File_Extension_Dictionary_Sv
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@ -607,6 +607,7 @@ Module gid_Module_Root_Files_6
    gid_File_Lm_Vietnamese,
    gid_File_Lm_Welsh,
    gid_File_Lm_Yiddish_Utf,
+    gid_File_Lm_Zulu,
 	gid_File_Mod_Chart,
 	gid_File_Mod_Datastyl,
 	gid_File_Mod_Defs,
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@ -45,6 +45,6 @@ Module gid_Module_Optional_Systemintegration
  #else
    PackageName = "";
  #endif
-	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250";
+	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
 End

--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
  #else
    HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
  #endif
-    Styles = (OFFICEDIRECTORY);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
 End
 #endif

--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@ -289,7 +289,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End

@ -307,7 +307,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End

@ -325,7 +325,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (ALWAYS_REQUIRED);
 End

@ -334,7 +334,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End

@ -343,7 +343,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End

@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End

@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED);
 End

@ -370,7 +370,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End

@ -379,7 +379,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End

@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End

@ -397,7 +397,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED);
 End

--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@ -1273,5 +1273,5 @@ RegistryItem gid_Regitem_Path
    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
    Name = "Path";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
 End
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@ -46,6 +46,7 @@ Directory gid_Dir_Ooo_Openofficeorg
  #else
    HostName = "openoffice.org";
  #endif
+    Styles = (ISINSTALLLOCATION);
 End

 Directory gid_Dir_Common_Ure
@ -105,21 +106,4 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
 	Styles = (ALWAYS_REQUIRED);
 End

-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End

--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@ -29,32 +29,9 @@

 #if defined(WITH_VC_REDIST)

-// WindowsCustomAction gid_Customaction_InstallRuntime
-//	Name = "InstallRuntime";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
-// End
-
-// WindowsCustomAction gid_Customaction_InstallRuntime_X64
-//	Name = "InstallRuntimeX64";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x64.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
-// End
-
-
 ScpAction scp_Copy_vcredist_x86
  #if defined(BUILD_SPECIAL)
-    Copy = "vcredist_x86_9.0.21022.218.exe";
+    Copy = "vcredist_x86_9.0.30729.4148.exe";
  #else
    Copy = "vcredist_x86.exe";
  #endif
@ -63,7 +40,11 @@ ScpAction scp_Copy_vcredist_x86
 End

 ScpAction scp_Copy_vcredist_x64
+  #if defined(BUILD_SPECIAL)
+    Copy = "vcredist_x64_9.0.30729.4148.exe";
+  #else
    Copy = "vcredist_x64.exe";
+  #endif
    Name = "vcredist_x64.exe";
    Subdir = "redist";
 End
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@ -83,11 +83,17 @@ End
 File gid_File_Py_Python_Core
    TXT_FILE_BODY;
    Dir = gid_Dir_Program;
+  #ifdef MACOSX
+    Name = "OOoPython.framework.zip";
+    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+  #else
    Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
    Styles = (ARCHIVE);
+  #endif
 End

 #ifdef UNX
+#ifndef MACOSX
 File gid_File_Py_Python_Bin
    BIN_FILE_BODY;
    Dir = gid_Dir_Program;
@ -96,6 +102,7 @@ File gid_File_Py_Python_Bin
 End
 #endif
 #endif
+#endif

 // Scripting Framework Python script proxy

@ -126,12 +133,163 @@ File gid_File_Share_Registry_Pyuno_Xcd
 End

 #ifndef SYSTEM_PYTHON
+#ifndef MACOSX
 File gid_File_Lib_Python_So
    TXT_FILE_BODY;
    Dir = gid_Dir_Program;
    Name = STRING(PY_FULL_DLL_NAME);
    Styles = (PACKED);
 End
+#else //MACOSX
+//directory entries solely to be able to create the symlinks
+Directory gid_Dir_PythonFramework
+    ParentID = gid_Dir_Program;
+    HostName = "OOoPython.framework";
+End
+
+Unixlink gid_Unixlink_Python_Headers
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework;
+    Name = "Headers";
+    Target = "Versions/Current/Headers";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_Resources
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework;
+    Name = "Resources";
+    Target = "Versions/Current/Resources";
+    Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions
+    ParentID = gid_Dir_PythonFramework;
+    HostName = "Versions";
+End
+
+Unixlink gid_Unixlink_Python_Versions_Current
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions;
+    Name = "Current";
+    Target = STRING(PYMAJMIN);
+    Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver
+    ParentID = gid_Dir_PythonFramework_Versions;
+    HostName = STRING(PYMAJMIN);
+End
+
+Unixlink gid_Unixlink_Python_Versions_ver_Headers
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver;
+    Name = "Headers";
+    Target = STRING(CONCAT2(include/python,PYMAJMIN));
+    Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_bin
+    ParentID = gid_Dir_PythonFramework_Versions_ver;
+    HostName = "bin";
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib
+    ParentID = gid_Dir_PythonFramework_Versions_ver;
+    HostName = "lib";
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
+    ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
+    HostName = STRING(CONCAT2(python,PYMAJMIN));
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
+    ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
+    HostName = "config";
+End
+
+Unixlink gid_Unixlink_Python_OOoPython
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework;
+    Name = "OOoPython";
+    Target = "Versions/Current/OOoPython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_idle
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "idle";
+    Target = STRING(CONCAT2(idle,PYMAJMIN));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pydoc
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "pydoc";
+    Target = STRING(CONCAT2(pydoc,PYMAJMIN));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_python_real
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "python";
+    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_python
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "python";
+    Target = STRING(CONCAT2(python,PYMAJMIN));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonconfig
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "python-config";
+    Target = STRING(CONCAT3(python,PYMAJMIN,-config));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonw_real
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "pythonw";
+    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonw
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "pythonw";
+    Target = STRING(CONCAT2(pythonw,PYMAJMIN));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_smtpdpy
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+    Name = "smtpd.py";
+    Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
+    Name = STRING(PY_FULL_DLL_NAME);
+    Target = "../../../OOoPython";
+    Styles = ();
+End
+#endif //MACOSX
+
 #ifdef WNT
 File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
    TXT_FILE_BODY;
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@ -44,7 +44,7 @@ SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF

 SCPDEFS+=\
-    -DPYVERSION=$(PYVERSION) \
+    -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
    -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME)

 SCP_PRODUCT_TYPE=osl
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@ -46,7 +46,11 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
    Section = "Bootstrap";
    Order = 1;
    Key = "PYUNO_LOADER_PYTHONHOME";
+  #ifdef MACOSX
+    Value = CONCAT2($ORIGIN,"OOoPython.framework");
+  #else
    Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
+  #endif
 End
 #endif

@ -60,11 +64,19 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
    Value = "$ORIGIN";
 #else
  #ifdef UNX
+    #ifdef MACOSX
+    #define FRAMEWORKLIB CONCAT4($ORIGIN/OOoPython.framework/Versions/,PYMAJMIN,/lib/python,PYMAJMIN)
+    Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
+		   /lib-dynload FRAMEWORKLIB,
+		   /lib-tk FRAMEWORKLIB,
+		   /site-packages $ORIGIN);
+    #else
    Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
 		   /lib $ORIGIN/python-core-,PYVERSION,
 		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
 		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
 		   /lib/site-packages $ORIGIN);
+    #endif
  #else
   #ifdef _gcc3
    Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@ -46,6 +46,14 @@ End

 #ifndef MACOSX

+#ifdef WNT
+Directory gid_Dir_Sdkoo_Root
+    ParentID = PREDEFINED_PROGDIR;
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+End
+#endif
+
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
    ParentID = PREDEFINED_PROGDIR;
@ -77,7 +85,7 @@ Directory gid_Dir_Basis_Sdk
    DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
 #else
  #if defined WNT
-    ParentID = PREDEFINED_PROGDIR;
+    ParentID = gid_Dir_Sdkoo_Root;
  #else
    ParentID = gid_Dir_Ooo_Basis_Sdk;
  #endif
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@ -35,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
    ModuleID = gid_Module_Optional_Winexplorerext;
    Styles = (X64);
    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End

 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@ -58,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
    ModuleID = gid_Module_Optional_Winexplorerext;
    Styles = (X64);
    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End

 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@ -90,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
    ModuleID = gid_Module_Optional_Winexplorerext;
    Styles = (X64);
    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
    
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@ -124,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
    ModuleID = gid_Module_Root;
    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
    Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
 End

 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@ -167,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
    ModuleID = gid_Module_Optional_Winexplorerext;
    Styles = (X64);
    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End

 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@ -201,8 +201,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
    ComponentCondition = "VersionNT >= 600";
    Styles = (X64);
    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
 End

 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@ -57,7 +57,7 @@ End

 File gid_File_Xsl_Export_Xhtml_Body
    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
    Dir = gid_Dir_Share_Xslt_Export_Xhtml;
    Name = "/xslt/export/xhtml/body.xsl";
 End
--- a/set_soenv.in
+++ b/set_soenv.in
@ -302,6 +302,47 @@ elsif ( $platform =~ m/netbsd/ )
      $OS             = "NETBSD";
      $PATH_SEPERATOR = $ps;
 }
+elsif ( $platform =~ m/kfreebsd/ ) 
+{
+# General GNU/kFreeBSD settings:
+      $CVER           = "C341";
+      $BIG_SVX        = "TRUE";
+      $COM            = "GCC";
+      $COMPATH        = '@COMPATH@'; 
+      $GLIBC          = "2REDHAT60";
+      $GUI            = "UNX";
+      $GUIBASE        = "unx";
+      $GVER           = "VCL";
+      $OS             = "LINUX";
+      $PATH_SEPERATOR = $ps;
+
+#Set platform specific values: 
+   if ($platform =~ m/^i[3456]86/)
+   {  print "Setting GNU/kFreeBSD x86 specific values... ";
+      $outfile        = "GNUkFreeBSDX86Env.Set"; 
+      $CPU            = "I";
+      $CPUNAME        = "INTEL";
+      $OUTPATH        = "unxkfgi6";
+      
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+
+   }
+   elsif ($platform =~ m/^x86_64/)
+   {  print "Setting GNU/kFreeBSD x86-64 specific values... ";
+      $outfile        = "GNUkFreeBSDX86-64Env.Set";
+      $CPU            = "X";
+      $CPUNAME        = "X86_64";
+      $OUTPATH        = "unxkfgx6";
+
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+   }
+
+   $INPATH         = $OUTPATH.$PROEXT;
+}
 elsif ( $platform =~ m/freebsd/ ) 
 {     $BIG_SVX        = "TRUE";
      $COM            = "GCC";
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@ -73,6 +73,7 @@ $is_debug           = 0;

 $error              = 0;
 $module             = 0;            # module name
+$repository         = 0;            # parent directory of this module
 $base_dir           = 0;            # path to module base directory
 $dlst_file          = 0;            # path to d.lst
 $ilst_ext           = 'ilst';       # extension of image lists
@ -446,7 +447,7 @@ sub parse_options
 sub init_globals
 {
    my $ext;
-    ($module, $base_dir, $dlst_file) =  get_base();
+    ($module, $repository, $base_dir, $dlst_file) =  get_base();

    # for CWS:
    $module =~ s/\.lnk$//;
@ -543,7 +544,7 @@ sub get_base
 {
    # a module base dir contains a subdir 'prj'
    # which in turn contains a file 'd.lst'
-    my (@field, $base, $dlst);
+    my (@field, $repo, $base, $dlst);
    my $path = getcwd();

    @field = split(/\//, $path);
@ -560,7 +561,12 @@ sub get_base
        exit(2);
    }
    else {
-        return ($field[-1], $base, $dlst);
+        if ( defined $field[-2] ) {
+            $repo = $field[-2];
+        } else {
+            print_error("Internal error: cannot determine module's parent directory");
+        }
+        return ($field[-1], $repo, $base, $dlst);
    }
 }

@ -1152,8 +1158,8 @@ sub push_on_loglist
    if (( $entry[0] eq "COPY" ) || ( $entry[0] eq "ADDINCPATH" )) {
        return 0 if ( ! -e $entry[1].$maybedot );
        # make 'from' relative to source root
-        $entry[1] = $module . "/prj/" . $entry[1];
-        $entry[1] =~ s/^$module\/prj\/\.\./$module/;
+        $entry[1] = $repository ."/" . $module . "/prj/" . $entry[1];
+        $entry[1] =~ s/$module\/prj\/\.\./$module/;
    }
    # platform or common tree?
    my $common;
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@ -0,0 +1,18 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ "${OS?}" = MACOSX ]; then
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
+else
+    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/gsicheck "$@"
+fi
+
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@ -257,6 +257,10 @@ if ( $installer::globals::globallogging ) { installer::files::save_hash($logging
 installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref);
 if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3b.log", $allvariableshashref); }

+installer::ziplist::overwrite_ooovendor( $allvariableshashref );
+if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3c.log", $allvariableshashref); }
+
+
 ########################################################
 # Check if this is simple packaging mechanism
 ########################################################
@ -1982,7 +1986,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
        if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }

-        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname);
+        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }

@ -2143,10 +2147,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                push(@installer::globals::logfileinfo, $infoline);
            }

-            # include office directory in CustomAction table
-
-            installer::windows::idtglobal::add_officedir_to_database($languageidtdir, $allvariableshashref);
-
            # include a component into environment table if required

            installer::windows::component::set_component_in_environment_table($languageidtdir, $filesinproductlanguageresolvedarrayref);
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@ -203,8 +203,8 @@ if ( $ret ) {
 }
 push @cleanuplist, ".c1";

-print         "$compiler $solarincludes $defs $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
-$ret = system "$compiler $solarincludes $defs $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
+print         "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
+$ret = system "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
 if ( $ret ) {
    push @cleanuplist, ".c2";
    cleandie("ERROR - calling compiler for preprocessing failed");
@ -246,8 +246,8 @@ if ( $outobj_flag ne "" )
 {
    $outobj_param = "$outobj_flag${shell_workfile}$objext";
 }
-print         "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
-$ret = system "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
+print         "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
+$ret = system "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
 if ( $ret ) {
    push @cleanuplist, "$appext";
    cleandie("ERROR - compiling $workfile.c failed");
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@ -186,7 +186,7 @@ sub collect_files
        # collect all binary executables on o:
        my @bin = $self->find_binary_execs("$template/bin");
        my @bin_so = $self->find_binary_execs("$template/bin/so");
-        @$filesref = (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so);
+        push(@$filesref, (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so));
    }
    return 1;
 }
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@ -378,6 +378,10 @@ BEGIN
    %spellcheckerfilehash = ();
    $registryrootcomponent = "";

+    $installlocationdirectory = "";
+    $installlocationdirectoryset = 0;
+    $vendordirectory = "";
+    $vendordirectoryset = 0;
    $officeinstalldirectory = "";
    $officeinstalldirectoryset = 0;
    $basisinstalldirectory = "";
@ -396,9 +400,9 @@ BEGIN
    $sundirgid = "";

    %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
-    %treestyles = ("UREDIRECTORY" => "INSTALLURE", "BASISDIRECTORY" => "INSTALLBASIS", "OFFICEDIRECTORY" => "INSTALLOFFICE");
-    %installlocations = ("INSTALLLOCATION" => "1", "BASISINSTALLLOCATION" => "1", "OFFICEINSTALLLOCATION" => "1", "UREINSTALLLOCATION" => "1");
-    %treelayername = ("UREDIRECTORY" => "URE", "BASISDIRECTORY" => "BASIS", "OFFICEDIRECTORY" => "BRAND");
+    %treestyles = ();
+    %installlocations = ("INSTALLLOCATION" => "1");
+    %treelayername = ();
    %hostnametreestyles = ();
    %treeconditions = ();
    %usedtreeconditions = ();
@ -531,6 +535,7 @@ BEGIN
    $wrapcmd = "";

    if ( $plat =~ /linux/i ) { $islinux = 1; }
+    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
    if ( $plat =~ /solaris/i ) { $issolaris = 1; }
    if ( $plat =~ /darwin/i ) { $ismacosx = 1; }

--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@ -241,7 +241,7 @@ sub remove_office_start_language_files
        else
        {
            my $infoline = "INFO: Flag SET_OFFICE_LANGUAGE \-\> Removing $oneitem->{'gid'} from file list.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
+            push( @installer::globals::logfileinfo, $infoline);
        }
    }

@ -541,18 +541,6 @@ sub set_global_directory_hostnames
            $installer::globals::officedirgid = $onedir->{'gid'};
            $allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname;
        }
-        if ( $styles =~ /\bBASISDIRECTORY\b/ )
-        {
-            $installer::globals::basisdirhostname = $onedir->{'HostName'};
-            $installer::globals::basisdirgid = $onedir->{'gid'};
-            $allvariables->{'BASISDIRECTORYHOSTNAME'} = $installer::globals::basisdirhostname;
-        }
-        if ( $styles =~ /\bUREDIRECTORY\b/ )
-        {
-            $installer::globals::uredirhostname = $onedir->{'HostName'};
-            $installer::globals::uredirgid = $onedir->{'gid'};
-            $allvariables->{'UREDIRECTORYHOSTNAME'} = $installer::globals::uredirhostname;
-        }
        if ( $styles =~ /\bSUNDIRECTORY\b/ )
        {
            $installer::globals::sundirhostname = $onedir->{'HostName'};
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@ -419,6 +419,12 @@ sub create_directory_structure

    foreach $dir (@startparents) { create_directory_tree($dir, \%fullpathhash, $targetdir, $dirhash); }

+    # Also adding the pathes of the startparents
+    foreach $dir (@startparents)
+    {
+        if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
+    }
+
    return \%fullpathhash;
 }

--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@ -162,6 +162,11 @@ sub get_file_component_directory
        }

        $uniquedir = $onedir->{'uniquename'};
+
+        if ( $uniquedir eq $installer::globals::officeinstalldirectory )
+        {
+            $uniquedir = "INSTALLLOCATION";
+        }
    }

    $onefile->{'uniquedirname'} = $uniquedir;       # saving it in the file collection
@ -176,16 +181,7 @@ sub get_file_component_directory

 sub get_registry_component_directory
 {
-    my $componentdir = "";
-
-    if ( $installer::globals::officeinstalldirectoryset )
-    {
-        $componentdir = $installer::globals::officeinstalldirectory;
-    }
-    else
-    {
-        $componentdir = "INSTALLLOCATION";
-    }
+    my $componentdir = "INSTALLLOCATION";

    return $componentdir;
 }
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@ -110,7 +110,7 @@ sub create_unique_directorynames
        }
        else
        {
-            $uniqueparentname = "INSTALLLOCATION";
+            $uniqueparentname = $installer::globals::programfilesfolder;
        }

        if ( $styles =~ /\bPROGRAMFILESFOLDER\b/ ) { $uniqueparentname = $installer::globals::programfilesfolder; }
@ -130,29 +130,73 @@ sub create_unique_directorynames
        $onedir->{'uniquename'} = $uniquename;
        $onedir->{'uniqueparentname'} = $uniqueparentname;

-        # setting the office installation directory
-        if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
+        # setting the installlocation directory
+        if ( $styles =~ /\bISINSTALLLOCATION\b/ )
        {
-            if ( $installer::globals::officeinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag OFFICEDIRECTORY alread set: \"$installer::globals::officeinstalldirectory\".", "create_unique_directorynames"); }
-            $installer::globals::officeinstalldirectory = $uniquename;
-            $installer::globals::officeinstalldirectoryset = 1;
-            if ( $installer::globals::officeinstalldirectory =~ /sun_/i ) { $installer::globals::sundirexists = 1; }
+            if ( $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION alread set: \"$installer::globals::installlocationdirectory\".", "create_unique_directorynames"); }
+            $installer::globals::installlocationdirectory = $uniquename;
+            $installer::globals::installlocationdirectoryset = 1;
+            if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; }
        }

-        # setting the bais installation directory
-        if ( $styles =~ /\bBASISDIRECTORY\b/ )
+        # setting the sundirectory
+        if ( $styles =~ /\bSUNDIRECTORY\b/ )
        {
-            if ( $installer::globals::basisinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag BASISDIRECTORY alread set: \"$installer::globals::basisinstalldirectory\".", "create_unique_directorynames"); }
-            $installer::globals::basisinstalldirectory = $uniquename;
-            $installer::globals::basisinstalldirectoryset = 1;
+            if ( $installer::globals::vendordirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag SUNDIRECTORY alread set: \"$installer::globals::vendordirectory\".", "create_unique_directorynames"); }
+            $installer::globals::vendordirectory = $uniquename;
+            $installer::globals::vendordirectoryset = 1;
+        }
+    }
+}
+
+#####################################################
+# Adding ":." to selected default directory names
+#####################################################
+
+sub check_sourcedir_addon
+{
+    my ( $onedir, $allvariableshashref ) = @_;
+
+    if (($installer::globals::addchildprojects) ||
+        ($installer::globals::patch) ||
+        ($installer::globals::languagepack) ||
+        ($allvariableshashref->{'CHANGETARGETDIR'}))
+    {
+        my $sourcediraddon = "\:\.";
+        $onedir->{'defaultdir'} = $onedir->{'defaultdir'} . $sourcediraddon;
+    }
+
+}
+
+#####################################################
+# The directory with the style ISINSTALLLOCATION
+# will be replaced by INSTALLLOCATION
+#####################################################
+
+sub set_installlocation_directory
+{
+    my ( $directoryref, $allvariableshashref ) = @_;
+
+    if ( ! $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION not set!", "set_installlocation_directory"); }
+
+    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
+    {
+        my $onedir = ${$directoryref}[$i];
+
+        if ( $onedir->{'uniquename'} eq $installer::globals::installlocationdirectory )
+        {
+            $onedir->{'uniquename'} = "INSTALLLOCATION";
+            check_sourcedir_addon($onedir, $allvariableshashref);
        }

-        # setting the ure installation directory
-        if ( $styles =~ /\bUREDIRECTORY\b/ )
+        if ( $onedir->{'uniquename'} eq $installer::globals::vendordirectory )
        {
-            if ( $installer::globals::ureinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag UREDIRECTORY alread set: \"$installer::globals::ureinstalldirectory\".", "create_unique_directorynames"); }
-            $installer::globals::ureinstalldirectory = $uniquename;
-            $installer::globals::ureinstalldirectoryset = 1;
+            check_sourcedir_addon($onedir, $allvariableshashref);
+        }
+
+        if ( $onedir->{'uniqueparentname'} eq $installer::globals::installlocationdirectory )
+        {
+            $onedir->{'uniqueparentname'} = "INSTALLLOCATION";
        }
    }
 }
@ -266,27 +310,19 @@ sub add_root_directories
 {
    my ($directorytableref, $allvariableshashref) = @_;

-    my $oneline = "TARGETDIR\t\tSourceDir\n";
-    push(@{$directorytableref}, $oneline);
+#   my $sourcediraddon = "";
+#   if (($installer::globals::addchildprojects) ||
+#       ($installer::globals::patch) ||
+#       ($installer::globals::languagepack) ||
+#       ($allvariableshashref->{'CHANGETARGETDIR'}))
+#   {
+#       $sourcediraddon = "\:\.";
+#   }

-    my $sourcediraddon = "";
-    if (($installer::globals::addchildprojects) ||
-        ($installer::globals::patch) ||
-        ($installer::globals::languagepack) ||
-        ($allvariableshashref->{'CHANGETARGETDIR'}))
+    my $oneline = "";
+
+    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
    {
-        $sourcediraddon = "\:\.";
-    }
-
-    if (!($installer::globals::product =~ /ada/i )) # the following directories not for ada products
-    {
-        $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        # my $manufacturer = $installer::globals::manufacturer;
-        # my $shortmanufacturer = installer::windows::idtglobal::make_eight_three_conform($manufacturer, "dir");    # third parameter not used
-        # $shortmanufacturer =~ s/\s/\_/g;                                  # changing empty space to underline
-
        my $productname = $allvariableshashref->{'PRODUCTNAME'};
        my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
        my $baseproductversion = $productversion;
@ -318,84 +354,64 @@ sub add_root_directories
        my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir");      # third parameter not used
        $shortproductkey =~ s/\s/\_/g;                                  # changing empty space to underline

-        if ( $allvariableshashref->{'SUNDIR'} )
-        {
-            if ( $allvariableshashref->{'SUNDIRNAME'} ) { $installer::globals::sundirname = $allvariableshashref->{'SUNDIRNAME'}; }
-            $oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n";
-            push(@{$directorytableref}, $oneline);
-
-            $oneline = "INSTALLLOCATION\tsundirectory\t$shortproductkey|$productkey$sourcediraddon\n";
-            push(@{$directorytableref}, $oneline);
-        }
-        else
-        {
-            if ( $allvariableshashref->{'PROGRAMFILESROOT'} )
-            {
-                $oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t.\n";
-            }
-            else
-            {
-                $oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t$shortproductkey|$productkey$sourcediraddon\n";
-            }
-
-            push(@{$directorytableref}, $oneline);
-        }
-
-        $oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
-        {
-            $oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
-            push(@{$directorytableref}, $oneline);
-        }
-
-        $oneline = "$installer::globals::startupfolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        $oneline = "$installer::globals::desktopfolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        $oneline = "$installer::globals::startmenufolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        $oneline = "$installer::globals::commonfilesfolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        $oneline = "$installer::globals::commonappdatafolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        $oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        if ( $installer::globals::usesharepointpath )
-        {
-            $oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
-            push(@{$directorytableref}, $oneline);
-        }
-
-        $oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-
-        my $localtemplatefoldername = $installer::globals::templatefoldername;
-        my $directorytableentry = $localtemplatefoldername;
-        my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");
-        if ( $shorttemplatefoldername ne $localtemplatefoldername ) { $directorytableentry = "$shorttemplatefoldername|$localtemplatefoldername"; }
-        $oneline = "$installer::globals::templatefolder\tTARGETDIR\t$directorytableentry\n";
-        push(@{$directorytableref}, $oneline);
-
-        if ( $installer::globals::fontsdirname )
-        {
-            $oneline = "$installer::globals::fontsfolder\t$installer::globals::fontsdirparent\t$installer::globals::fontsfoldername\:$installer::globals::fontsdirname\n";
-        }
-        else
-        {
-            $oneline = "$installer::globals::fontsfolder\tTARGETDIR\t$installer::globals::fontsfoldername\n";
-        }
-
+        $oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
        push(@{$directorytableref}, $oneline);
    }

+    $oneline = "TARGETDIR\t\tSourceDir\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::startupfolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::desktopfolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::startmenufolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::commonfilesfolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::commonappdatafolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    if ( $installer::globals::usesharepointpath )
+    {
+        $oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
+        push(@{$directorytableref}, $oneline);
+    }
+
+    $oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
+    push(@{$directorytableref}, $oneline);
+
+    my $localtemplatefoldername = $installer::globals::templatefoldername;
+    my $directorytableentry = $localtemplatefoldername;
+    my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");
+    if ( $shorttemplatefoldername ne $localtemplatefoldername ) { $directorytableentry = "$shorttemplatefoldername|$localtemplatefoldername"; }
+    $oneline = "$installer::globals::templatefolder\tTARGETDIR\t$directorytableentry\n";
+    push(@{$directorytableref}, $oneline);
+
+    if ( $installer::globals::fontsdirname )
+    {
+        $oneline = "$installer::globals::fontsfolder\t$installer::globals::fontsdirparent\t$installer::globals::fontsfoldername\:$installer::globals::fontsdirname\n";
+    }
+    else
+    {
+        $oneline = "$installer::globals::fontsfolder\tTARGETDIR\t$installer::globals::fontsfoldername\n";
+    }
+
+    push(@{$directorytableref}, $oneline);
+
 }

 ###############################################
@ -404,7 +420,7 @@ sub add_root_directories

 sub create_directory_table
 {
-    my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref) = @_;
+    my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;

    # Structure of the directory table:
    # Directory Directory_Parent DefaultDir
@ -419,7 +435,11 @@ sub create_directory_table

    overwrite_programfilesfolder($allvariableshashref);
    create_unique_directorynames($directoryref);
+    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1.log", $directoryref); }
    create_defaultdir_directorynames($directoryref, $shortdirnamehashref);  # only destdir!
+    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_2.log", $directoryref); }
+    set_installlocation_directory($directoryref, $allvariableshashref);
+    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
    installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
    add_root_directories(\@directorytable, $allvariableshashref);
    create_directorytable_from_collection(\@directorytable, $directoryref);
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@ -1023,44 +1023,6 @@ sub add_officedir_to_database
        }
    }

-    if ( $installer::globals::basisinstalldirectoryset )
-    {
-        $found = 0;
-
-        for ( my $i = 0; $i <= $#{$customacfile}; $i++ )
-        {
-            if ( ${$customacfile}[$i] =~ /\bBASISDIRECTORYGID\b/ )
-            {
-                ${$customacfile}[$i] =~ s/\bBASISDIRECTORYGID\b/$installer::globals::basisinstalldirectory/;
-                $found = 1;
-            }
-        }
-
-        if (( ! $found ) && ( ! $allvariables->{'IGNOREDIRECTORYLAYER'} ))
-        {
-            installer::exiter::exit_program("ERROR: \"BASISDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
-        }
-    }
-
-    if ( $installer::globals::ureinstalldirectoryset )
-    {
-        $found = 0;
-
-        for ( my $i = 0; $i <= $#{$customacfile}; $i++ )
-        {
-            if ( ${$customacfile}[$i] =~ /\bUREDIRECTORYGID\b/ )
-            {
-                ${$customacfile}[$i] =~ s/\bUREDIRECTORYGID\b/$installer::globals::ureinstalldirectory/;
-                $found = 1;
-            }
-        }
-
-        if (( ! $found ) && ( ! $allvariables->{'IGNOREDIRECTORYLAYER'} ))
-        {
-            installer::exiter::exit_program("ERROR: \"UREDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
-        }
-    }
-
    # Saving the file

    installer::files::save_file($customactionfilename ,$customacfile);
@ -1634,7 +1596,8 @@ sub include_subdirname_into_directory_table
            {
                my $newuniquename = "sub" . $subdir;
                $newdir = $newuniquename;
-                my $newparent = $parent;
+                # my $newparent = $parent;
+                my $newparent = "INSTALLLOCATION";
                my $newname = $name . "\:" . $subdir;
                my $newline =
                $line = "$newuniquename\t$newparent\t$newname\n";
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@ -318,18 +318,6 @@ sub set_important_properties
        push(@{$propertyfile}, $onepropertyline);
    }

-    if ( $installer::globals::basisdirhostname )
-    {
-        my $onepropertyline = "BASISDIRHOSTNAME" . "\t" . $installer::globals::basisdirhostname . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-    if ( $installer::globals::uredirhostname )
-    {
-        my $onepropertyline = "UREDIRHOSTNAME" . "\t" . $installer::globals::uredirhostname . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
    if ( $installer::globals::sundirhostname )
    {
        my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n";
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@ -203,8 +203,9 @@ sub get_registry_value
    if ( $registry->{'Value'} ) { $value = $registry->{'Value'}; }

    $value =~ s/\\\"/\"/g;  # no more masquerading of '"'
-    $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
-    $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+    $value =~ s/\\\\\s*$/\\/g;  # making "\\" at end of value to "\"
+    $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
+    $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/; # removing "\" after "[INSTALLLOCATION]"

    if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }

@ -224,8 +225,9 @@ sub get_registry_val64
    if ( $registry->{'Val64'} ) { $value = $registry->{'Val64'}; }

    $value =~ s/\\\"/\"/g;  # no more masquerading of '"'
-    $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
-    $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+    $value =~ s/\\\\\s*$/\\/g;  # making "\\" at end of value to "\"
+    $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
+    $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/; # removing "\" after "[INSTALLLOCATION]"

    if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }

--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@ -111,7 +111,7 @@ sub get_shortcut_directory

    $directory = $onedir->{'uniquename'};

-    if ($directory eq "") { $directory = "OFFICEINSTALLLOCATION"; }     # Shortcuts in the root directory
+    if ($directory eq "") { $directory = "INSTALLLOCATION"; }       # Shortcuts in the root directory

    return $directory;
 }
@ -343,7 +343,7 @@ sub get_folderitem_wkdir

        $directory = $onedir->{'uniquename'};

-        if ($directory eq "") { $directory = "OFFICEINSTALLLOCATION"; }
+        if ($directory eq "") { $directory = "INSTALLLOCATION"; }
    }

    return $directory;
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@ -1054,8 +1054,7 @@ sub write_content_into_inf_file
                if ( $registryitem->{'Value'} ) { $value = $registryitem->{'Value'}; }
                if ( $value =~ /\<progpath\>/ ) { $value =~ s/\\\"/\"\"/g; } # Quoting for INF is done by double ""
                $value =~ s/\\\"/\"/g;  # no more masquerading of '"'
-                $value =~ s/\<progpath\>/\%OFFICEINSTALLLOCATION\%/g;
-                # $value =~ s/\%OFFICEINSTALLLOCATION\%\\/\%OFFICEINSTALLLOCATION\%/g;      # removing "\" after "%OFFICEINSTALLLOCATION%"
+                $value =~ s/\<progpath\>/\%INSTALLLOCATION\%/g;
                if ( $value ne "" ) { $value = "\"" . $value . "\""; }

                my $oneline = $regroot . "," . $subkey . "," . $valueentryname . "," . $flag . "," . $value . "\n";
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@ -761,6 +761,16 @@ sub replace_variables_in_ziplist_variables
    }
 }

+###########################################################
+# Overwrite the vendor string in openoffice.lst that is defined in configure
+###########################################################
+
+sub overwrite_ooovendor
+{
+    my ($variableshashref) = @_;
+    $variableshashref->{'OOOVENDOR'} = $ENV{'OOO_VENDOR'} , if( defined $ENV{'OOO_VENDOR'}  && $ENV{'OOO_VENDOR'} ne "" );
+}
+
 ###########################################################
 # Adding the lowercase variables into the variableshashref
 ###########################################################
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@ -60,6 +60,7 @@ BEGIN
    $issolaris = 0;

    if ( $plat =~ /linux/i ) { $islinux = 1; }
+    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
    if ( $plat =~ /solaris/i ) { $issolaris = 1; }

 }
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@ -2896,7 +2896,7 @@ wntmsci12
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@ -2919,7 +2919,7 @@ wntmsci12
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/V6.1
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@ -2970,6 +2970,7 @@ wntmsci12
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 			BUILD_X64 TRUE
+			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
 		}
 		common0
 		{
@ -2994,7 +2995,7 @@ wntmsci12
 			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
 			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
            PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
@ -3238,7 +3239,7 @@ wntmsci13
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@ -3261,7 +3262,7 @@ wntmsci13
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/V6.1
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@ -3336,7 +3337,7 @@ wntmsci13
 			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
 			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
            PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@ -47,6 +47,7 @@ common
        BUILD_X64
 		CLASSPATH
 		CALL_CDECL
+		CHECK_LUCENCE_INDEXER_OUTPUT
 		COMEX
 		common_build
 		COMMON_OUTDIR
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m81(Build:9509)
-BUILD=9509
-LAST_MINOR=m81
+RSCREVISION=300m83(Build:9511)
+BUILD=9511
+LAST_MINOR=m83
 SOURCEVERSION=DEV300
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@ -156,7 +156,7 @@ $(SLO)/precompiled_ex.% .PHONY:

 $(SLO)/%.obj : %.cxx
    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!=""
 # just a helper var	
    @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
 # cleanup first
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@ -1,4 +1,4 @@
-so  soltools :   SUN:so_prereq NULL
+so  soltools :   solenv SUN:so_prereq NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
 so	soltools\ldump							nmake	-	all	so_ldump so_mkdep NULL
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@ -34,6 +34,10 @@ ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
 # avoid STLPort
 NO_DEFAULT_STL=TRUE
 SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
+.IF "$(STLPORT4)" != ""
+SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
+SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
+.ENDIF

 .IF "$(OS)"=="SOLARIS"
 # hack due to #i53089#