Update to OOO300_m1.

6 files changed, 51 insertions, 38 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index ef86b5ff4ddd..9e850cbb5778 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -26,8 +26,6 @@ EXTRACT_ONLY=	${OOOSRC}
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
-IGNORE=		please use openoffice.org-3 port
-
 .if defined(WITH_CWS)
 PORTNAME:=	openoffice.org-${WITH_CWS}
 DISTFILES+=	${CWSARCHIVE}:cws
@@ -78,11 +76,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		3
-OOOTAG?=		BEB300_m${MILESTONE}
+MILESTONE?=		1
+OOOTAG?=		OOO300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080712
+SNAPDATE=		20080806
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 917c7efaf0d8..ca81415e43b9 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = e5f3677affcf64293048a8e9235bba89
-SHA256 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 493d6e45407a14de1acda5ed64adbd4cca966de11ffd6acec9ba24f7e359e185
-SIZE (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 299207769
+MD5 (openoffice.org3/OOo_OOO300_m1_source.tar.bz2) = e663ecfc1cf6471c7303468bc9cc8cfc
+SHA256 (openoffice.org3/OOo_OOO300_m1_source.tar.bz2) = d36577d753c2004910e87635fa6250becb1050e7c022cf76ee9098bd6e64c443
+SIZE (openoffice.org3/OOo_OOO300_m1_source.tar.bz2) = 318514897
 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-RC/files/patch-i84549 b/editors/openoffice.org-3-RC/files/patch-i84549
index 3f1808c45b5a..1d7f6517953b 100644
--- a/editors/openoffice.org-3-RC/files/patch-i84549
+++ b/editors/openoffice.org-3-RC/files/patch-i84549
@@ -1,17 +1,16 @@
-? neon/unxfbsdi.pro
 Index: neon/neon.patch
 ===================================================================
 RCS file: /cvs/external/neon/neon.patch,v
-retrieving revision 1.20
-diff -u -r1.20 neon.patch
---- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
-+++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
-@@ -268,7 +268,7 @@
- ! #define HAVE_SYS_TYPES_H 1
- ! 
- ! /* Define if the timezone global is available */
--! #ifndef MACOSX
-+! #if !defined (MACOSX) && !defined (FREEBSD)
- ! #define HAVE_TIMEZONE 1
- ! #endif
- ! 
+retrieving revision 1.25
+diff -u -r1.25 neon.patch
+--- neon/neon.patch	22 Jul 2008 17:17:06 -0000	1.25
++++ neon/neon.patch	10 Aug 2008 04:20:27 -0000
+@@ -266,7 +266,7 @@
+ +#define HAVE_SYS_TYPES_H 1
+ +
+ +/* Define if the timezone global is available */
+-+#ifndef MACOSX
+++#if !defined(MACOSX) && !defined(FREEBSD)
+ +#define HAVE_TIMEZONE 1
+ +#endif
+ +
diff --git a/editors/openoffice.org-3-RC/files/patch-i91318 b/editors/openoffice.org-3-RC/files/patch-i91318
index 172af1ddae5a..a038fc180ff5 100644
--- a/editors/openoffice.org-3-RC/files/patch-i91318
+++ b/editors/openoffice.org-3-RC/files/patch-i91318
@@ -1,18 +1,19 @@
 Index: hunspell/hunspell-1.1.12.patch
 ===================================================================
 RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.11
-diff -u -r1.11 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
-+++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
-@@ -450,3 +450,10 @@
+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	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.org-3-RC/files/patch-i91369 b/editors/openoffice.org-3-RC/files/patch-i91369
new file mode 100644
index 000000000000..f1de25ebdfad
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i91369
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.24
+diff -u -r1.24 makefile.mk
+--- store/util/makefile.mk	10 Apr 2008 14:23:47 -0000	1.24
++++ store/util/makefile.mk	30 Jun 2008 23:52:56 -0000
+@@ -78,7 +78,7 @@
+ .ELSE
+ .IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+=	-lsupc++
+ .ENDIF # CCNUMVER
diff --git a/editors/openoffice.org-3-RC/files/patch-i91861 b/editors/openoffice.org-3-RC/files/patch-i91861
index 06602529f013..93c8021d3385 100644
--- a/editors/openoffice.org-3-RC/files/patch-i91861
+++ b/editors/openoffice.org-3-RC/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 --------------------------------------------------------