6 files changed, 16 insertions, 14 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 3e2a34ee9110..29f359f733c9 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -79,12 +79,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		97
+MILESTONE?=		98
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110115
+SNAPDATE=		20110203
 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 e372776d1231..23c980d7d2a8 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m97_source.tar.bz2) = 5179fafeef29131670f1da054a7843f0cb625641bc87d68a38f0d685f61048e7
-SIZE (openoffice.org3/OOo_DEV300_m97_source.tar.bz2) = 309008326
+SHA256 (openoffice.org3/OOo_DEV300_m98_source.tar.bz2) = 4ecd3fe3edfe3b8b766da6e90ba6cd14a3298a653f2f5f8a5018aa03355d53a2
+SIZE (openoffice.org3/OOo_DEV300_m98_source.tar.bz2) = 309091571
 SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
 SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice-3-devel/files/patch-i116477 b/editors/openoffice-3-devel/files/patch-i116477
index 6e1ded848ce3..cc16ba35af11 100644
--- a/editors/openoffice-3-devel/files/patch-i116477
+++ b/editors/openoffice-3-devel/files/patch-i116477
@@ -365,8 +365,8 @@
 +# vim: set noet sw=4 ts=4:
 --- RepositoryFixes.mk~	2010-12-23 11:31:10.000000000 +0900
 +++ RepositoryFixes.mk	2011-01-22 18:43:30.000000000 +0900
-@@ -134,5 +134,22 @@
- gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+@@ -166,6 +166,23 @@
+ 
  endif
  
 +ifeq ($(OS),FREEBSD)
@@ -386,5 +386,6 @@
 +
 +endif
 +
- # vim: set noet sw=4 ts=4:
+ # we do not require a known rule for these, when using system libs
  
+ ifeq ($(USE_SYSTEM_STL),YES)
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 3e2a34ee9110..29f359f733c9 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -79,12 +79,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		97
+MILESTONE?=		98
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110115
+SNAPDATE=		20110203
 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 e372776d1231..23c980d7d2a8 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m97_source.tar.bz2) = 5179fafeef29131670f1da054a7843f0cb625641bc87d68a38f0d685f61048e7
-SIZE (openoffice.org3/OOo_DEV300_m97_source.tar.bz2) = 309008326
+SHA256 (openoffice.org3/OOo_DEV300_m98_source.tar.bz2) = 4ecd3fe3edfe3b8b766da6e90ba6cd14a3298a653f2f5f8a5018aa03355d53a2
+SIZE (openoffice.org3/OOo_DEV300_m98_source.tar.bz2) = 309091571
 SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
 SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice.org-3-devel/files/patch-i116477 b/editors/openoffice.org-3-devel/files/patch-i116477
index 6e1ded848ce3..cc16ba35af11 100644
--- a/editors/openoffice.org-3-devel/files/patch-i116477
+++ b/editors/openoffice.org-3-devel/files/patch-i116477
@@ -365,8 +365,8 @@
 +# vim: set noet sw=4 ts=4:
 --- RepositoryFixes.mk~	2010-12-23 11:31:10.000000000 +0900
 +++ RepositoryFixes.mk	2011-01-22 18:43:30.000000000 +0900
-@@ -134,5 +134,22 @@
- gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+@@ -166,6 +166,23 @@
+ 
  endif
  
 +ifeq ($(OS),FREEBSD)
@@ -386,5 +386,6 @@
 +
 +endif
 +
- # vim: set noet sw=4 ts=4:
+ # we do not require a known rule for these, when using system libs
  
+ ifeq ($(USE_SYSTEM_STL),YES)