diff options
| author | bad <bad> | 2009-12-05 15:00:16 +0000 |
|---|---|---|
| committer | bad <bad> | 2009-12-05 15:00:16 +0000 |
| commit | e9d12f0126f743ed479805e9a9b99c9f3c56b5b8 (patch) | |
| tree | c1995157700f36469fbb9b6ea09fe89b58095a1b /misc | |
| parent | 35a476dc86fbef43c5ccb462fe60179f3ccd5498 (diff) | |
| download | pkgsrc-e9d12f0126f743ed479805e9a9b99c9f3c56b5b8.tar.gz | |
Update to OpenOffice.org 2.4.3.
Changes since 2.4.2:
- Fix for the default Text Document filter setting.
- New JRE 6u15 for OOo 2.4.3
- update libxml2
- word import crash fix
- fixes import of documents that export bullets in a correct odf fashion
(f.e. OOo 3.0)
- This cws aims to fix the X11 issue (OpenOffice.org not launching)
- Writer fixes for OOo 2.4.3
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 14 | ||||
| -rw-r--r-- | misc/openoffice2-bin/distinfo | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index de816211222..2cd91ff20e8 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2009/04/18 15:03:58 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2009/12/05 15:00:16 bad Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} @@ -18,7 +18,7 @@ CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* OO_VER= 2.4 -OO_RELEASE= 2.4.2 +OO_RELEASE= 2.4.3 PLIST_SUBST+= VER=${OO_VER:Q} MESSAGE_SUBST+= VER=${OO_VER:Q} FILES_SUBST+= VER=${OO_VER:Q} @@ -33,7 +33,7 @@ PLIST_SRC+= ${WRKDIR}/PLIST EMUL_PLATFORMS= linux-i386 #EMUL_PLATFORMS+= solaris-i386 solaris-sparc EMUL_MODULES.linux= compat freetype2 x11 -EMUL_REQD= suse>=7.3 +EMUL_REQD= suse>=10.0 EMUL_PKG_FMT= rpm RPMFILES= ${WRKSRC}/RPMS/*.rpm @@ -46,13 +46,17 @@ RUN_LDCONFIG= no .if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US +<<<<<<< Makefile +WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-2_en-US.9421 +======= WRKSRC= ${WRKDIR}/OOH680_m18_native_packed-1_en-US.9364 +>>>>>>> 1.40 .elif ${EMUL_PLATFORM} == "solaris-i386" DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US -WRKSRC= ${WRKDIR}/OOG680_m5_native_packed-1_en-US.9221/packages +WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages .elif ${EMUL_PLATFORM} == "solaris-sparc" DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US -WRKSRC= ${WRKDIR}/OOG680_m5_native_packed-1_en-US.9221/packages +WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages .endif .include "options.mk" diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo index 7f9d01b3e14..f3e8adc86d0 100644 --- a/misc/openoffice2-bin/distinfo +++ b/misc/openoffice2-bin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.16 2009/01/31 21:56:32 bad Exp $ +$NetBSD: distinfo,v 1.17 2009/12/05 15:00:16 bad Exp $ -SHA1 (OOo_2.4.2_LinuxIntel_install_en-US.tar.gz) = 74b087695eb3c14ab6874feeadce73cc621b6ce4 -RMD160 (OOo_2.4.2_LinuxIntel_install_en-US.tar.gz) = 1fe20d833cfadd6321ffa1b5c17385e3b6e7f404 -Size (OOo_2.4.2_LinuxIntel_install_en-US.tar.gz) = 154306851 bytes +SHA1 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 104df4d0f6bdc17eff57ba79f07b232f30d247fd +RMD160 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = aec3ea23b5f468f550eaa5194c7c32dc1a0c0052 +Size (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 154263012 bytes |