Update to OOF680_m5, and build fix for i386[1].

PR:		108389[1]
Submitted by:	Kay Abendroth<kay.abendroth@raxion.net>[1] and kris via pointhat[1]

6 files changed, 44 insertions, 12 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index b8a4aeb1a75f..0fc2e3543a46 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -70,7 +70,7 @@ GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
 GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
+FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 .if ${PERL_LEVEL} < 500600
@@ -78,10 +78,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		2
+MILESTONE?=		5
 OOOTAG?=		OOF680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070122
+SNAPDATE=		20070130
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 5827a3ddc035..77560245a363 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = f5cc06983a2cc9ee3d8bd114a4b4444e
-SHA256 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = ad8fbdaf87c54ffec7a4d0daab25b90d8fae7883d9a5a64834c07515dc9ac17e
-SIZE (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = 263729207
+MD5 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = c95bd80c5cc46e1f88e7f3069c370585
+SHA256 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = e27308862571c69d1afffb2af8c60c1089f3a45b5b7170c2f4046aad8df10f0d
+SIZE (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = 265636571
 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-RC/files/patch-i74038 b/editors/openoffice.org-2-RC/files/patch-i74038
new file mode 100644
index 000000000000..d88d78c16efb
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i74038
@@ -0,0 +1,16 @@
+Index: basctl/source/inc/localizationmgr.hxx
+===================================================================
+RCS file: /cvs/script/basctl/source/inc/localizationmgr.hxx,v
+retrieving revision 1.2.2.2
+diff -u -p --unified -r1.2.2.2 localizationmgr.hxx
+--- basctl/source/inc/localizationmgr.hxx	29 Jan 2007 13:56:23 -0000	1.2.2.2
++++ basctl/source/inc/localizationmgr.hxx	30 Jan 2007 22:26:14 -0000
+@@ -135,7 +135,7 @@ public:
+ 			< ::com::sun::star::container::XNameContainer > xDialogLib );
+ 
+ 	// Clipboard
+-	static void LocalizationMgr::resetResourceForDialog(
++	static void resetResourceForDialog(
+ 		::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
+ 		::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager );
+ 
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index b8a4aeb1a75f..0fc2e3543a46 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -70,7 +70,7 @@ GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
 GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
-FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
+FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 .if ${PERL_LEVEL} < 500600
@@ -78,10 +78,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		2
+MILESTONE?=		5
 OOOTAG?=		OOF680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070122
+SNAPDATE=		20070130
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 5827a3ddc035..77560245a363 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = f5cc06983a2cc9ee3d8bd114a4b4444e
-SHA256 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = ad8fbdaf87c54ffec7a4d0daab25b90d8fae7883d9a5a64834c07515dc9ac17e
-SIZE (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = 263729207
+MD5 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = c95bd80c5cc46e1f88e7f3069c370585
+SHA256 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = e27308862571c69d1afffb2af8c60c1089f3a45b5b7170c2f4046aad8df10f0d
+SIZE (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = 265636571
 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-RC/files/patch-i74038 b/editors/openoffice.org-3-RC/files/patch-i74038
new file mode 100644
index 000000000000..d88d78c16efb
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i74038
@@ -0,0 +1,16 @@
+Index: basctl/source/inc/localizationmgr.hxx
+===================================================================
+RCS file: /cvs/script/basctl/source/inc/localizationmgr.hxx,v
+retrieving revision 1.2.2.2
+diff -u -p --unified -r1.2.2.2 localizationmgr.hxx
+--- basctl/source/inc/localizationmgr.hxx	29 Jan 2007 13:56:23 -0000	1.2.2.2
++++ basctl/source/inc/localizationmgr.hxx	30 Jan 2007 22:26:14 -0000
+@@ -135,7 +135,7 @@ public:
+ 			< ::com::sun::star::container::XNameContainer > xDialogLib );
+ 
+ 	// Clipboard
+-	static void LocalizationMgr::resetResourceForDialog(
++	static void resetResourceForDialog(
+ 		::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
+ 		::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager );
+