Update to 4.2.4.2

* Make java option disable for non-NetBSD and non-SunOS
  (DragonFly bootstrap jdk does not work for amd64/3.6.2)

Changelog:
4.2.4rc1
    bnc#821208 DOC import: fix unwanted char background in numbering char style [Miklos Vajna]
    bnc#821567 import PPTX background images with table-name. [Muthu Subramanian]
    bnc#828390 bullet sizes set wrong. [Muthu Subramanian]
    bnc#865381 DOCX import: table cell btLr text direction fixes [Miklos Vajna]
    coverity#1130423 crash with "New style from selection" with List [Caolán McNamara]
    coverity#705966 dereference before null check [Caolán McNamara]
    coverity#705969 dereference before null check [Caolán McNamara]
    coverity#707971 uninitialized scalar field [Caolán McNamara]
    coverity#708388 uninitialized scalar field [Caolán McNamara]
    coverity#736084 missing break in switch [Caolán McNamara]
    collabora#1000025 import casemaps from pptx. [Muthu Subramanian]
    collabora#1000044 DOC import: fProtEnabled means document is not totally read-only [Miklos Vajna]
    fdo#38411 handle .doc cropping also inside groups [Luboš Luňák]
    fdo#38414 workaround for rounding errors when handling merged cells [Luboš Luňák]
    fdo#47355 partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22 [Bjoern Michaelsen]
    fdo#50672 escape underscores in menus for unity [Samuel Mehrbrodt]
    fdo#58307 export sheet tab colors to xlsx. [Kohei Yoshida]
    fdo#60722 RTF import: 3 drawing-object fixes: [Miklos Vajna]
    fdo#62155 don't crash if we can't create an instance of a calc addin. [Michael Meeks]
    fdo#63228 printers list does not increase height with Print Dialog [Caolán McNamara]
    fdo#63786 fix PDF export of cropped SVG [Michael Stahl]
    fdo#67011 KDE4: prevent blocking in Display::Yield [Jan-Marek Glogowski]
    fdo#69157 apply object-in front selection on mouseUp [Lennard Wasserthal]
    fdo#69289 RTF import: handle cells with zero width [Miklos Vajna]
    fdo#70666 fix Graphite ligature replacement at line breaks [László Németh]
    fdo#71491 adjust reference during undo of drag-n-drop of cell range. [Kohei Yoshida]
    fdo#71729 fill the range edit boxes after the table is fully initialized. [Kohei Yoshida]
    fdo#71961 write (no)wrap of text only for custom shapes to .pptx [Luboš Luňák]
    fdo#73466 SwTxtSizeInfo / SwTxtInputFldPortion: invalid string access [Miklos Vajna]
    fdo#73544 related: update catalan linguistic components [Joan Montane, Caolán McNamara]
    fdo#73588 fix default alignment in RTL mode. [Hannah Lyhne]
    fdo#73627 explictly export font properties. [Muthu Subramanian]
    fdo#73936 make FormFieldDropDowns a real fieldportion [Caolán McNamara]
    fdo#74087 inspect if a mis-spelled word is at cursor position... [Kohei Yoshida]
    fdo#74302 adapt to OUString changes and set length exactly. [Matúš Kukan]
    fdo#74322 handle moving of named ranges correctly. [Kohei Yoshida]
    fdo#74823 RTF import: work around wrong table column width on invalid input [Miklos Vajna]
    fdo#74875 asterisk at the beginning of Paragraph without "Nowiki" [Julien Nabet]
    fdo#74979 remove OOo1.0 file formats from Save As. [Michael Stahl, Bryan Quigley]
    fdo#74981 cutting nothing should do nothing, should fix field dupes [Bjoern Michaelsen]
    fdo#75260 apply the same fix from writer table to character bordering. [Kohei Yoshida]
    fdo#75307 discard invalid user data [Caolán McNamara]
    fdo#75308 asterisk at the beginning of Paragraph without "Nowiki" [Julien Nabet]
    fdo#75328 do DiscoveryService socket setup off the main thread. [Andrzej Hunt]
    fdo#75376 configure: disable LTO by default for MSVC too [Michael Stahl]
    fdo#75622 avoid repeated table layouting [Luboš Luňák]
    fdo#75728 on change of User Field via UNO-API... [Oliver-Rainer Wittmann]
    fdo#75741 re-implement CompileNameFormula for formula groups. [Kohei Yoshida]
    fdo#75772 correct name of Outline Numbering dialog [Laurent Balland-Poirier]
    fdo#75898 SwFEShell::InsertRow: fix this in case bSelectAll == true [Miklos Vajna]
    fdo#75955 use SHA1 from openssl/nss instead of rtl_digest_sha1 [Tomaž Vajngerl]
    fdo#75970 let's do it in a straightforward fashion. [Kohei Yoshida]
    fdo#75977 clear sheet deleted flags for affected references when undoing. [Kohei Yoshida]
    fdo#76078 LO Crashes while saving the docx file containing only opening brace [Dinesh Patil]
    fdo#76195 set the border type to NONE to ensure it won't be drawn. [Kohei Yoshida]
    fdo#76222 oox: add support for MSO 2007 SP2 encrypted documents [Tomaž Vajngerl]
    fdo#76235 assure correct line break for multi-lined Input Fields [Oliver-Rainer Wittmann]
    fdo#76294 properly intern string literals in formula on xls import. [Kohei Yoshida]
    fdo#76298 sw: do not start up every OLE object on deletion [Michael Stahl]
    fdo#76402 handle range reference expansion in named ranges. [Kohei Yoshida]
    fdo#76409 write output cell string to <text:p> element when saving to ods. [Kohei Yoshida]
    fdo#76470 avoid joining new formula cells individually. [Kohei Yoshida]
    fdo#76568 remove BerkeleyDB from license text [Andras Timar]
    fdo#76777 accept proper number style condition != as not equal operator, [Eike Rathke]
    fdo#76778 fix wildcard support in File Open dialog [Andras Timar]
    fdo#76802 error msg in Web Page Wizard dialog [Julien Nabet]
    fdo#76905 long delay when changing font size from % to pt [Caolán McNamara]
    fdo#76930 explictly list common lang-independant template dir [Caolán McNamara]
    fdo#76961 calc link auto-update interval is changed on file save [Niklas Johansson]
    fdo#77059 hidpi: Increase the threshold of what DPI we consider hi-dpi. [Jan Holesovsky]
    fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat() [Miklos Vajna]
    fdo#77174 crash with "New style from selection" with List [Caolán McNamara]
    fdo#77209 share string pool with clip documents. [Kohei Yoshida]
    fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude case [Miklos Vajna]
    fdo#77300 don't re-compile formulas when the hybrid formula is not there. [Kohei Yoshida]
    fdo#77307 compare external formula tokens correctly. [Kohei Yoshida]
    i#124039 assure correct line break for multi-lined Input Fields [Oliver-Rainer Wittmann]
    i#124085 improved support for PNG clipboard format on windows [Armin Le Grand]
    i#124453 check if the resulting polygon... [Jürgen Schmidt]
    i#124467 add check for image data offset... [Jürgen Schmidt, Miklos Vajna]
    i#124474 on change of User Field via UNO-API... [Oliver-Rainer Wittmann]
    i#124516 related: handle bad surrogate pairs gracefully on Windows [Herbert Dürr]
    i#124555 restore stream position after Seek to end of stream [Oliver-Rainer Wittmann]
    i#84870 partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22 [Bjoern Michaelsen]
    lp#760665 related: intermittent a11y crash in calc [Caolán McNamara]
    lp#811057 related: intermittent a11y crash in calc [Caolán McNamara]
    rhbz#1057741 [abrt] libreoffice-core: std::__throw_length_error(): soffice.bin killed by SIGABRT [Eike Rathke]
    rhbz#1075124 docx with negative left margin and border on table does not display properly in LibreOffice 4.2.2.1 [Luboš Luňák]
    rhbz#1076264 [abrt] libreoffice-core: ScAccessibleDocument::GetVisibleArea_Impl() const(): soffice.bin killed by SIGSEGV [Caolán McNamara]
    rhbz#1077780 [abrt] libreoffice-core: writerfilter::dmapper::lcl_MoveBorderPropertiesToFrame(): soffice.bin killed by SIGSEGV [Caolán McNamara]
    rhbz#1080196 [abrt] libreoffice-core: mdds/multi_type_vector_itr.hpp update_node(): soffice.bin killed by SIGSEGV [Kohei Yoshida]
    rhbz#1081968 libreoffice produces incorrect PDF export of cropped SVG graphics [Michael Stahl]
    rhbz#577595 [abrt] crash in ScAccessibleDocument::GetVisibleArea_Impl [Caolán McNamara]
    rhbz#602273 [abrt] crash in ScAccessibleDocument::GetVisibleArea_Impl [Caolán McNamara]
    rhbz#896711 [abrt][a11y] libreoffice-core-3.6.3.2-8.fc18: ScAccessibleDocument::GetVisibleArea_Impl: Process /usr/lib64/libreoffice/program/soffice.bin was killed by signal 11 (SIGSEGV) [Caolán McNamara]
    rhbz#923993 [abrt][a11y] libreoffice-core-3.6.5.2-6.fc18: ScAccessibleDocument::GetVisibleArea_Impl: Process /usr/lib64/libreoffice/program/soffice.bin was killed by signal 11 (SIGSEGV) [Caolán McNamara]

