diff options
author | hira <hira@pkgsrc.org> | 2009-01-31 16:54:30 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2009-01-31 16:54:30 +0000 |
commit | 30f167e65e65b8e307f71030c4513e98b99bf5fe (patch) | |
tree | b9ff48ae23c7d6a0139418c021ae09dc994ca6b4 /misc | |
parent | 24e0a1435ae5878fb59488ac605dda457703cc2d (diff) | |
download | pkgsrc-30f167e65e65b8e307f71030c4513e98b99bf5fe.tar.gz |
Update to 3.0.1.
* Add spelling and grammar checker to Writer.
* Let OOo use own file locking mechanics to lock alien formats as well.
* Bug fixes.
Please see Release Notes for more detail:
http://development.openoffice.org/releases/3.0.1.html
Diffstat (limited to 'misc')
-rw-r--r-- | misc/openoffice3/Makefile | 9 | ||||
-rw-r--r-- | misc/openoffice3/distinfo | 35 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-bv | 33 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-cr | 22 |
4 files changed, 34 insertions, 65 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index ec8f7f55e39..475e8de253e 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2009/01/20 10:19:30 hira Exp $ +# $NetBSD: Makefile,v 1.22 2009/01/31 16:54:30 hira Exp $ # -OO_VER= 3.0.0 -PKGREVISION= 8 -OO_TAG= OOO300_m9 +OO_VER= 3.0.1 +OO_TAG= OOO300_m15 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} CATEGORIES= misc @@ -171,7 +170,7 @@ do-install: done; \ done cd ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/basis-link/program && \ - chmod ${SHAREMODE} hid.lst testtoolrc + chmod ${SHAREMODE} gengalrc hid.lst testtoolrc for f in ${OO_PROGRAMS}; do \ ln -sf ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ ${DESTDIR}${PREFIX}/bin/$$f; \ diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index bb5c32f766e..956bbaad479 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,20 +1,20 @@ -$NetBSD: distinfo,v 1.17 2009/01/20 09:52:12 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/01/31 16:54:30 hira Exp $ -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d -Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542 -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d -Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b -Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97 -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13 -Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = b8af1787bd4651c808d298e81ee797bf2b7ebdcd -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 10c8b58ade00cf22fdb699f38d60abee8e150436 -Size (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 44882699 bytes +SHA1 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = d84518159538ef736271177b7ebe4697fc4b811d +RMD160 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = c6859a376c55cd453be214dbfa2d56f1b845a32b +Size (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = 6595398 bytes +SHA1 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 2da6b2cf0b75873477f22cc9d69a4f0c8b43b435 +RMD160 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 9c4f18779a03cdabb0204d8eb1b661b4d9cc1369 +Size (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 182573274 bytes +SHA1 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = c695982d166422a838560ef7b134a5665bc61198 +RMD160 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = e89c7594f642147a95e85612d5646bc3edc869db +Size (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = 13941829 bytes +SHA1 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 13f1bf0989a09c52c57dbc1d6cf1feaec369a085 +RMD160 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = a02e8c06c67ac7b2833afa4a54993d81674e8b9b +Size (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 86008240 bytes +SHA1 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 8c73821b542c9c96b071550fe0e3e813e21a1246 +RMD160 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 35f1822f3e3aa2f6af0c268dd51534568473e636 +Size (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 45625279 bytes SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d SHA1 (patch-ad) = 9513865551837a69202f4595232c36a656f200ca SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 @@ -44,7 +44,7 @@ SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca -SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 +SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 @@ -55,7 +55,6 @@ SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d -SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd SHA1 (patch-cs) = 3f4f360870ad22b1fb88a2ca9f7907e03010ac79 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 diff --git a/misc/openoffice3/patches/patch-bv b/misc/openoffice3/patches/patch-bv index 2b6b8abd98d..02ffcc6158e 100644 --- a/misc/openoffice3/patches/patch-bv +++ b/misc/openoffice3/patches/patch-bv @@ -1,29 +1,22 @@ -$NetBSD: patch-bv,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-bv,v 1.2 2009/01/31 16:54:31 hira Exp $ ---- setup_native/scripts/linuxpatchscript.sh.orig 2007-03-04 21:42:59.000000000 +0900 -+++ setup_native/scripts/linuxpatchscript.sh 2007-03-04 21:43:36.000000000 +0900 -@@ -25,7 +25,7 @@ +--- setup_native/scripts/linuxpatchscript.sh.orig 2009-01-31 21:04:57.000000000 +0900 ++++ setup_native/scripts/linuxpatchscript.sh 2009-01-31 21:06:57.000000000 +0900 +@@ -26,7 +26,7 @@ echo - read -p "Patching the installation in ${PRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover + read -p "Patching the installation in ${FULLPRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover echo -[ "$reply" == "y" ] || exit 1 +[ "$reply" = "y" ] || exit 1 echo echo "About to update the following packages ..." -@@ -53,13 +53,13 @@ - # Check, that $RPMLIST does not contain online update rpm (then it is already installed) - ONLINEPDATEINSTALLED=`grep onlineupdate ${RPMLIST}` +@@ -50,7 +50,7 @@ + # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed) + KDERPMINSTALLED=`grep kde-integration ${RPMLIST}` -- if [ "x$ONLINEPDATEINSTALLED" == "x" ]; then -+ if [ "x$ONLINEPDATEINSTALLED" = "x" ]; then - # Ask user, if online update shall be installed - echo - read -p "Do you want to install the new online update feature (y/n) ? " -n 1 reply leftover - echo - -- if [ "$reply" == "y" ]; then -+ if [ "$reply" = "y" ]; then - # Install the online update rpm - rpm --install -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $ONLINEUPDATERPM - fi +- if [ "x$KDERPMINSTALLED" == "x" ]; then ++ if [ "x$KDERPMINSTALLED" = "x" ]; then + # Install the kde integration rpm + RPMLIST="$RPMLIST $KDERPM" + fi diff --git a/misc/openoffice3/patches/patch-cr b/misc/openoffice3/patches/patch-cr deleted file mode 100644 index b3d2c303dbe..00000000000 --- a/misc/openoffice3/patches/patch-cr +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cr,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ - ---- setup_native/scripts/linuxpatchscript.sh.orig 2008-04-07 17:55:52.000000000 +0900 -+++ setup_native/scripts/linuxpatchscript.sh 2008-04-07 18:23:25.000000000 +0900 -@@ -49,7 +49,7 @@ - # Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed) - SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}` - -- if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then -+ if [ "x$SEARCHTOOLBARINSTALLED" = "x" ]; then - # Install the search toolbar rpm - RPMLIST="$RPMLIST $SEARCHTOOLBARRPM" - fi -@@ -62,7 +62,7 @@ - # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed) - KDERPMINSTALLED=`grep kde-integration ${RPMLIST}` - -- if [ "x$KDERPMINSTALLED" == "x" ]; then -+ if [ "x$KDERPMINSTALLED" = "x" ]; then - # Install the kde integration rpm - RPMLIST="$RPMLIST $KDERPM" - fi |