Update to DEV300_m62.

Funded by: OpenOffice.org community.
Feature safe:	yes

6 files changed, 10 insertions, 28 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 817d66b99864..c41ef99e4bcd 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		61
+MILESTONE?=		62
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20091006
+SNAPDATE=		20091025
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index ab0f8f5d74cc..ee9831993f47 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 2513fed9e714bb423910fad76a076883
-SHA256 (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 5fdde2a5a948980ba0906337246a4976ddc87e685d42b747bd80eab8e1ddf652
-SIZE (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 454324015
+MD5 (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = d22c506c1809f26e4465c633803570dd
+SHA256 (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = 03c1ad2bccb8218b521a0c61122d05f7531af03ca459b6d30525e4df9163f17f
+SIZE (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = 454096161
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i105585 b/editors/openoffice-3-devel/files/patch-i105585
deleted file mode 100644
index bb5a392f46dd..000000000000
--- a/editors/openoffice-3-devel/files/patch-i105585
+++ /dev/null
@@ -1,9 +0,0 @@
---- reportbuilder/prj/build.lst	2009-03-10 22:25:00.560250000 +0900
-+++ reportbuilder/prj/build.lst	2009-10-04 05:17:44.725625000 +0900
-@@ -12,5 +12,5 @@
- rpb  reportbuilder\registry\data\org\openoffice\Office\UI                 nmake   -   all rpb_reg_data_ooo_ui rpb_reg_schema_ooo_ui NULL
- rpb  reportbuilder\registry\data\org\openoffice\TypeDetection             nmake   -   all rpb_reg_data_oot NULL
- rpb  reportbuilder\template\en-US\wizard\report				nmake   -   all rpb_template_en_us_wiz_rep NULL
--rpb  reportbuilder\util                                                   nmake   -   all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep NULL
-+rpb  reportbuilder\util                                                   nmake   -   all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep rpb_reg_data_ooo_ui NULL
- 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 817d66b99864..c41ef99e4bcd 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		61
+MILESTONE?=		62
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20091006
+SNAPDATE=		20091025
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index ab0f8f5d74cc..ee9831993f47 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 2513fed9e714bb423910fad76a076883
-SHA256 (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 5fdde2a5a948980ba0906337246a4976ddc87e685d42b747bd80eab8e1ddf652
-SIZE (openoffice.org3/OOo_DEV300_m61_source.tar.bz2) = 454324015
+MD5 (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = d22c506c1809f26e4465c633803570dd
+SHA256 (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = 03c1ad2bccb8218b521a0c61122d05f7531af03ca459b6d30525e4df9163f17f
+SIZE (openoffice.org3/OOo_DEV300_m62_source.tar.bz2) = 454096161
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i105585 b/editors/openoffice.org-3-devel/files/patch-i105585
deleted file mode 100644
index bb5a392f46dd..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i105585
+++ /dev/null
@@ -1,9 +0,0 @@
---- reportbuilder/prj/build.lst	2009-03-10 22:25:00.560250000 +0900
-+++ reportbuilder/prj/build.lst	2009-10-04 05:17:44.725625000 +0900
-@@ -12,5 +12,5 @@
- rpb  reportbuilder\registry\data\org\openoffice\Office\UI                 nmake   -   all rpb_reg_data_ooo_ui rpb_reg_schema_ooo_ui NULL
- rpb  reportbuilder\registry\data\org\openoffice\TypeDetection             nmake   -   all rpb_reg_data_oot NULL
- rpb  reportbuilder\template\en-US\wizard\report				nmake   -   all rpb_template_en_us_wiz_rep NULL
--rpb  reportbuilder\util                                                   nmake   -   all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep NULL
-+rpb  reportbuilder\util                                                   nmake   -   all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep rpb_reg_data_ooo_ui NULL
-