4.2.4(rc2)
Bugs fixed against 4.2.4 RC1:

    coverity#1202882 dereference before null check [Caolán McNamara]
    fdo#60040 crash after undoing master page application [Caolán McNamara]
    fdo#71423 fix crash while editing Impress tables. [Thorsten Behrens]
    fdo#74654 fix typo: printnone -> printhigh [Andras Timar]
    fdo#74697 add Bluez 5 support for impress remote. [Andrzej Hunt]
    fdo#74743 avoid infinite loop when gathering "svg" element styles [Tomaž Vajngerl]
    fdo#75525 out by one error [Caolán McNamara]
    fdo#76663 let's not skip the first element of a matrix in PRODUCT. [Kohei Yoshida]
    fdo#76916 'User paths' is missing in tab MotionMotion Paths tab [Caolán McNamara]
    fdo#77027 ODF import: fix wrong version in check for embedded objects [Michael Stahl]
    fdo#77039 fill the match string even if the raw string is empty. [Kohei Yoshida]
    fdo#77342 sw: fix copy/paste of footnote cross references [Michael Stahl]
    fdo#77603 new wildcard in autocorrection: .* instead of * [László Németh]
    rhbz#1088625 [abrt] libreoffice-core: sdext::presenter::PresenterPaintManager::Invalidate(): soffice.bin killed by SIGSEGV [Caolán McNamara]

