Update to OpenOffice 2.0.1, the first bugfix release on the 2.0 branch.

This release fixes a lot of bugs, and also introduces some new featues.
For a complete list of changes, see
  http://development.openoffice.org/releases/2.0.1.html

Ok by mrauch, wiz.

3 files changed, 24 insertions, 50 deletions

diff --git a/misc/openoffice2-bin/INSTALL b/misc/openoffice2-bin/INSTALL
index a591f12dd6f..dfb1fb35187 100644
--- a/misc/openoffice2-bin/INSTALL
+++ b/misc/openoffice2-bin/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2005/10/09 13:39:53 mrauch Exp $
+# $NetBSD: INSTALL,v 1.2 2006/01/04 15:29:41 ghen Exp $
 
 # This file contains the contents of the OOo rpm 
 # pre-install, post-install, pre-uninstall and post-uninstall scripts
@@ -18,21 +18,6 @@ POST-INSTALL)
 	    ${LN} -s $PRODUCTINSTALLLOCATION/program/filter/libfreetype.so.6 $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
 	  fi
 	fi
-
-	if [ -d $PRODUCTINSTALLLOCATION/program/python-core-2.3.4 ]
-	then
-	  ${LN} -s $PRODUCTINSTALLLOCATION/program/python-core-2.3.4 $PRODUCTINSTALLLOCATION/program/python-core >/dev/null 2>&1
-	fi
-
-	if [ -f $PRODUCTINSTALLLOCATION/program/python.sh ]
-	then
-	  ${LN} -s $PRODUCTINSTALLLOCATION/program/python.sh $PRODUCTINSTALLLOCATION/program/python >/dev/null 2>&1
-	fi
-
-	if [ -f $PRODUCTINSTALLLOCATION/program/python-core-2.3.4/bin/python ]
-	then
-	  chmod +x $PRODUCTINSTALLLOCATION/program/python-core-2.3.4/bin/python
-	fi
 	;;
 
 DEINSTALL)
@@ -40,16 +25,6 @@ DEINSTALL)
 	then
 	  ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
 	fi
-
-	if [ -h $PRODUCTINSTALLLOCATION/program/python-core ]
-	then
-	  ${RM} $PRODUCTINSTALLLOCATION/program/python-core >/dev/null 2>&1
-	fi
-
-	if [ -h $PRODUCTINSTALLLOCATION/program/python ]
-	then
-	  ${RM} $PRODUCTINSTALLLOCATION/program/python >/dev/null 2>&1
-	fi
 	;;
 
 esac
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index af5361467bf..7eff13cb9f7 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/04 15:29:41 ghen Exp $
 
-PKGNAME=		openoffice-bin-2.0.0
-PKGREVISION=		3
+PKGNAME=		openoffice-bin-2.0.1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/2.0.0/}
+MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/2.0.1/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		mrauch@NetBSD.org
@@ -51,28 +50,28 @@ DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 .    if !exists(/emul/svr4/usr/lib/ld.so)
 PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
 .    endif
-DISTNAME=	OOo_2.0.0_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
+DISTNAME=	OOo_2.0.1_SolarisSparc_install
+WRKSRC=		${WRKDIR}/OOA680_m1_native_packed-1_en-US.8990/packages
 .  elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.0_LinuxIntel_install
-WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-2_en-US.8968/RPMS
+DISTNAME=	OOo_2.0.1_LinuxIntel_install
+WRKSRC=		${WRKDIR}/OOA680_m1_native_packed-1_en-US.8990/RPMS
 .  endif
 .endif
 
 .if ${OPSYS} == "Linux"
 .if ${ARCH} == "i386"
-DISTNAME=	OOo_2.0.0_LinuxIntel_install
-WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-2_en-US.8968/RPMS
+DISTNAME=	OOo_2.0.1_LinuxIntel_install
+WRKSRC=		${WRKDIR}/OOA680_m1_native_packed-1_en-US.8990/RPMS
 .endif
 .endif
 
 .if ${OPSYS} == "SunOS"
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	OOo_2.0.0_SolarisSparc_install
-WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
+DISTNAME=	OOo_2.0.1_SolarisSparc_install
+WRKSRC=		${WRKDIR}/OOA680_m1_native_packed-1_en-US.8990/packages
 .elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.0_Solarisx86_install
-WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
+DISTNAME=	OOo_2.0.1_Solarisx86_install
+WRKSRC=		${WRKDIR}/OOA680_m1_native_packed-1_en-US.8990/packages
 .endif
 .endif
 
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index bf1dfaaf5fc..606ae4abced 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/10/20 14:05:39 mrauch Exp $
+$NetBSD: distinfo,v 1.4 2006/01/04 15:29:41 ghen Exp $
 
-SHA1 (OOo_2.0.0_LinuxIntel_install.tar.gz) = 78dfbf9ae5c69272801e8c50a35a579ba94564cc
-RMD160 (OOo_2.0.0_LinuxIntel_install.tar.gz) = c4caa92da88d22ebf1adc2ab11e8a7010dd2f4af
-Size (OOo_2.0.0_LinuxIntel_install.tar.gz) = 106447396 bytes
-SHA1 (OOo_2.0.0_SolarisSparc_install.tar.gz) = 712972cf04dd77cdcce77a52e7495512c662e3e8
-RMD160 (OOo_2.0.0_SolarisSparc_install.tar.gz) = 82dae9549a776a07ebb7d7311c8adec4643b82cd
-Size (OOo_2.0.0_SolarisSparc_install.tar.gz) = 109192805 bytes
-SHA1 (OOo_2.0.0_Solarisx86_install.tar.gz) = 393efc9ea951428827937bf0410073bbbec7ac7e
-RMD160 (OOo_2.0.0_Solarisx86_install.tar.gz) = 35292f81beda2d94cb74679c48ec9308651f4a12
-Size (OOo_2.0.0_Solarisx86_install.tar.gz) = 99784006 bytes
+SHA1 (OOo_2.0.1_LinuxIntel_install.tar.gz) = 9da64ab80ed2104afbf09eb289cee7b9291e12e3
+RMD160 (OOo_2.0.1_LinuxIntel_install.tar.gz) = 990fd38c7daae74fa9d0821291938be374c33732
+Size (OOo_2.0.1_LinuxIntel_install.tar.gz) = 109237237 bytes
+SHA1 (OOo_2.0.1_SolarisSparc_install.tar.gz) = 5d774fa086e200c898c0f1fea1b423303d95ead2
+RMD160 (OOo_2.0.1_SolarisSparc_install.tar.gz) = 685f28f25cdc4b5f2a9368e2df6e7a2ef65b4ab3
+Size (OOo_2.0.1_SolarisSparc_install.tar.gz) = 111330850 bytes
+SHA1 (OOo_2.0.1_Solarisx86_install.tar.gz) = 3e746156547bfadd549f5a75087cf89a5b15051b
+RMD160 (OOo_2.0.1_Solarisx86_install.tar.gz) = 625fee431cb9d6784c8e153244cf8011aa08a46b
+Size (OOo_2.0.1_Solarisx86_install.tar.gz) = 101749262 bytes