From ae67b4c8817ac0b47626e9e6867ca867a86edffc Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Mon, 26 Mar 2007 05:57:54 +0000
Subject: Update to SRC680_m206.

---
 editors/openoffice-3-devel/Makefile                   |  4 ++--
 editors/openoffice-3-devel/distinfo                   |  6 +++---
 editors/openoffice-3-devel/files/patch-i75708         | 16 ++++++++++++++++
 editors/openoffice-3-devel/files/patch-i75732         | 18 ++++++++++++++++++
 editors/openoffice.org-2-devel/Makefile               |  4 ++--
 editors/openoffice.org-2-devel/distinfo               |  6 +++---
 editors/openoffice.org-2-devel/files/patch-i75708     | 16 ++++++++++++++++
 editors/openoffice.org-2-devel/files/patch-i75732     | 18 ++++++++++++++++++
 editors/openoffice.org-3-devel/Makefile               |  4 ++--
 editors/openoffice.org-3-devel/distinfo               |  6 +++---
 editors/openoffice.org-3-devel/files/patch-i75708     | 16 ++++++++++++++++
 editors/openoffice.org-3-devel/files/patch-i75732     | 18 ++++++++++++++++++
 editors/openoffice.org-vcltesttool/Makefile           |  4 ++--
 editors/openoffice.org-vcltesttool/distinfo           |  6 +++---
 editors/openoffice.org-vcltesttool/files/patch-i75708 | 16 ++++++++++++++++
 editors/openoffice.org-vcltesttool/files/patch-i75732 | 18 ++++++++++++++++++
 16 files changed, 156 insertions(+), 20 deletions(-)
 create mode 100644 editors/openoffice-3-devel/files/patch-i75708
 create mode 100644 editors/openoffice-3-devel/files/patch-i75732
 create mode 100644 editors/openoffice.org-2-devel/files/patch-i75708
 create mode 100644 editors/openoffice.org-2-devel/files/patch-i75732
 create mode 100644 editors/openoffice.org-3-devel/files/patch-i75708
 create mode 100644 editors/openoffice.org-3-devel/files/patch-i75732
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i75708
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i75732

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 07aab58136c3..20227e79d3c8 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -74,10 +74,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		204
+MILESTONE?=		206
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070221
+SNAPDATE=		20070319
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index c8d50f407747..bd6d678ca7c9 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = c504a60aab7fb6955f9f3f444918cf51
-SHA256 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = dbd7e66a4270806e124484ddf4ff8b2f90ca856008f4f193437a59640d44077e
-SIZE (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = 268684983
+MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad
+SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7
+SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654
 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-3-devel/files/patch-i75708 b/editors/openoffice-3-devel/files/patch-i75708
new file mode 100644
index 000000000000..1fc8565c4fd4
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i75708
@@ -0,0 +1,16 @@
+Index: basctl/source/basicide/scriptdocument.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/scriptdocument.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 scriptdocument.cxx
+--- basctl/source/basicide/scriptdocument.cxx	15 Mar 2007 15:59:30 -0000	1.2
++++ basctl/source/basicide/scriptdocument.cxx	25 Mar 2007 21:09:03 -0000
+@@ -921,7 +921,7 @@
+     //--------------------------------------------------------------------
+     sal_Int32 ScriptDocument::hashCode() const
+     {
+-        return reinterpret_cast< sal_Int32 >( m_pImpl->getObjectShell() );
++        return reinterpret_cast< sal_IntPtr >( m_pImpl->getObjectShell() );
+     }
+ 
+     //--------------------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-i75732 b/editors/openoffice-3-devel/files/patch-i75732
new file mode 100644
index 000000000000..58dd524e660c
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i75732
@@ -0,0 +1,18 @@
+? sw/unxfbsdx.pro
+Index: sw/source/core/doc/makefile.mk
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v
+retrieving revision 1.16
+diff -u -r1.16 makefile.mk
+--- sw/source/core/doc/makefile.mk	28 Feb 2007 15:40:53 -0000	1.16
++++ sw/source/core/doc/makefile.mk	26 Mar 2007 05:08:30 -0000
+@@ -94,7 +94,8 @@
+ 
+ EXCEPTIONSFILES = \
+                 $(SLO)$/doclay.obj \
+-                $(SLO)$/docnew.obj
++                $(SLO)$/docnew.obj \
++                $(SLO)$/tblrwcl.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 07aab58136c3..20227e79d3c8 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -74,10 +74,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		204
+MILESTONE?=		206
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070221
+SNAPDATE=		20070319
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index c8d50f407747..bd6d678ca7c9 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = c504a60aab7fb6955f9f3f444918cf51
-SHA256 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = dbd7e66a4270806e124484ddf4ff8b2f90ca856008f4f193437a59640d44077e
-SIZE (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = 268684983
+MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad
+SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7
+SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654
 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-devel/files/patch-i75708 b/editors/openoffice.org-2-devel/files/patch-i75708
new file mode 100644
index 000000000000..1fc8565c4fd4
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i75708
@@ -0,0 +1,16 @@
+Index: basctl/source/basicide/scriptdocument.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/scriptdocument.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 scriptdocument.cxx
+--- basctl/source/basicide/scriptdocument.cxx	15 Mar 2007 15:59:30 -0000	1.2
++++ basctl/source/basicide/scriptdocument.cxx	25 Mar 2007 21:09:03 -0000
+@@ -921,7 +921,7 @@
+     //--------------------------------------------------------------------
+     sal_Int32 ScriptDocument::hashCode() const
+     {
+-        return reinterpret_cast< sal_Int32 >( m_pImpl->getObjectShell() );
++        return reinterpret_cast< sal_IntPtr >( m_pImpl->getObjectShell() );
+     }
+ 
+     //--------------------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-i75732 b/editors/openoffice.org-2-devel/files/patch-i75732
new file mode 100644
index 000000000000..58dd524e660c
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i75732
@@ -0,0 +1,18 @@
+? sw/unxfbsdx.pro
+Index: sw/source/core/doc/makefile.mk
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v
+retrieving revision 1.16
+diff -u -r1.16 makefile.mk
+--- sw/source/core/doc/makefile.mk	28 Feb 2007 15:40:53 -0000	1.16
++++ sw/source/core/doc/makefile.mk	26 Mar 2007 05:08:30 -0000
+@@ -94,7 +94,8 @@
+ 
+ EXCEPTIONSFILES = \
+                 $(SLO)$/doclay.obj \
+-                $(SLO)$/docnew.obj
++                $(SLO)$/docnew.obj \
++                $(SLO)$/tblrwcl.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 07aab58136c3..20227e79d3c8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -74,10 +74,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		204
+MILESTONE?=		206
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070221
+SNAPDATE=		20070319
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index c8d50f407747..bd6d678ca7c9 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = c504a60aab7fb6955f9f3f444918cf51
-SHA256 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = dbd7e66a4270806e124484ddf4ff8b2f90ca856008f4f193437a59640d44077e
-SIZE (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = 268684983
+MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad
+SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7
+SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654
 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-devel/files/patch-i75708 b/editors/openoffice.org-3-devel/files/patch-i75708
new file mode 100644
index 000000000000..1fc8565c4fd4
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i75708
@@ -0,0 +1,16 @@
+Index: basctl/source/basicide/scriptdocument.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/scriptdocument.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 scriptdocument.cxx
+--- basctl/source/basicide/scriptdocument.cxx	15 Mar 2007 15:59:30 -0000	1.2
++++ basctl/source/basicide/scriptdocument.cxx	25 Mar 2007 21:09:03 -0000
+@@ -921,7 +921,7 @@
+     //--------------------------------------------------------------------
+     sal_Int32 ScriptDocument::hashCode() const
+     {
+-        return reinterpret_cast< sal_Int32 >( m_pImpl->getObjectShell() );
++        return reinterpret_cast< sal_IntPtr >( m_pImpl->getObjectShell() );
+     }
+ 
+     //--------------------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-i75732 b/editors/openoffice.org-3-devel/files/patch-i75732
new file mode 100644
index 000000000000..58dd524e660c
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i75732
@@ -0,0 +1,18 @@
+? sw/unxfbsdx.pro
+Index: sw/source/core/doc/makefile.mk
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v
+retrieving revision 1.16
+diff -u -r1.16 makefile.mk
+--- sw/source/core/doc/makefile.mk	28 Feb 2007 15:40:53 -0000	1.16
++++ sw/source/core/doc/makefile.mk	26 Mar 2007 05:08:30 -0000
+@@ -94,7 +94,8 @@
+ 
+ EXCEPTIONSFILES = \
+                 $(SLO)$/doclay.obj \
+-                $(SLO)$/docnew.obj
++                $(SLO)$/docnew.obj \
++                $(SLO)$/tblrwcl.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 07aab58136c3..20227e79d3c8 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -74,10 +74,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		204
+MILESTONE?=		206
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070221
+SNAPDATE=		20070319
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index c8d50f407747..bd6d678ca7c9 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = c504a60aab7fb6955f9f3f444918cf51
-SHA256 (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = dbd7e66a4270806e124484ddf4ff8b2f90ca856008f4f193437a59640d44077e
-SIZE (openoffice.org2.0/OOo_SRC680_m204_source.tar.bz2) = 268684983
+MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad
+SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7
+SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654
 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-vcltesttool/files/patch-i75708 b/editors/openoffice.org-vcltesttool/files/patch-i75708
new file mode 100644
index 000000000000..1fc8565c4fd4
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i75708
@@ -0,0 +1,16 @@
+Index: basctl/source/basicide/scriptdocument.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/scriptdocument.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 scriptdocument.cxx
+--- basctl/source/basicide/scriptdocument.cxx	15 Mar 2007 15:59:30 -0000	1.2
++++ basctl/source/basicide/scriptdocument.cxx	25 Mar 2007 21:09:03 -0000
+@@ -921,7 +921,7 @@
+     //--------------------------------------------------------------------
+     sal_Int32 ScriptDocument::hashCode() const
+     {
+-        return reinterpret_cast< sal_Int32 >( m_pImpl->getObjectShell() );
++        return reinterpret_cast< sal_IntPtr >( m_pImpl->getObjectShell() );
+     }
+ 
+     //--------------------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i75732 b/editors/openoffice.org-vcltesttool/files/patch-i75732
new file mode 100644
index 000000000000..58dd524e660c
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i75732
@@ -0,0 +1,18 @@
+? sw/unxfbsdx.pro
+Index: sw/source/core/doc/makefile.mk
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v
+retrieving revision 1.16
+diff -u -r1.16 makefile.mk
+--- sw/source/core/doc/makefile.mk	28 Feb 2007 15:40:53 -0000	1.16
++++ sw/source/core/doc/makefile.mk	26 Mar 2007 05:08:30 -0000
+@@ -94,7 +94,8 @@
+ 
+ EXCEPTIONSFILES = \
+                 $(SLO)$/doclay.obj \
+-                $(SLO)$/docnew.obj
++                $(SLO)$/docnew.obj \
++                $(SLO)$/tblrwcl.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
-- 
cgit v1.2.3