Update to DEV300_m30.

4 files changed, 18 insertions, 18 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 2d5c2180eddc..f044aade171e 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		29
+MILESTONE?=		30
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080802
+SNAPDATE=		20080828
 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 f2fec94ae950..4c804ec188f0 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = c1e4630bd54b079496a59f0ed6aaf518
-SHA256 (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = 21e7932a6ea7caa2e53b13d6907e1af33e05064c732760a1c2c9864849bfe076
-SIZE (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = 321848941
+MD5 (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = 4459af894984883c64da287d19408bbc
+SHA256 (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = b2059cdea795952fd9ad643ad9ea76f037bae6c1384e77ce99e23bd5d14038e9
+SIZE (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = 336176865
 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-i91318 b/editors/openoffice-3-devel/files/patch-i91318
index 250231caac1c..a038fc180ff5 100644
--- a/editors/openoffice-3-devel/files/patch-i91318
+++ b/editors/openoffice-3-devel/files/patch-i91318
@@ -4,15 +4,16 @@ RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
 retrieving revision 1.12
 diff -u -r1.12 hunspell-1.1.12.patch
 --- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
-+++ hunspell/hunspell-1.1.12.patch	6 Jul 2008 01:23:13 -0000
-@@ -487,3 +487,10 @@
++++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
+@@ -487,3 +487,11 @@
   i68568utf.test \
   1706659.test \
   digits_in_words.test \
 +--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-07-01 06:18:31.000000000 +0900
+++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/local/bin/bash
 + export LC_ALL="C"
 + 
++ function check_valgrind_log () {
diff --git a/editors/openoffice-3-devel/files/patch-i91861 b/editors/openoffice-3-devel/files/patch-i91861
index 06602529f013..93c8021d3385 100644
--- a/editors/openoffice-3-devel/files/patch-i91861
+++ b/editors/openoffice-3-devel/files/patch-i91861
@@ -1,19 +1,18 @@
-? vcl/unxfbsdi.pro
 Index: vcl/source/glyphs/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- vcl/source/glyphs/makefile.mk	11 Apr 2008 08:59:18 -0000	1.13
-+++ vcl/source/glyphs/makefile.mk	20 Jul 2008 03:14:41 -0000
-@@ -42,9 +42,17 @@
+retrieving revision 1.13.106.1
+diff -u -r1.13.106.1 makefile.mk
+--- vcl/source/glyphs/makefile.mk	31 Jul 2008 20:14:59 -0000	1.13.106.1
++++ vcl/source/glyphs/makefile.mk	10 Aug 2008 01:06:59 -0000
+@@ -41,9 +41,17 @@
+ .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
  
- .IF "$(SYSTEM_FREETYPE)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
+ CFLAGS+= $(FREETYPE_CFLAGS)
 +.ELSE
-+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
++ADDCDEFS+= $(FREETYPE_CFLAGS)
 +.ENDIF
  .IF "$(USE_FT_EMBOLDEN)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
@@ -22,5 +21,5 @@ diff -u -r1.13 makefile.mk
 +ADDCDEFS+=-DUSE_FT_EMBOLDEN
 +.ENDIF
  .ENDIF
- .ENDIF
  
+ # --- Files --------------------------------------------------------