update to DEV300_m89.

Funded by: OpenOffice.org community.

6 files changed, 28 insertions, 30 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index d6229f76fb50..f1e65f2b4a34 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	cppunit*
 
 EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
 
-OOOEXTSRC=	ext_sources.20100718.tar.bz2:extsrc
+OOOEXTSRC=	ext_sources.20101009.tar.bz2:extsrc
 
 .if defined(CWS)
 PORTNAME:=	openoffice.org-${CWS}
@@ -79,11 +79,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		88
+MILESTONE?=		89
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100922
+SNAPDATE=		20101008
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -157,7 +157,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-wiki-publisher				\
 			--enable-report-builder				\
 			--disable-gstreamer				\
-			--with-use-shell=bash				\
 			--with-vendor="FreeBSD ports system"
 #disable-gstreamer: simple build fix req'ed
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 65d6973669e6..d27c570a5e43 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,9 +1,9 @@
-MD5 (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = cfc0e0cd56ee81504e47caea32161a73
-SHA256 (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = 707a66676dccf6ee87e07d68bddff2d73e286fade9b99c5edf02813c0bf6e970
-SIZE (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = 308473074
-MD5 (openoffice.org3/ext_sources.20100718.tar.bz2) = da1971f1f0f3d23a3f1a63c1f9c18a88
-SHA256 (openoffice.org3/ext_sources.20100718.tar.bz2) = 68b032b0a2918eeb2af46b1d4adfb30af5f3d5ff1898de33460f5ec9b834dfc0
-SIZE (openoffice.org3/ext_sources.20100718.tar.bz2) = 214053194
+MD5 (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = 8ea5b814ef637e201b71bade8528e170
+SHA256 (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = d4f43df11ca7584044d6c820c2c371943ebec2173ac8c4c799257836747b43b1
+SIZE (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = 309901126
+MD5 (openoffice.org3/ext_sources.20101009.tar.bz2) = 6b9bd57b23cd5a59fd5db53b2344d4a0
+SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
+SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 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-i108197 b/editors/openoffice-3-devel/files/patch-i108197
index 92b455532814..e25d98261f57 100644
--- a/editors/openoffice-3-devel/files/patch-i108197
+++ b/editors/openoffice-3-devel/files/patch-i108197
@@ -1,9 +1,9 @@
---- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
-+++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
-@@ -143,8 +143,8 @@
- #################################################################
+--- testtools/source/bridgetest/makefile.mk.orig	2010-10-05 11:12:22.000000000 +0900
++++ testtools/source/bridgetest/makefile.mk	2010-10-09 15:05:22.000000000 +0900
+@@ -138,8 +138,8 @@
  
- runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
+         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
 -.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 -	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
 +.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index d6229f76fb50..f1e65f2b4a34 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	cppunit*
 
 EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
 
-OOOEXTSRC=	ext_sources.20100718.tar.bz2:extsrc
+OOOEXTSRC=	ext_sources.20101009.tar.bz2:extsrc
 
 .if defined(CWS)
 PORTNAME:=	openoffice.org-${CWS}
@@ -79,11 +79,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		88
+MILESTONE?=		89
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100922
+SNAPDATE=		20101008
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -157,7 +157,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-wiki-publisher				\
 			--enable-report-builder				\
 			--disable-gstreamer				\
-			--with-use-shell=bash				\
 			--with-vendor="FreeBSD ports system"
 #disable-gstreamer: simple build fix req'ed
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 65d6973669e6..d27c570a5e43 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,9 +1,9 @@
-MD5 (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = cfc0e0cd56ee81504e47caea32161a73
-SHA256 (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = 707a66676dccf6ee87e07d68bddff2d73e286fade9b99c5edf02813c0bf6e970
-SIZE (openoffice.org3/OOo_DEV300_m88_source.tar.bz2) = 308473074
-MD5 (openoffice.org3/ext_sources.20100718.tar.bz2) = da1971f1f0f3d23a3f1a63c1f9c18a88
-SHA256 (openoffice.org3/ext_sources.20100718.tar.bz2) = 68b032b0a2918eeb2af46b1d4adfb30af5f3d5ff1898de33460f5ec9b834dfc0
-SIZE (openoffice.org3/ext_sources.20100718.tar.bz2) = 214053194
+MD5 (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = 8ea5b814ef637e201b71bade8528e170
+SHA256 (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = d4f43df11ca7584044d6c820c2c371943ebec2173ac8c4c799257836747b43b1
+SIZE (openoffice.org3/OOo_DEV300_m89_source.tar.bz2) = 309901126
+MD5 (openoffice.org3/ext_sources.20101009.tar.bz2) = 6b9bd57b23cd5a59fd5db53b2344d4a0
+SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
+SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 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-i108197 b/editors/openoffice.org-3-devel/files/patch-i108197
index 92b455532814..e25d98261f57 100644
--- a/editors/openoffice.org-3-devel/files/patch-i108197
+++ b/editors/openoffice.org-3-devel/files/patch-i108197
@@ -1,9 +1,9 @@
---- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
-+++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
-@@ -143,8 +143,8 @@
- #################################################################
+--- testtools/source/bridgetest/makefile.mk.orig	2010-10-05 11:12:22.000000000 +0900
++++ testtools/source/bridgetest/makefile.mk	2010-10-09 15:05:22.000000000 +0900
+@@ -138,8 +138,8 @@
  
- runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
+         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
 -.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 -	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
 +.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"