Update to 2.2.0, ok with wiz during freeze.

Release Notes:
 http://development.openoffice.org/releases/2.2.0.html

Changes:
 - Fix CVE-2007-0002, CVE-2007-0238, CVE-2007-0239.
 - field lengths of bibliography database changed.
 - UTF-8 encoding for dBase databases.
 - "Edit in SQL View..." command for database queries.
 - forms: date and time fields do not default to "Today" and "Now" anymore.
 - query/relation design: visual marker indicating the type of table/query.
 - advanced database setting: "Use keyword AS before table alias names".
 - Annoying focus behavior of OOo was fixed.
 - scaling in spadmin page property page deleted.
 - Additional options for pdf export.
 - Desktop-Integration package for slackware.
 - Show/Hide Slide menu entry split into two entries.
 - Support for NetBSD, Linux 64 bit, Linux SPARC in TestTool Environment.
 - New behavior of "Insert - Sheet From File".
 - Import MS Excel files with PivotTables based on external data.
 - Insert/Delete Note in cell context menu.
 - some UNO Remote Protocol (URP) changes.
 - Extension Dependency OpenOffice.org-minimal-version.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - System integration for extensions.
 - Online Update for Extensions.
 - Localization of UNO Dialogs.
 - OOo no longer generates sensitive UUIDs.
 - Autokerning enabled by default.
 - CVS import dialog for unformatted clipboard text.
 - Ordinal suffix in AutoFill.
 - simple protocolhandler add-on support in uno-skeletonmaker.
 - Autokerning enabled by default.
 - Create Tango icon set for OO.o.
 - Add localisation support to UNO dialogs and IDE Dialog Editor.
 - extend add-on support in the uno-skeletonmaker.
 - Upgrade icu to latest version.
 - Implement an optional help section in the ObjectInspector.
 - additional PDF export features
 - makes localize.sdf files optional.
 - Add/update Slovenian templates for 2.1.
 - update of icons.
 - changes for soffice script.
 - implement shaped system windows.
 - Updates of OOo <-> ATK bridge.
 - #139464# use #REF! errors in formulas using cells from missing
   external linked sheets.
 - Tooling fixes for CWS and MWS handling.
 - Remove SISSL from module filter.
 - make the 'automatic update check' more consistent.
 - code only cws, adds infrastructure for vba interop project.
 - Prepare framework code to support inplace active objects that are
   not UIactive.
 - Some bugs, some very minor UNO runtime features.
 - Changed context menu (insert/delete note) for Calc cells.
 - new buildsystem features.
 - Improve line height compatibility on UNX platforms while keeping
   the layout backwards compatible.
 - Preparing installation of extensions in installation sets.
 - osl[in|de]crementInterlockedCount(): don't use "lock" prefix on
   single processor, single core, non HT machines.
 - Clean up obsolete files in binfilter.
 - Bug fixes.

2 files changed, 19 insertions, 20 deletions

diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index efd461e63af..8d0a029ae8c 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2007/03/15 08:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/04/06 13:42:25 ghen Exp $
 
 PKGNAME=		openoffice2-bin-${OO_RELEASE}
-PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -15,8 +14,8 @@ BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
 RPM2PKG=		${PREFIX}/sbin/rpm2pkg
 RPM2PKGARGS=		-d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1
 
-OO_VER=			2.1
-OO_RELEASE=		2.1.0
+OO_VER=			2.2
+OO_RELEASE=		2.2.0
 PLIST_SUBST+=		VER=${OO_VER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -51,32 +50,32 @@ ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
 .    endif
 DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/packages
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
 .  elif ${MACHINE_ARCH} == "i386"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/RPMS
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
 .  endif
 .endif
 
 .if ${OPSYS} == "DragonFly"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/RPMS
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
 .endif
 
 .if ${OPSYS} == "Linux"
 .if ${ARCH} == "i386"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/RPMS
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
 .endif
 .endif
 
 .if ${OPSYS} == "SunOS"
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/packages
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
 .elif ${MACHINE_ARCH} == "i386"
 DISTNAME=	OOo_${OO_RELEASE}_Solarisx86_install_en-US
-WRKSRC=		${WRKDIR}/OOE680_m6_native_packed-1_en-US.9095/packages
+WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
 .endif
 .endif
 
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index 3284b52c12c..0a8ae962edc 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2007/01/19 13:19:14 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2007/04/06 13:42:25 ghen Exp $
 
-SHA1 (OOo_2.1.0_LinuxIntel_install_en-US.tar.gz) = 6de6a83d402817ef5116d28072f9dd6b0600c6d6
-RMD160 (OOo_2.1.0_LinuxIntel_install_en-US.tar.gz) = 6328142489f11ea713c80952b48e0446a1bbf905
-Size (OOo_2.1.0_LinuxIntel_install_en-US.tar.gz) = 128789627 bytes
-SHA1 (OOo_2.1.0_SolarisSparc_install_en-US.tar.gz) = 6a86792d97c16adc64ece3327271a0a12a650e86
-RMD160 (OOo_2.1.0_SolarisSparc_install_en-US.tar.gz) = e236f789f92a4408397016c1bcdfe8d8a99b7b06
-Size (OOo_2.1.0_SolarisSparc_install_en-US.tar.gz) = 130073907 bytes
-SHA1 (OOo_2.1.0_Solarisx86_install_en-US.tar.gz) = a95f45d3913b748fa91e4bb00799d69a55e063ee
-RMD160 (OOo_2.1.0_Solarisx86_install_en-US.tar.gz) = 3a853ecf799254227f261ec8924ac003b5e92dd2
-Size (OOo_2.1.0_Solarisx86_install_en-US.tar.gz) = 120444571 bytes
+SHA1 (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = a2a04de16ab3bd9290178312339d5117f4511010
+RMD160 (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = dba9b28c0d8ae8cef4b34dbab0ebd0b37a3d0595
+Size (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = 131348495 bytes
+SHA1 (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = 297452e2b11b698ee36306532a143452743b8e3c
+RMD160 (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = a8efee0885055cb2fc2460262cc2a468dbb07ab6
+Size (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = 131300806 bytes
+SHA1 (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 3f0435cf590377f8c65c54f6a231c89d71fef3a1
+RMD160 (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 5204bb8bbb791d4cdf4c784dbbec199c1a0dc11c
+Size (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 121894989 bytes