4 files changed, 31 insertions, 29 deletions

diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 09464813fa7..0f8cb1afd8a 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2014/05/13 18:36:02 ryoon Exp $
 
-VER=		4.2.3.3
+VER=		4.2.4.2
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
-PKGREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/4.2.3/
+MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/4.2.4/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -19,6 +18,10 @@ LICENSE=	gnu-lgpl-v3
 BUILDLINK_TRANSFORM+=	rename:-O2:-O
 .endif
 
+.if ${OPSYS} == "OpenBSD"
+GCC_REQD+=	4.6
+.endif
+
 # LibreOfice's Makefile has its own pararell build mechanism. Avoid conflict.
 MAKE_JOBS_SAFE=	no
 
diff --git a/misc/libreoffice4/PLIST b/misc/libreoffice4/PLIST
index 17e23624153..f423a6d6680 100644
--- a/misc/libreoffice4/PLIST
+++ b/misc/libreoffice4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/05/01 00:32:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/05/13 18:36:02 ryoon Exp $
 bin/sbase
 bin/scalc
 bin/sdraw
@@ -7160,7 +7160,7 @@ ${PKGNAME}/share/Scripts/python/LibreLogo/icons/sc_runbasic.png
 ${PKGNAME}/share/Scripts/python/pythonSamples/TableSample.py
 ${PKGNAME}/share/autocorr/acor_af-ZA.dat
 ${PKGNAME}/share/autocorr/acor_bg-BG.dat
-${PKGNAME}/share/autocorr/acor_ca.dat
+${PKGNAME}/share/autocorr/acor_ca-ES.dat
 ${PKGNAME}/share/autocorr/acor_cs-CZ.dat
 ${PKGNAME}/share/autocorr/acor_da-DK.dat
 ${PKGNAME}/share/autocorr/acor_de-DE.dat
@@ -10486,13 +10486,13 @@ ${PKGNAME}/share/extensions/dict-bs/bs_BA.aff
 ${PKGNAME}/share/extensions/dict-bs/bs_BA.dic
 ${PKGNAME}/share/extensions/dict-bs/description.xml
 ${PKGNAME}/share/extensions/dict-bs/dictionaries.xcu
-${PKGNAME}/share/extensions/dict-ca/LICENCES-fr.txt
-${PKGNAME}/share/extensions/dict-ca/LICENCIAS-es.txt
 ${PKGNAME}/share/extensions/dict-ca/LICENSES-en.txt
 ${PKGNAME}/share/extensions/dict-ca/LLICENCIES-ca.txt
 ${PKGNAME}/share/extensions/dict-ca/META-INF/manifest.xml
-${PKGNAME}/share/extensions/dict-ca/SC_42x42.png
+${PKGNAME}/share/extensions/dict-ca/SC-logo.png
 ${PKGNAME}/share/extensions/dict-ca/ca.aff
+${PKGNAME}/share/extensions/dict-ca/ca-valencia.aff
+${PKGNAME}/share/extensions/dict-ca/ca-valencia.dic
 ${PKGNAME}/share/extensions/dict-ca/ca.dic
 ${PKGNAME}/share/extensions/dict-ca/description.xml
 ${PKGNAME}/share/extensions/dict-ca/dictionaries.xcu
