From cf2e38a1876d8c3e9caf5033a3d012c873152fc5 Mon Sep 17 00:00:00 2001 From: mrauch Date: Mon, 3 Oct 2005 16:03:19 +0000 Subject: Update to version 1.1.5. This version contains read support for the new OpenDocument format OASIS which will be default in OOo 2.0. Additionally some minor bugs have been fixed. A complete list can be found at http://download.openoffice.org/1.1.5/release_notes_1.1.5.html. --- misc/openoffice-bin/Makefile | 17 ++++++----------- misc/openoffice-bin/PLIST.LinuxIntel | 10 +++++++++- misc/openoffice-bin/PLIST.SolarisIntel | 24 +++++++++++++----------- misc/openoffice-bin/PLIST.SolarisSparc | 24 +++++++++++++----------- misc/openoffice-bin/distinfo | 23 ++++++++++------------- misc/openoffice-bin/files/install | 4 ++-- 6 files changed, 53 insertions(+), 49 deletions(-) (limited to 'misc/openoffice-bin') diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index 43afd798fbb..e8bfc054c70 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -1,15 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2005/09/11 10:49:35 mrauch Exp $ +# $NetBSD: Makefile,v 1.11 2005/10/03 16:09:43 mrauch Exp $ PKGNAME= openoffice-bin-${OO_VER} -PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= openoffice-linux-112-services.rdb.bz2 -DISTFILES+= libsot645li.so SITES_openoffice-linux-112-services.rdb.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\ ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/ -SITES_libsot645li.so= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}secpatch/} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ openoffice-linux-112-services.rdb.bz2 @@ -17,7 +14,7 @@ MAINTAINER= mrauch@NetBSD.org HOMEPAGE= http://www.openoffice.org/ COMMENT= Integrated office productivity suite (binary pkg) -OO_VER= 1.1.4 +OO_VER= 1.1.5 PLIST_SUBST+= VER=${OO_VER} MESSAGE_SUBST+= VER=${OO_VER} @@ -60,8 +57,8 @@ DISTNAME= OOo_${OO_VER}_LinuxIntel_install DISTNAME= OOo_${OO_VER}_SolarisSparc_install WRKSRC= ${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install . elif ${MACHINE_ARCH} == "i386" -DISTNAME= OOo_${OO_VER}_SolarisIntel_install -WRKSRC= ${WRKDIR}/OOo_${OO_VER}_Solaris_Intel_install +DISTNAME= OOo_${OO_VER}_Solarisx86_install +WRKSRC= ${WRKDIR}/OOo_${OO_VER}_Solaris_x86_install . endif .endif @@ -82,14 +79,12 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/openoffice-linux-112-services.rdb \ ${PREFIX}/OpenOffice.org${OO_VER}/program/services.rdb cd ${WRKSRC}; ${SETENV} TEMP=${TEMP} ./install --prefix=${PREFIX} - ${INSTALL_LIB} ${DISTDIR}/libsot645li.so \ - ${PREFIX}/OpenOffice.org${OO_VER}/program/libsot645li.so ${RM} -f ${PREFIX}/bin/soffice.orig ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice ${CHMOD} +x ${PREFIX}/bin/soffice .for i in scalc sdraw simpress swriter - ${LN} -sf ${PREFIX}/OpenOffice.org${OO_VER}/program/$i ${PREFIX}/bin/$i + ${LN} -sf ${PREFIX}/OpenOffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i} .endfor # everything specific to your OS/Arch goes into its own Makefile @@ -101,7 +96,7 @@ do-install: .if defined(DISTNAME) . if ${DISTNAME} == "OOo_${OO_VER}_SolarisSparc_install" PLIST_SRC= ${PKGDIR}/PLIST.SolarisSparc -. elif ${DISTNAME} == "OOo_${OO_VER}_SolarisIntel_install" +. elif ${DISTNAME} == "OOo_${OO_VER}_Solarisx86_install" PLIST_SRC= ${PKGDIR}/PLIST.SolarisIntel . elif ${DISTNAME} == "OOo_${OO_VER}_LinuxIntel_install" PLIST_SRC= ${PKGDIR}/PLIST.LinuxIntel diff --git a/misc/openoffice-bin/PLIST.LinuxIntel b/misc/openoffice-bin/PLIST.LinuxIntel index c32d554eb8f..816088d9f2a 100644 --- a/misc/openoffice-bin/PLIST.LinuxIntel +++ b/misc/openoffice-bin/PLIST.LinuxIntel @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.LinuxIntel,v 1.2 2005/02/27 11:10:09 wiz Exp $ +@comment $NetBSD: PLIST.LinuxIntel,v 1.3 2005/10/03 16:09:43 mrauch Exp $ OpenOffice.org${VER}/LICENSE OpenOffice.org${VER}/LICENSE.html OpenOffice.org${VER}/README @@ -320,6 +320,9 @@ OpenOffice.org${VER}/program/libpl645li.so OpenOffice.org${VER}/program/libplacewareli.so OpenOffice.org${VER}/program/libplc4.so OpenOffice.org${VER}/program/libplds4.so +OpenOffice.org${VER}/program/libportaudio.so +OpenOffice.org${VER}/program/libportaudio.so.0 +OpenOffice.org${VER}/program/libportaudio.so.0.0.18 OpenOffice.org${VER}/program/libpreload645li.so OpenOffice.org${VER}/program/libprldap50.so OpenOffice.org${VER}/program/libproxyset.so @@ -352,6 +355,9 @@ OpenOffice.org${VER}/program/libsdbc2.so OpenOffice.org${VER}/program/libset645li.so OpenOffice.org${VER}/program/libsfx645li.so OpenOffice.org${VER}/program/libsm645li.so +OpenOffice.org${VER}/program/libsndfile.so +OpenOffice.org${VER}/program/libsndfile.so.1 +OpenOffice.org${VER}/program/libsndfile.so.1.0.9 OpenOffice.org${VER}/program/libso645li.so OpenOffice.org${VER}/program/libsot645li.so OpenOffice.org${VER}/program/libspa645li.so @@ -396,6 +402,7 @@ OpenOffice.org${VER}/program/libxmlfa645li.so OpenOffice.org${VER}/program/libxmlfd645li.so OpenOffice.org${VER}/program/libxmx645li.so OpenOffice.org${VER}/program/libxo645li.so +OpenOffice.org${VER}/program/libxod645li.so OpenOffice.org${VER}/program/libxpcom.so OpenOffice.org${VER}/program/libxsltdlg645li.so OpenOffice.org${VER}/program/libxsltfilter645li.so @@ -419,6 +426,7 @@ OpenOffice.org${VER}/program/pangox.aliases OpenOffice.org${VER}/program/pkgchk OpenOffice.org${VER}/program/pkgchk.bin OpenOffice.org${VER}/program/pluginapp.bin +OpenOffice.org${VER}/program/pp5.dat OpenOffice.org${VER}/program/proxyfac.uno.so OpenOffice.org${VER}/program/python OpenOffice.org${VER}/program/python-core diff --git a/misc/openoffice-bin/PLIST.SolarisIntel b/misc/openoffice-bin/PLIST.SolarisIntel index 9eb23b22c10..6e3638abafe 100644 --- a/misc/openoffice-bin/PLIST.SolarisIntel +++ b/misc/openoffice-bin/PLIST.SolarisIntel @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.SolarisIntel,v 1.2 2005/02/27 11:10:09 wiz Exp $ +@comment $NetBSD: PLIST.SolarisIntel,v 1.3 2005/10/03 16:09:43 mrauch Exp $ OpenOffice.org${VER}/LICENSE OpenOffice.org${VER}/LICENSE.html OpenOffice.org${VER}/README @@ -392,6 +392,7 @@ OpenOffice.org${VER}/program/libxmlfa645ss.so OpenOffice.org${VER}/program/libxmlfd645ss.so OpenOffice.org${VER}/program/libxmx645ss.so OpenOffice.org${VER}/program/libxo645ss.so +OpenOffice.org${VER}/program/libxod645ss.so OpenOffice.org${VER}/program/libxpcom.so OpenOffice.org${VER}/program/libxsltdlg645ss.so OpenOffice.org${VER}/program/libxsltfilter645ss.so @@ -415,6 +416,7 @@ OpenOffice.org${VER}/program/pangox.aliases OpenOffice.org${VER}/program/pkgchk OpenOffice.org${VER}/program/pkgchk.bin OpenOffice.org${VER}/program/pluginapp.bin +OpenOffice.org${VER}/program/pp5.dat OpenOffice.org${VER}/program/proxyfac.uno.so OpenOffice.org${VER}/program/python OpenOffice.org${VER}/program/python-core @@ -1371,10 +1373,10 @@ OpenOffice.org${VER}/share/basic/WebWizard/Language.xba OpenOffice.org${VER}/share/basic/WebWizard/WebWzrd.xdl OpenOffice.org${VER}/share/basic/WebWizard/dialog.xlb OpenOffice.org${VER}/share/basic/WebWizard/script.xlb -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_agenda -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_fax -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_letter -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_memo +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_agenda +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_fax +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_letter +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_memo OpenOffice.org${VER}/share/cde/dtappintegrate OpenOffice.org${VER}/share/cde/dtint OpenOffice.org${VER}/share/cde/icons/002_text_document.l.xpm @@ -1482,13 +1484,13 @@ OpenOffice.org${VER}/share/cde/icons/ooo_writer.m.xpm OpenOffice.org${VER}/share/cde/icons/ooo_writer.s.xpm OpenOffice.org${VER}/share/cde/icons/ooo_writer.t.xpm OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org on the Web -OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.4_printeradmin -OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.4_setup +OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.5_printeradmin +OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.5_setup OpenOffice.org${VER}/share/cde/information and setup/README.html -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_labels -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_masterdoc -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_mathdoc -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_vcards +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_labels +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_masterdoc +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_mathdoc +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_vcards OpenOffice.org${VER}/share/cde/types/af.UTF-8/calc.dt OpenOffice.org${VER}/share/cde/types/af.UTF-8/calc.fp OpenOffice.org${VER}/share/cde/types/af.UTF-8/draw.dt diff --git a/misc/openoffice-bin/PLIST.SolarisSparc b/misc/openoffice-bin/PLIST.SolarisSparc index 7202acfbb91..13e413f4a6f 100644 --- a/misc/openoffice-bin/PLIST.SolarisSparc +++ b/misc/openoffice-bin/PLIST.SolarisSparc @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.SolarisSparc,v 1.2 2005/02/27 11:10:09 wiz Exp $ +@comment $NetBSD: PLIST.SolarisSparc,v 1.3 2005/10/03 16:09:43 mrauch Exp $ OpenOffice.org${VER}/LICENSE OpenOffice.org${VER}/LICENSE.html OpenOffice.org${VER}/README @@ -392,6 +392,7 @@ OpenOffice.org${VER}/program/libxmlfa645ss.so OpenOffice.org${VER}/program/libxmlfd645ss.so OpenOffice.org${VER}/program/libxmx645ss.so OpenOffice.org${VER}/program/libxo645ss.so +OpenOffice.org${VER}/program/libxod645ss.so OpenOffice.org${VER}/program/libxpcom.so OpenOffice.org${VER}/program/libxsltdlg645ss.so OpenOffice.org${VER}/program/libxsltfilter645ss.so @@ -415,6 +416,7 @@ OpenOffice.org${VER}/program/pangox.aliases OpenOffice.org${VER}/program/pkgchk OpenOffice.org${VER}/program/pkgchk.bin OpenOffice.org${VER}/program/pluginapp.bin +OpenOffice.org${VER}/program/pp5.dat OpenOffice.org${VER}/program/proxyfac.uno.so OpenOffice.org${VER}/program/python OpenOffice.org${VER}/program/python-core @@ -1371,10 +1373,10 @@ OpenOffice.org${VER}/share/basic/WebWizard/Language.xba OpenOffice.org${VER}/share/basic/WebWizard/WebWzrd.xdl OpenOffice.org${VER}/share/basic/WebWizard/dialog.xlb OpenOffice.org${VER}/share/basic/WebWizard/script.xlb -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_agenda -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_fax -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_letter -OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.4_memo +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_agenda +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_fax +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_letter +OpenOffice.org${VER}/share/cde/auto pilots/OpenOffice.org_1.1.5_memo OpenOffice.org${VER}/share/cde/dtappintegrate OpenOffice.org${VER}/share/cde/dtint OpenOffice.org${VER}/share/cde/icons/002_text_document.l.xpm @@ -1482,13 +1484,13 @@ OpenOffice.org${VER}/share/cde/icons/ooo_writer.m.xpm OpenOffice.org${VER}/share/cde/icons/ooo_writer.s.xpm OpenOffice.org${VER}/share/cde/icons/ooo_writer.t.xpm OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org on the Web -OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.4_printeradmin -OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.4_setup +OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.5_printeradmin +OpenOffice.org${VER}/share/cde/information and setup/OpenOffice.org_1.1.5_setup OpenOffice.org${VER}/share/cde/information and setup/README.html -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_labels -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_masterdoc -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_mathdoc -OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.4_vcards +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_labels +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_masterdoc +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_mathdoc +OpenOffice.org${VER}/share/cde/other/OpenOffice.org_1.1.5_vcards OpenOffice.org${VER}/share/cde/types/af.UTF-8/calc.dt OpenOffice.org${VER}/share/cde/types/af.UTF-8/calc.fp OpenOffice.org${VER}/share/cde/types/af.UTF-8/draw.dt diff --git a/misc/openoffice-bin/distinfo b/misc/openoffice-bin/distinfo index d1bae6d5a96..8639315d985 100644 --- a/misc/openoffice-bin/distinfo +++ b/misc/openoffice-bin/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.4 2005/04/14 21:06:44 mrauch Exp $ +$NetBSD: distinfo,v 1.5 2005/10/03 16:09:43 mrauch Exp $ -SHA1 (OOo_1.1.4_LinuxIntel_install.tar.gz) = 769eada389dee1829a327ab791ec80d48da10422 -RMD160 (OOo_1.1.4_LinuxIntel_install.tar.gz) = 6188beaa49d0998e011b24344333076b6f27e40a -Size (OOo_1.1.4_LinuxIntel_install.tar.gz) = 80144225 bytes -SHA1 (OOo_1.1.4_SolarisIntel_install.tar.gz) = d0aea193beca995a6687deea3e14405667a5e1b2 -RMD160 (OOo_1.1.4_SolarisIntel_install.tar.gz) = a92c3ac523de7e89c7ebcc909226764ac2f1d8fe -Size (OOo_1.1.4_SolarisIntel_install.tar.gz) = 82084451 bytes -SHA1 (OOo_1.1.4_SolarisSparc_install.tar.gz) = b4b5d309fa97a96e6c1623bebe202647adad4383 -RMD160 (OOo_1.1.4_SolarisSparc_install.tar.gz) = ffa52c76bc1ea01639baf1192bbe7c0fbf86acf8 -Size (OOo_1.1.4_SolarisSparc_install.tar.gz) = 90876883 bytes +SHA1 (OOo_1.1.5_LinuxIntel_install.tar.gz) = 2939217880d0ea63e760c89bfc456d27106c91ba +RMD160 (OOo_1.1.5_LinuxIntel_install.tar.gz) = 0d720e850abf2a881f08edf0fc7da8183a9dc464 +Size (OOo_1.1.5_LinuxIntel_install.tar.gz) = 80457121 bytes +SHA1 (OOo_1.1.5_SolarisSparc_install.tar.gz) = e50d1dbf71a6edb4b240c3de4a76736b92152cf6 +RMD160 (OOo_1.1.5_SolarisSparc_install.tar.gz) = 34546a7c4d368ef9c9c46bb5cfffc600219fee6f +Size (OOo_1.1.5_SolarisSparc_install.tar.gz) = 91109715 bytes +SHA1 (OOo_1.1.5_Solarisx86_install.tar.gz) = 9986c1ee9e21998e7a95a050005e955c9ad76760 +RMD160 (OOo_1.1.5_Solarisx86_install.tar.gz) = ca06beaccc261f994c4c6cc135b8b20f9066ff43 +Size (OOo_1.1.5_Solarisx86_install.tar.gz) = 82300139 bytes SHA1 (openoffice-linux-112-services.rdb.bz2) = c2a538eff450a50221baa212226807d0efd6b12e RMD160 (openoffice-linux-112-services.rdb.bz2) = 857b4ab16e9af2f58264953fdfde2e4bd1972d7b Size (openoffice-linux-112-services.rdb.bz2) = 61919 bytes -SHA1 (libsot645li.so) = 6c6b9995482da055c149c6c9870cc19efbf4bfc1 -RMD160 (libsot645li.so) = 3890f84fcdad6a245d1cdfaf980b884e5d0b8f90 -Size (libsot645li.so) = 305472 bytes diff --git a/misc/openoffice-bin/files/install b/misc/openoffice-bin/files/install index 9ce93e17df8..434f290807c 100755 --- a/misc/openoffice-bin/files/install +++ b/misc/openoffice-bin/files/install @@ -4,8 +4,8 @@ cd `dirname $0` # Set the Defaults Here -oo_version="OpenOffice.org 1.1.4" -oo_home=OpenOffice.org1.1.4 +oo_version="OpenOffice.org 1.1.5" +oo_home=OpenOffice.org1.1.5 oo_default_prefix=/usr/local oo_default_netflg=-net oo_default_interact=no -- cgit v1.2.3