Update to OOF680_m2.

Bit better than 2.2 Beta(OOF680_m1; http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=10505 )

5 files changed, 21 insertions, 82 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index a86ae59765cf..b8a4aeb1a75f 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.1.${SNAPDATE}
+PORTVERSION?=	2.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
@@ -29,8 +29,6 @@ EXTRACT_ONLY=	${OOOSRC}
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
-#IGNORE=		Please use editors/openoffice.org-2
-
 .if defined(WITH_CWS)
 PORTNAME:=	openoffice.org-${WITH_CWS}
 DISTFILES+=	${CWSARCHIVE}:cws
@@ -80,10 +78,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		6
-OOOTAG?=		OOE680_m${MILESTONE}
+MILESTONE?=		2
+OOOTAG?=		OOF680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061201
+SNAPDATE=		20070122
 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 484a8688c58b..5827a3ddc035 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = baa88794cb08d1a11169ae90ec25c0c4
-SHA256 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 492e702455a43c9c1b97266e74d3adc03815178e272c6f79b8e29c1089977e19
-SIZE (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 272194113
+MD5 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = f5cc06983a2cc9ee3d8bd114a4b4444e
+SHA256 (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = ad8fbdaf87c54ffec7a4d0daab25b90d8fae7883d9a5a64834c07515dc9ac17e
+SIZE (openoffice.org2.0/OOo_OOF680_m2_source.tar.bz2) = 263729207
 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-RC/files/patch-i65514 b/editors/openoffice.org-3-RC/files/patch-i65514
index 1b80adbcb7c0..07755cda662b 100644
--- a/editors/openoffice.org-3-RC/files/patch-i65514
+++ b/editors/openoffice.org-3-RC/files/patch-i65514
@@ -1,12 +1,8 @@
-Index: berkeleydb/db-4.2.52.patch
-===================================================================
-RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	25 Jul 2006 10:23:22 -0000	1.13
-+++ berkeleydb/db-4.2.52.patch	23 Aug 2006 02:24:30 -0000
-@@ -313,6 +313,20 @@
- ! 			$(SLO)$/btree_auto.obj
+diff -u -r1.17 db-4.2.52.patch
+--- berkeleydb/db-4.2.52.patch	1 Dec 2006 12:59:45 -0000	1.17
++++ berkeleydb/db-4.2.52.patch	23 Jan 2007 07:10:29 -0000
+@@ -54,6 +54,20 @@
+ ! SLOFILES= $(SLO)$/strcasecmp.obj
  ! 
  ! .INCLUDE :  target.mk
 +*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
@@ -23,13 +19,13 @@ diff -u -r1.13 db-4.2.52.patch
 +  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 +  #undef HAVE_NDIR_H
 +
- *** misc/db-4.2.52.NC/clib/makefile.mk	Tue Jul 25 09:33:00 2006
- --- misc/build/db-4.2.52.NC/clib/makefile.mk	Tue Jul 25 09:05:20 2006
+ *** misc/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:33.000000000 +0100
+ --- misc/build/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:19.000000000 +0100
  ***************
-@@ -554,6 +568,76 @@
-     fi
-   
-     # Commands to make compiler produce verbose output that lists
+@@ -306,6 +320,76 @@
+   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 +***************
 +*** 28556,28561 ****
 +--- 28556,28606 ----
@@ -100,10 +96,10 @@ diff -u -r1.13 db-4.2.52.patch
 +  _ACEOF
 +
 +  
- *** misc/db-4.2.52.NC/dist/ltmain.sh	Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	Tue Jul 25 09:05:20 2006
+ *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
+ --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2006-12-01 13:57:19.000000000 +0100
  ***************
-@@ -1010,3 +1094,39 @@
+@@ -1059,3 +1143,39 @@
  ! 			$(SLO)$/xa_map.obj
  ! 
  ! .INCLUDE :  target.mk
diff --git a/editors/openoffice.org-3-RC/files/patch-i66666 b/editors/openoffice.org-3-RC/files/patch-i66666
deleted file mode 100644
index 68f8018ead53..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i66666
+++ /dev/null
@@ -1,21 +0,0 @@
-it also includes the following patch
-http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
-from i66686 (dupe of i66666)
-Index: tools/inc/solar.h
-===================================================================
-RCS file: /cvs/util/tools/inc/solar.h,v
-retrieving revision 1.44
-diff -u -r1.44 solar.h
---- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
-+++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
-@@ -55,9 +55,6 @@
- #define FALSE		0
- #endif
- 
--#undef NULL
--#define NULL		0
--
- #ifdef _SOLAR__PRIVATE
- #undef _SOLAR__PRIVATE
- #endif
-
diff --git a/editors/openoffice.org-3-RC/files/patch-i71039 b/editors/openoffice.org-3-RC/files/patch-i71039
deleted file mode 100644
index 8f0897bc862b..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i71039
+++ /dev/null
@@ -1,34 +0,0 @@
---- binfilter/inc/bf_svx/svdobj.hxx.orig	Mon Oct 23 13:47:55 2006
-+++ binfilter/inc/bf_svx/svdobj.hxx	Mon Oct 23 13:48:08 2006
-@@ -265,7 +265,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	virtual void WriteData(SvStream& rOut);
-
---- svx/inc/svdobj.hxx.orig	Mon Oct 23 12:56:33 2006
-+++ svx/inc/svdobj.hxx	Mon Oct 23 12:56:50 2006
-@@ -323,7 +323,7 @@
- 	{}
- 	virtual ~SdrObjUserData();
- 
--	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
-+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
- 	UINT32  GetInventor() const { return nInventor; }
- 	UINT16  GetId() const { return nIdentifier; }
- 	//BFS01virtual void WriteData(SvStream& rOut);
---- sc/source/ui/inc/csvcontrol.hxx~	Fri Sep  9 06:17:47 2005
-+++ sc/source/ui/inc/csvcontrol.hxx	Sat Nov  4 08:46:16 2006
-@@ -444,7 +444,7 @@
- 
- protected:
-     /** Derived classes create a new accessible object here. */
--    virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
-+    virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
- };
- 
-