25 files changed, 235 insertions, 125 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 3f76e5f889d3..7b2b9f60d2c7 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -60,8 +60,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		137
-SNAPDATE=		20051031
+MILESTONE=		138
+SNAPDATE=		20051104
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 491e3ba3f190..ca146d10fa6d 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 2e2dfe84c7a50ed782e846eee7a7cd38
-SIZE (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 232319587
+MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
+SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/patch-agg b/editors/openoffice-3-devel/files/patch-agg
new file mode 100644
index 000000000000..ee1098b822b5
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-agg
@@ -0,0 +1,18 @@
+Issuetracker : #i57388#
+CWS          : N/A
+Author:      : <rene@openoffice.org> (JCA)
+Description  : 
+
+Index: agg/prj/build.lst
+===================================================================
+RCS file: /cvs/external/agg/prj/build.lst,v
+retrieving revision 1.2
+diff -u -r1.2 build.lst
+--- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
++++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
+@@ -1,4 +1,4 @@
+-ag	agg	:	soltools NULL
++ag	agg	:	soltools xml2cmp sal NULL
+ ag	agg										usr1	-	all	ag_mkout NULL
+ ag	agg\inc									get		-	all	ag_inc NULL
+ ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice-3-devel/files/patch-malloc b/editors/openoffice-3-devel/files/patch-malloc
new file mode 100644
index 000000000000..b923da9db5e6
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-malloc
@@ -0,0 +1,25 @@
+Issuetracker : #i57395#
+CWS          : N/A
+Author:      : <pjanik@openoffice.org> (JCA)
+Description  : 
+
+Index: canvas/source/tools/image.cxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 image.cxx
+--- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
++++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
+@@ -103,8 +103,11 @@
+ // platform-dependend includes [wrapped into their own namepsaces]
+ //////////////////////////////////////////////////////////////////////////////////
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>		// _alloca
+-
++#else
++#include <stdlib.h>
++#endif
+ #if defined(WNT)
+ 	namespace  win32 
+     {
diff --git a/editors/openoffice-3-devel/files/patch-postprocess+prj+build.lst b/editors/openoffice-3-devel/files/patch-postprocess+prj+build.lst
deleted file mode 100644
index 91addd32b2b4..000000000000
--- a/editors/openoffice-3-devel/files/patch-postprocess+prj+build.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i56070#, #i56731#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : some *.desktop files missing on making installsets
-
-Index: postprocess/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/postprocess/prj/build.lst,v
-retrieving revision 1.20
-diff -u -r1.20 build.lst
---- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
-+++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
-@@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
-+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts xmerge DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
- po	postprocess			    	usr1	-	all	po_mkout NULL
- po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-
-
-
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 3f76e5f889d3..7b2b9f60d2c7 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -60,8 +60,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		137
-SNAPDATE=		20051031
+MILESTONE=		138
+SNAPDATE=		20051104
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 491e3ba3f190..ca146d10fa6d 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 2e2dfe84c7a50ed782e846eee7a7cd38
-SIZE (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 232319587
+MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
+SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/patch-agg b/editors/openoffice.org-2-devel/files/patch-agg
new file mode 100644
index 000000000000..ee1098b822b5
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-agg
@@ -0,0 +1,18 @@
+Issuetracker : #i57388#
+CWS          : N/A
+Author:      : <rene@openoffice.org> (JCA)
+Description  : 
+
+Index: agg/prj/build.lst
+===================================================================
+RCS file: /cvs/external/agg/prj/build.lst,v
+retrieving revision 1.2
+diff -u -r1.2 build.lst
+--- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
++++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
+@@ -1,4 +1,4 @@
+-ag	agg	:	soltools NULL
++ag	agg	:	soltools xml2cmp sal NULL
+ ag	agg										usr1	-	all	ag_mkout NULL
+ ag	agg\inc									get		-	all	ag_inc NULL
+ ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-2-devel/files/patch-malloc b/editors/openoffice.org-2-devel/files/patch-malloc
new file mode 100644
index 000000000000..b923da9db5e6
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-malloc
@@ -0,0 +1,25 @@
+Issuetracker : #i57395#
+CWS          : N/A
+Author:      : <pjanik@openoffice.org> (JCA)
+Description  : 
+
+Index: canvas/source/tools/image.cxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 image.cxx
+--- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
++++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
+@@ -103,8 +103,11 @@
+ // platform-dependend includes [wrapped into their own namepsaces]
+ //////////////////////////////////////////////////////////////////////////////////
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>		// _alloca
+-
++#else
++#include <stdlib.h>
++#endif
+ #if defined(WNT)
+ 	namespace  win32 
+     {
diff --git a/editors/openoffice.org-2-devel/files/patch-postprocess+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-postprocess+prj+build.lst
deleted file mode 100644
index 91addd32b2b4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-postprocess+prj+build.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i56070#, #i56731#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : some *.desktop files missing on making installsets
-
-Index: postprocess/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/postprocess/prj/build.lst,v
-retrieving revision 1.20
-diff -u -r1.20 build.lst
---- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
-+++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
-@@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
-+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts xmerge DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
- po	postprocess			    	usr1	-	all	po_mkout NULL
- po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-
-
-
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 3f76e5f889d3..7b2b9f60d2c7 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -60,8 +60,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		137
-SNAPDATE=		20051031
+MILESTONE=		138
+SNAPDATE=		20051104
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 491e3ba3f190..ca146d10fa6d 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 2e2dfe84c7a50ed782e846eee7a7cd38
-SIZE (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 232319587
+MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
+SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/patch-agg b/editors/openoffice.org-2.0-devel/files/patch-agg
new file mode 100644
index 000000000000..ee1098b822b5
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-agg
@@ -0,0 +1,18 @@
+Issuetracker : #i57388#
+CWS          : N/A
+Author:      : <rene@openoffice.org> (JCA)
+Description  : 
+
+Index: agg/prj/build.lst
+===================================================================
+RCS file: /cvs/external/agg/prj/build.lst,v
+retrieving revision 1.2
+diff -u -r1.2 build.lst
+--- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
++++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
+@@ -1,4 +1,4 @@
+-ag	agg	:	soltools NULL
++ag	agg	:	soltools xml2cmp sal NULL
+ ag	agg										usr1	-	all	ag_mkout NULL
+ ag	agg\inc									get		-	all	ag_inc NULL
+ ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-2.0-devel/files/patch-malloc b/editors/openoffice.org-2.0-devel/files/patch-malloc
new file mode 100644
index 000000000000..b923da9db5e6
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-malloc
@@ -0,0 +1,25 @@
+Issuetracker : #i57395#
+CWS          : N/A
+Author:      : <pjanik@openoffice.org> (JCA)
+Description  : 
+
+Index: canvas/source/tools/image.cxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 image.cxx
+--- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
++++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
+@@ -103,8 +103,11 @@
+ // platform-dependend includes [wrapped into their own namepsaces]
+ //////////////////////////////////////////////////////////////////////////////////
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>		// _alloca
+-
++#else
++#include <stdlib.h>
++#endif
+ #if defined(WNT)
+ 	namespace  win32 
+     {
diff --git a/editors/openoffice.org-2.0-devel/files/patch-postprocess+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-postprocess+prj+build.lst
deleted file mode 100644
index 91addd32b2b4..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-postprocess+prj+build.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i56070#, #i56731#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : some *.desktop files missing on making installsets
-
-Index: postprocess/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/postprocess/prj/build.lst,v
-retrieving revision 1.20
-diff -u -r1.20 build.lst
---- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
-+++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
-@@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
-+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts xmerge DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
- po	postprocess			    	usr1	-	all	po_mkout NULL
- po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-
-
-
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 3f76e5f889d3..7b2b9f60d2c7 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -60,8 +60,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		137
-SNAPDATE=		20051031
+MILESTONE=		138
+SNAPDATE=		20051104
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 491e3ba3f190..ca146d10fa6d 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 2e2dfe84c7a50ed782e846eee7a7cd38
-SIZE (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 232319587
+MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
+SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/patch-agg b/editors/openoffice.org-3-devel/files/patch-agg
new file mode 100644
index 000000000000..ee1098b822b5
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-agg
@@ -0,0 +1,18 @@
+Issuetracker : #i57388#
+CWS          : N/A
+Author:      : <rene@openoffice.org> (JCA)
+Description  : 
+
+Index: agg/prj/build.lst
+===================================================================
+RCS file: /cvs/external/agg/prj/build.lst,v
+retrieving revision 1.2
+diff -u -r1.2 build.lst
+--- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
++++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
+@@ -1,4 +1,4 @@
+-ag	agg	:	soltools NULL
++ag	agg	:	soltools xml2cmp sal NULL
+ ag	agg										usr1	-	all	ag_mkout NULL
+ ag	agg\inc									get		-	all	ag_inc NULL
+ ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-3-devel/files/patch-malloc b/editors/openoffice.org-3-devel/files/patch-malloc
new file mode 100644
index 000000000000..b923da9db5e6
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-malloc
@@ -0,0 +1,25 @@
+Issuetracker : #i57395#
+CWS          : N/A
+Author:      : <pjanik@openoffice.org> (JCA)
+Description  : 
+
+Index: canvas/source/tools/image.cxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 image.cxx
+--- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
++++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
+@@ -103,8 +103,11 @@
+ // platform-dependend includes [wrapped into their own namepsaces]
+ //////////////////////////////////////////////////////////////////////////////////
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>		// _alloca
+-
++#else
++#include <stdlib.h>
++#endif
+ #if defined(WNT)
+ 	namespace  win32 
+     {
diff --git a/editors/openoffice.org-3-devel/files/patch-postprocess+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-postprocess+prj+build.lst
deleted file mode 100644
index 91addd32b2b4..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-postprocess+prj+build.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i56070#, #i56731#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : some *.desktop files missing on making installsets
-
-Index: postprocess/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/postprocess/prj/build.lst,v
-retrieving revision 1.20
-diff -u -r1.20 build.lst
---- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
-+++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
-@@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
-+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts xmerge DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
- po	postprocess			    	usr1	-	all	po_mkout NULL
- po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-
-
-
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 3f76e5f889d3..7b2b9f60d2c7 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -60,8 +60,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		137
-SNAPDATE=		20051031
+MILESTONE=		138
+SNAPDATE=		20051104
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 491e3ba3f190..ca146d10fa6d 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 2e2dfe84c7a50ed782e846eee7a7cd38
-SIZE (openoffice.org2.0/OOo_2.0m137_source.tar.bz2) = 232319587
+MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
+SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/patch-agg b/editors/openoffice.org-vcltesttool/files/patch-agg
new file mode 100644
index 000000000000..ee1098b822b5
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-agg
@@ -0,0 +1,18 @@
+Issuetracker : #i57388#
+CWS          : N/A
+Author:      : <rene@openoffice.org> (JCA)
+Description  : 
+
+Index: agg/prj/build.lst
+===================================================================
+RCS file: /cvs/external/agg/prj/build.lst,v
+retrieving revision 1.2
+diff -u -r1.2 build.lst
+--- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
++++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
+@@ -1,4 +1,4 @@
+-ag	agg	:	soltools NULL
++ag	agg	:	soltools xml2cmp sal NULL
+ ag	agg										usr1	-	all	ag_mkout NULL
+ ag	agg\inc									get		-	all	ag_inc NULL
+ ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-vcltesttool/files/patch-malloc b/editors/openoffice.org-vcltesttool/files/patch-malloc
new file mode 100644
index 000000000000..b923da9db5e6
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-malloc
@@ -0,0 +1,25 @@
+Issuetracker : #i57395#
+CWS          : N/A
+Author:      : <pjanik@openoffice.org> (JCA)
+Description  : 
+
+Index: canvas/source/tools/image.cxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 image.cxx
+--- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
++++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
+@@ -103,8 +103,11 @@
+ // platform-dependend includes [wrapped into their own namepsaces]
+ //////////////////////////////////////////////////////////////////////////////////
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>		// _alloca
+-
++#else
++#include <stdlib.h>
++#endif
+ #if defined(WNT)
+ 	namespace  win32 
+     {
diff --git a/editors/openoffice.org-vcltesttool/files/patch-postprocess+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-postprocess+prj+build.lst
deleted file mode 100644
index 91addd32b2b4..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-postprocess+prj+build.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i56070#, #i56731#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : some *.desktop files missing on making installsets
-
-Index: postprocess/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/postprocess/prj/build.lst,v
-retrieving revision 1.20
-diff -u -r1.20 build.lst
---- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
-+++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
-@@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
-+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts xmerge DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
- po	postprocess			    	usr1	-	all	po_mkout NULL
- po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-
-
-