Update OpenOffice to 2.0.3. This release fixes three security vulnerabilities.

Additional changes include:

* performance improvements: for example, a 23 percent improvement in certain
  Calc benchmarks
* further improvements to file format compatibility with Microsoft Office files
* new email integration features for users wanting to send emails in Microsoft
  file formats
* more control over how exported PDF documents will display when opened in a
  PDF reader
* support for more languages and improvements in hyphenation and thesaurus
* support for Intel architecture for Mac OS X plus improved Mac OS X System
  integration
* built-in check for updated versions

2 files changed, 26 insertions, 25 deletions

diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index eb5c24a5fa1..8b8693e14eb 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/06/15 20:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/30 15:38:53 ghen Exp $
 
-PKGNAME=		openoffice-bin-2.0.2
+PKGNAME=		openoffice-bin-${OO_RELEASE}
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/2.0.2/}
+MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		mrauch@NetBSD.org
@@ -15,6 +15,7 @@ RPM2PKG=		${PREFIX}/sbin/rpm2pkg
 RPM2PKGARGS=		-d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1
 
 OO_VER=			2.0
+OO_RELEASE=		2.0.3
 PLIST_SUBST+=		VER=${OO_VER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -47,33 +48,33 @@ ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .    if !exists(/emul/svr4/usr/lib/ld.so)
 PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
 .    endif
-DISTNAME=	OOo_2.0.2_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/packages
+DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/packages
 .  elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.2_LinuxIntel_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/RPMS
+DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/RPMS
 .  endif
 .endif
 
 .if ${OPSYS} == "DragonFly"
-DISTNAME=	OOo_2.0.2_LinuxIntel_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/RPMS
+DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/RPMS
 .endif
 
 .if ${OPSYS} == "Linux"
 .if ${ARCH} == "i386"
-DISTNAME=	OOo_2.0.2_LinuxIntel_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/RPMS
+DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/RPMS
 .endif
 .endif
 
 .if ${OPSYS} == "SunOS"
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	OOo_2.0.2_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/packages
+DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/packages
 .elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.2_Solarisx86_install
-WRKSRC=		${WRKDIR}/OOB680_m5_native_packed-1_en-US.9011/packages
+DISTNAME=	OOo_${OO_RELEASE}_Solarisx86_install
+WRKSRC=		${WRKDIR}/OOC680_m7_native_packed-1_en-US.9044/packages
 .endif
 .endif
 
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index 1d094991407..7376ddc115d 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2006/03/11 11:11:04 ghen Exp $
+$NetBSD: distinfo,v 1.6 2006/06/30 15:38:53 ghen Exp $
 
-SHA1 (OOo_2.0.2_LinuxIntel_install.tar.gz) = 4cdcdaa045a7d3442af6827ccd49302475bfd4a9
-RMD160 (OOo_2.0.2_LinuxIntel_install.tar.gz) = 2b569fba70caf6f2c0f0c6e0ab132c48209ea8b1
-Size (OOo_2.0.2_LinuxIntel_install.tar.gz) = 122488813 bytes
-SHA1 (OOo_2.0.1_SolarisSparc_install.tar.gz) = 71b6166a85bec78190e879f8ca6307d5e6e006cf
-RMD160 (OOo_2.0.1_SolarisSparc_install.tar.gz) = 3b07e7bc19739ee66d1e5ea152ea1cdaf90e6b2b
-Size (OOo_2.0.1_SolarisSparc_install.tar.gz) = 123916607 bytes
-SHA1 (OOo_2.0.1_Solarisx86_install.tar.gz) = db144d5f758e7bdd7dfa428df574ca351084697d
-RMD160 (OOo_2.0.1_Solarisx86_install.tar.gz) = 8c52cb1ea213c41c98c82b50618324f0434f7592
-Size (OOo_2.0.1_Solarisx86_install.tar.gz) = 114711157 bytes
+SHA1 (OOo_2.0.3_LinuxIntel_install.tar.gz) = 12ca59419a2f83fcd72346b5f895c82ac181dd7a
+RMD160 (OOo_2.0.3_LinuxIntel_install.tar.gz) = 72a1b9fca79cc7e482a0012e862471785dc49023
+Size (OOo_2.0.3_LinuxIntel_install.tar.gz) = 126023668 bytes
+SHA1 (OOo_2.0.3_SolarisSparc_install.tar.gz) = acc22208cf28dd043acbe1d524bafd78f8af53f8
+RMD160 (OOo_2.0.3_SolarisSparc_install.tar.gz) = 4c5b91774116ce78b1c17bbb06c468b84434f9c4
+Size (OOo_2.0.3_SolarisSparc_install.tar.gz) = 126879380 bytes
+SHA1 (OOo_2.0.3_Solarisx86_install.tar.gz) = a9150d6732b730a32f849ee37094f9e7d53c3853
+RMD160 (OOo_2.0.3_Solarisx86_install.tar.gz) = df66873abb26b465154b3614bed8bc54250a78ea
+Size (OOo_2.0.3_Solarisx86_install.tar.gz) = 117430957 bytes