Update to DEV300_m18.

4 files changed, 28 insertions, 32 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 27391ee3774b..d513a23888df 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?=		17
+MILESTONE?=		18
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080608
+SNAPDATE=		20080610
 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 15a86a763a75..da4a71b2ebc3 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m17_source.tar.bz2) = e895b7e7cb0281708331bc7ad1c0b3e8
-SHA256 (openoffice.org3/OOo_DEV300_m17_source.tar.bz2) = 003b72946e216cb5c41c0ae14169add0ef32bc14a2ff74eebdeaa93f1a0846cb
-SIZE (openoffice.org3/OOo_DEV300_m17_source.tar.bz2) = 299264150
+MD5 (openoffice.org3/OOo_DEV300_m18_source.tar.bz2) = 520cb7371b8aaf97755a4bb6fe254fdd
+SHA256 (openoffice.org3/OOo_DEV300_m18_source.tar.bz2) = c0b06b4c36bd64e49558fdf9ab327e395e29a0f84b90a2eb3a9eabbe19b809f9
+SIZE (openoffice.org3/OOo_DEV300_m18_source.tar.bz2) = 300034671
 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-i80129 b/editors/openoffice-3-devel/files/patch-i80129
index 24cc48f48ccd..d6d5861503e0 100644
--- a/editors/openoffice-3-devel/files/patch-i80129
+++ b/editors/openoffice-3-devel/files/patch-i80129
@@ -1,18 +1,35 @@
 Merely a workaround
 
+Index: libxml2/libxml2-2.6.31.patch
+===================================================================
+RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
+retrieving revision 1.2
+diff -u -r1.2 libxml2-2.6.31.patch
+--- libxml2/libxml2-2.6.31.patch	6 Jun 2008 11:48:45 -0000	1.2
++++ libxml2/libxml2-2.6.31.patch	10 Jun 2008 09:34:51 -0000
+@@ -87,7 +87,7 @@
+   	  ;;
+   
+   	freebsd-elf)
+-! 	  major=.`expr $current - $age`
++! 	  major=`expr $current - $age`
+ ! 	  versuffix=".$major.$age.$revision";
+   	  ;;
+   
+
 Index: scp2/source/ooo/ure.scp
 ===================================================================
 RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
-+++ scp2/source/ooo/ure.scp	21 Mar 2008 07:30:43 -0000
-@@ -684,6 +684,8 @@
+retrieving revision 1.7
+diff -u -r1.7 ure.scp
+--- scp2/source/ooo/ure.scp	6 Jun 2008 17:05:51 -0000	1.7
++++ scp2/source/ooo/ure.scp	10 Jun 2008 09:45:54 -0000
+@@ -679,6 +679,8 @@
  #endif
  #elif defined MACOSX
      Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
-+    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
  #else
      Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice-3-devel/files/patch-i89921 b/editors/openoffice-3-devel/files/patch-i89921
deleted file mode 100644
index 207e827c5c32..000000000000
--- a/editors/openoffice-3-devel/files/patch-i89921
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: source/token/makefile.mk
-===================================================================
-RCS file: /cvs/xml/oox/source/token/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- oox/source/token/makefile.mk	18 Apr 2008 14:33:38 -0000	1.7
-+++ oox/source/token/makefile.mk	25 May 2008 10:07:00 -0000
-@@ -50,11 +50,11 @@
- 
- .INCLUDE :  target.mk
- 
--$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
-+$(MISC)$/tokens.gperf : tokens.txt gentoken.pl
- 		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
- 
- $(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
- 		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
- 
--$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
-+$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc
-