@@ -11069,6 +11069,7 @@ ${PKGNAME}/share/extensions/dict-pt-PT/README_th_pt_PT_v2.txt
 ${PKGNAME}/share/extensions/dict-pt-PT/description.xml
 ${PKGNAME}/share/extensions/dict-pt-PT/dictionaries.xcu
 ${PKGNAME}/share/extensions/dict-pt-PT/hyph_pt_PT.dic
+${PKGNAME}/share/extensions/dict-pt-PT/icon.png
 ${PKGNAME}/share/extensions/dict-pt-PT/pt_PT.aff
 ${PKGNAME}/share/extensions/dict-pt-PT/pt_PT.dic
 ${PKGNAME}/share/extensions/dict-pt-PT/th_pt_PT_v2.dat
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index 534caacf9a6..ebfd26cbf22 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2014/05/01 21:04:31 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2014/05/13 18:36:02 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -78,9 +78,6 @@ Size (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 76
 SHA1 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 47b58e0ef2d856df26372a7061ae43fae6e08051
 RMD160 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 61672340e92957a5b72cddddcfcbf56d9602842c
 Size (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 bytes
-SHA1 (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = 6de440b71668f1a65a9344cdaf7a437291416781
-RMD160 (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = cbfbb18c3991ba55ebb50c607d5208cbfeb9fce3
-Size (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = 23875368 bytes
 SHA1 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d49e11b0b711970f494294dc3698f05eb294853
 RMD160 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 923870cf88023713a492e0a5c5d5707ec21d8739
 Size (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150 bytes
@@ -129,21 +126,18 @@ Size (libreoffice/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip) =
 SHA1 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 5ecb895ffc1eff2c381fa78d2197d0c57422b3df
 RMD160 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 575a7daf02efbab9ea972e03a6870f7f13112806
 Size (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 bytes
-SHA1 (libreoffice/harfbuzz-0.9.23.tar.bz2) = 2eb43c11f47fbaf8bc4532bf5ee8afa44d56bdb6
-RMD160 (libreoffice/harfbuzz-0.9.23.tar.bz2) = ee3b1e805f61620e5884dd59d5fc6ae3157e56d4
-Size (libreoffice/harfbuzz-0.9.23.tar.bz2) = 1027508 bytes
-SHA1 (libreoffice/libreoffice-4.2.3.3.tar.xz) = 0dbd92f7fa212214df852cd01ffd2287b61d6b1a
-RMD160 (libreoffice/libreoffice-4.2.3.3.tar.xz) = a7cce8c1935fd25afb7391f3083109defa2d57fc
-Size (libreoffice/libreoffice-4.2.3.3.tar.xz) = 123291796 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = 39f5e3b883f66aefc772a375681599ae4c7f2ce5
-RMD160 (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = fbbe19d1ff97c73200a9cd1b05709f303c06016e
-Size (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = 37186844 bytes
-SHA1 (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = 21dbe38a5b6504d3355b1e9dc03b1bd7983f8bdf
-RMD160 (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = fcd089eeb1a779287f454a54bbe28d5be1e6e4b7
-Size (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = 1855268 bytes
-SHA1 (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = ba41fd7aff5fd554738ee1a16e2bd402c586ea51
-RMD160 (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = 5ad111fda03b0abb6ba31b02e4085a7ad623df4d
-Size (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = 127774372 bytes
+SHA1 (libreoffice/libreoffice-4.2.4.2.tar.xz) = 9c2d9bed3e260628c3778d24171a9f2d09c80f28
+RMD160 (libreoffice/libreoffice-4.2.4.2.tar.xz) = 88bfbaa10be5989b87d05f2a4971d25f6c3b0a68
+Size (libreoffice/libreoffice-4.2.4.2.tar.xz) = 123378868 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 54e0e2af302a4418d7b5ebe65594694b52e5e1cd
+RMD160 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 3d1f0e61c4c662c51a8838e3375a4eef3c1b1c7f
+Size (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 37216212 bytes
+SHA1 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = a0fbe4d143969e9e9ca628782083f8525ffb69e5
+RMD160 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 2dd7ea480b88d89401a21b1f20895444557e778e
+Size (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 1855080 bytes
+SHA1 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 6c1849e270189b88b40583890820d915b4998fb9
+RMD160 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 4c05f13af991c601ac2c98c073aa4a8251e69bd5
+Size (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 127819696 bytes
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = adb326c48a7dd05f2de56e12a7c15836545dab4e
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = a27b4b580f53260b00bcbd5897986da2505f28ab
 SHA1 (patch-configure.ac) = e63fff7c20c303db677edce71be56aaf555e8742
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk
index 7e88bee9e3e..0190f72f81a 100644
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,8 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2014/02/02 07:43:40 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2014/05/13 18:36:02 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS=	java
+.endif
 
 .include "../../mk/bsd.options.mk"