diff options
author | bad <bad> | 2010-03-02 22:57:03 +0000 |
---|---|---|
committer | bad <bad> | 2010-03-02 22:57:03 +0000 |
commit | 24770952fb5c499ae58a4ba2af0be42b292459dc (patch) | |
tree | ca08718f27eaf11dc0702afd1a0aedc8217009ff /misc/openoffice3-bin | |
parent | c62ff51ee32dd38714b36298209b93f9f6060d94 (diff) | |
download | pkgsrc-24770952fb5c499ae58a4ba2af0be42b292459dc.tar.gz |
Update openoffice3-bin to 3.2.0.
Changes since 3.1.2 are:
- security fixes
- improved MS Office compatibility
- faster startup times
For a more detailed list read http://www.openoffice.org/dev_docs/features/3.2/
Diffstat (limited to 'misc/openoffice3-bin')
-rw-r--r-- | misc/openoffice3-bin/DEINSTALL | 4 | ||||
-rw-r--r-- | misc/openoffice3-bin/INSTALL | 4 | ||||
-rw-r--r-- | misc/openoffice3-bin/Makefile | 31 | ||||
-rw-r--r-- | misc/openoffice3-bin/PLIST.dirs | 5 | ||||
-rw-r--r-- | misc/openoffice3-bin/distinfo | 8 | ||||
-rw-r--r-- | misc/openoffice3-bin/files/soffice | 4 |
6 files changed, 31 insertions, 25 deletions
diff --git a/misc/openoffice3-bin/DEINSTALL b/misc/openoffice3-bin/DEINSTALL index a52ed5f56a3..8487fb6980e 100644 --- a/misc/openoffice3-bin/DEINSTALL +++ b/misc/openoffice3-bin/DEINSTALL @@ -1,9 +1,9 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ +# $NetBSD: DEINSTALL,v 1.2 2010/03/02 22:57:03 bad Exp $ # # This file contains the contents of the OOo rpm pre-uninstall, # post-uninstall scripts. -PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@ +PRODUCTINSTALLLOCATION=${PKG_PREFIX}/opt/openoffice.org@VER@ case ${STAGE} in DEINSTALL) diff --git a/misc/openoffice3-bin/INSTALL b/misc/openoffice3-bin/INSTALL index e580b23e2fa..8e807bbf7af 100644 --- a/misc/openoffice3-bin/INSTALL +++ b/misc/openoffice3-bin/INSTALL @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ +# $NetBSD: INSTALL,v 1.2 2010/03/02 22:57:03 bad Exp $ # # This file contains the contents of the OOo rpm pre-install, post-install # scripts. -PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@ +PRODUCTINSTALLLOCATION=${PKG_PREFIX}/opt/openoffice.org@VER@ case ${STAGE} in POST-INSTALL) diff --git a/misc/openoffice3-bin/Makefile b/misc/openoffice3-bin/Makefile index 8a3e0c1f1ac..e328be93aff 100644 --- a/misc/openoffice3-bin/Makefile +++ b/misc/openoffice3-bin/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/12/10 21:33:39 abs Exp $ +# $NetBSD: Makefile,v 1.5 2010/03/02 22:57:03 bad Exp $ DISTNAME= openoffice3-bin # overridden below PKGNAME= openoffice3-bin-${OO_RELEASE} -PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} @@ -19,9 +18,9 @@ CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* OO_VER= 3 -OO_BASEVER= 3.1 -OO_RELEASE= 3.1.1 -PLIST_SUBST+= VER=${OO_VER:Q} +OO_BASEVER= 3.2 +OO_RELEASE= 3.2.0 +PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} MESSAGE_SUBST+= VER=${OO_VER:Q} FILES_SUBST+= VER=${OO_VER:Q} @@ -31,6 +30,7 @@ BUILD_DIRS= # empty PLIST_SRC= ${PKGDIR}/PLIST.proglinks PLIST_SRC+= ${WRKDIR}/PLIST +PLIST_SRC+= ${PKGDIR}/PLIST.dirs EMUL_PLATFORMS= linux-i386 #EMUL_PLATFORMS+= solaris-i386 solaris-sparc @@ -55,13 +55,13 @@ PKG_DESTDIR_SUPPORT= user-destdir .if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420 +WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483 .elif ${EMUL_PLATFORM} == "solaris-i386" DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US -WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages +WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages .elif ${EMUL_PLATFORM} == "solaris-sparc" DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US -WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages +WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages .endif .include "options.mk" @@ -69,11 +69,12 @@ WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages INSTALLATION_DIRS= bin do-install: - ${PATCH} -d ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch - ${RM} -f ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program/soffice.orig - ${PATCH} -d ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch - ${RM} -f ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program/spadmin.orig - uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST + ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch + ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/soffice.orig + ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch + ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/spadmin.orig + uniq ${RPM2PKG_PLIST} | \ + sed -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST .if defined(PKG_JVM) && !empty(PKG_JVM) ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ @@ -81,10 +82,10 @@ do-install: < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice .else - ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice + ${LN} -sf ../opt/openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice .endif .for i in scalc sdraw simpress smath spadmin swriter - ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} + ${LN} -sf ../opt/openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/misc/openoffice3-bin/PLIST.dirs b/misc/openoffice3-bin/PLIST.dirs new file mode 100644 index 00000000000..726f70f6512 --- /dev/null +++ b/misc/openoffice3-bin/PLIST.dirs @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.dirs,v 1.1 2010/03/02 22:57:03 bad Exp $ +@pkgdir opt/openoffice.org/basis${BASEVER} +@pkgdir opt/openoffice.org +@pkgdir opt/openoffice.org${VER} +@pkgdir opt diff --git a/misc/openoffice3-bin/distinfo b/misc/openoffice3-bin/distinfo index 94d0fcb3b55..d7a267bcde7 100644 --- a/misc/openoffice3-bin/distinfo +++ b/misc/openoffice3-bin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2009/12/02 22:21:16 bad Exp $ +$NetBSD: distinfo,v 1.3 2010/03/02 22:57:03 bad Exp $ -SHA1 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 7adc85e257b0034ce3ac340e483da8f903ad7468 -RMD160 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = e11af9b5499becf468a4bfec432eb98a910dc7ca -Size (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 163290562 bytes +SHA1 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 8edcdf677aeee84eea2cecf896bcdd30bcd98a45 +RMD160 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 0dc745ecbba13cb5a58e1ad322008c8b309b588f +Size (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 154346578 bytes diff --git a/misc/openoffice3-bin/files/soffice b/misc/openoffice3-bin/files/soffice index 7cd6c4d8ae8..aad31dade27 100644 --- a/misc/openoffice3-bin/files/soffice +++ b/misc/openoffice3-bin/files/soffice @@ -1,8 +1,8 @@ #!/bin/sh # -# $NetBSD: soffice,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ +# $NetBSD: soffice,v 1.2 2010/03/02 22:57:03 bad Exp $ # -SOINST=@@PREFIX@@/openoffice.org@@OO_VER@@ +SOINST=@@PREFIX@@/opt/openoffice.org@@OO_VER@@ # make sure we can find `whoami` on solaris PATH=${PATH}:/usr/ucb |