diff options
author | ryoon <ryoon> | 2011-06-19 06:12:26 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2011-06-19 06:12:26 +0000 |
commit | 218a4ea1f869fd2821676ef8804d65ba80037496 (patch) | |
tree | 55d9f6572ce72a7bdefd817c02bf433b79198e1d /misc/libreoffice3-bin | |
parent | 8d8922f659a216f35711987a6ab88ea764ecfa5d (diff) | |
download | pkgsrc-218a4ea1f869fd2821676ef8804d65ba80037496.tar.gz |
Update to 3.3.3
* Bug fix
* Translation update
Diffstat (limited to 'misc/libreoffice3-bin')
-rw-r--r-- | misc/libreoffice3-bin/Makefile | 10 | ||||
-rw-r--r-- | misc/libreoffice3-bin/distinfo | 8 | ||||
-rw-r--r-- | misc/libreoffice3-bin/files/soffice-patch | 14 | ||||
-rw-r--r-- | misc/libreoffice3-bin/files/spadmin-patch | 10 |
4 files changed, 19 insertions, 23 deletions
diff --git a/misc/libreoffice3-bin/Makefile b/misc/libreoffice3-bin/Makefile index 637393e3a24..07d65909329 100644 --- a/misc/libreoffice3-bin/Makefile +++ b/misc/libreoffice3-bin/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2011/06/19 06:12:26 ryoon Exp $ DISTNAME= libreoffice3-bin # overridden below PKGNAME= libreoffice3-bin-${OO_RELEASE} CATEGORIES= misc -MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/3.3.2/rpm/x86/ +MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/3.3.3/rpm/x86/ MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.libreoffice.org/ @@ -21,7 +21,7 @@ CONFLICTS+= openoffice-linux-[0-9]* OO_VER= 3 OO_BASEVER= 3.3 -OO_RELEASE= 3.3.2 +OO_RELEASE= 3.3.3 PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} MESSAGE_SUBST+= VER=${OO_VER:Q} FILES_SUBST+= VER=${OO_VER:Q} @@ -53,8 +53,8 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" .if ${EMUL_PLATFORM} == "linux-i386" -DISTNAME= LibO_3.3.2_Linux_x86_install-rpm_en-US -WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}rc2_Linux_x86_install-rpm_en-US +DISTNAME= LibO_3.3.3_Linux_x86_install-rpm_en-US +WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}rc1_Linux_x86_install-rpm_en-US .elif ${EMUL_PLATFORM} == "solaris-i386" DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages diff --git a/misc/libreoffice3-bin/distinfo b/misc/libreoffice3-bin/distinfo index 0085ceb8411..440ae6b56c5 100644 --- a/misc/libreoffice3-bin/distinfo +++ b/misc/libreoffice3-bin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2011/06/19 06:12:26 ryoon Exp $ -SHA1 (LibO_3.3.2_Linux_x86_install-rpm_en-US.tar.gz) = f040e2f1b2039b1dfbf74209b831ebc17073277f -RMD160 (LibO_3.3.2_Linux_x86_install-rpm_en-US.tar.gz) = d7f7d356f373973311d4f60abc1a68f4ee764d2a -Size (LibO_3.3.2_Linux_x86_install-rpm_en-US.tar.gz) = 153885204 bytes +SHA1 (LibO_3.3.3_Linux_x86_install-rpm_en-US.tar.gz) = e24921f1d44ccc44deaaf0f1478050151501a391 +RMD160 (LibO_3.3.3_Linux_x86_install-rpm_en-US.tar.gz) = 2252a3d9175f782d7d22b349aa5cacfab3b150a3 +Size (LibO_3.3.3_Linux_x86_install-rpm_en-US.tar.gz) = 153739687 bytes diff --git a/misc/libreoffice3-bin/files/soffice-patch b/misc/libreoffice3-bin/files/soffice-patch index 022bddef485..195a35e050b 100644 --- a/misc/libreoffice3-bin/files/soffice-patch +++ b/misc/libreoffice3-bin/files/soffice-patch @@ -1,12 +1,10 @@ -# -# $NetBSD: soffice-patch,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $ -# +$NetBSD: soffice-patch,v 1.2 2011/06/19 06:12:27 ryoon Exp $ ---- soffice.orig 2009-01-18 23:49:18.000000000 +0100 -+++ soffice 2009-01-19 00:10:22.000000000 +0100 -@@ -73,6 +73,10 @@ - esac - done +--- /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/soffice.orig 2011-06-19 05:55:59.000000000 +0000 ++++ /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/soffice +@@ -129,6 +129,10 @@ done + "$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \ + ${sd_pagein_args} +# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3: +LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} diff --git a/misc/libreoffice3-bin/files/spadmin-patch b/misc/libreoffice3-bin/files/spadmin-patch index 9155eee0209..d37062af3f9 100644 --- a/misc/libreoffice3-bin/files/spadmin-patch +++ b/misc/libreoffice3-bin/files/spadmin-patch @@ -1,10 +1,8 @@ -# -# $NetBSD: spadmin-patch,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $ -# +$NetBSD: spadmin-patch,v 1.2 2011/06/19 06:12:27 ryoon Exp $ ---- spadmin.orig 2009-10-08 12:21:04.000000000 +0200 -+++ spadmin 2009-10-08 12:22:22.000000000 +0200 -@@ -56,6 +56,10 @@ +--- /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/spadmin.orig 2011-06-19 05:55:59.000000000 +0000 ++++ /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/spadmin +@@ -52,6 +52,10 @@ do esac done |