CVS commit: pkgsrc/misc/libreoffice

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/misc/libreoffice
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Mon, 25 Jun 2018 13:34:48 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jun 25 13:34:48 UTC 2018

Modified Files:
        pkgsrc/misc/libreoffice: Makefile PLIST PLIST.java distinfo
        pkgsrc/misc/libreoffice/patches: patch-desktop_scripts_soffice.sh
            patch-download.lst
            patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-desktop_scripts_unopkg.sh
            patch-svx_source_gengal_gengal.sh

Log Message:
Update to 6.0.5.2

* Fix javaPathHelper startup error with patches from wiz@

Changelog:
6.0.5.2:
Bugs fixed compared to 6.0.5 rc1:

    tdf#33689 Date format problem using the Dutch (NL) localization [Eike Rathke]
    tdf#107867 Crash when working with form [Eike Rathke]
    tdf#114736 Crash with CJK characters in status bar (OpenGL) [Tamas Bunth]
    tdf#116527 Crash in: `anonymous namespace'::documentStartPageNumber [Caolán McNamara]
    tdf#116552 Pivot table shortcuts for moving the current field into the "Row" area [Caolán McNamara]
    tdf#117827 Synchronize Labels button not working [Laurent BP]
    tdf#118068 Impress crashes when the New Slide toolbar command is used [Caolán McNamara]
    tdf#118070 LibreOffice 6.0.4.2 fails to build with GLM 0.9.9.0: GLM_GTX_bit is an experimental extension [Louis Sautier]
    tdf#118073 LibreOffice Basic freezes when line ends with "0." [Eike Rathke]
    tdf#118161 COUNTA() returns inconsistent values depending on entering separate cells or a corresponding cell range [Eike Rathke]

6.0.5.2:
Bugs fixed compared to 6.0.4 (rc2):

    deb#899380 apparmor: fix gpg encryption hang trying to lock random_seed [Rene Engelhard]
    ofz#6104 guard against self recursive GetShadow [Caolán McNamara]
    ofz#6448 guard against self recursive GetShadow [Caolán McNamara]
    ofz#6602 guard against self recursive GetShadow [Caolán McNamara]
    ofz#6640 guard against self recursive GetShadow [Caolán McNamara]
    ofz#7146 guard against self recursive GetShadow [Caolán McNamara]
    ofz#7322 lcl_MarkEqualByStart sort logic differs from that of operator== [Caolán McNamara]
    ofz#8095 avoid recurse to death [Caolán McNamara]
    ofz#8161 guard against self recursive GetShadow [Caolán McNamara]
    ofz#8226 + valgrind: uninitialized value [Caolán McNamara]
    redmine#2585 update credits [Christian Lohmaier]
    rhbz#1065629 [fix available] RTF import probable regression with non-english BigMachines exports [Miklos Vajna]
    rhbz#1283420 message box fonts corrupted in libreoffice [Caolán McNamara]
    rhbz#1396729 [GTK3] LibreOffice Writer slows scrolling with embedded images [Caolán McNamara]
    rhbz#1569331 Libreoffice applications crash when tried to input through any IME [Caolán McNamara]
    tdf#13107 The RTF export is incorrect. [Miklos Vajna]
    tdf#38225 Unable to change name of a custom style [Mike Kaganski]
    tdf#53485 FILEOPEN EMF+ particular .emf: shown incomplete, without colored area [Bartosz Kosiorek]
    tdf#55058 EMF+ List of EMF import bugs with examples [Bartosz Kosiorek]
    tdf#84843 Disable all Drawing toolbar buttons in read-only mode [Caolán McNamara]
    tdf#87199 [a11y] merging cells crashes writer [Caolán McNamara]
    tdf#95843 Headless mode leaves zombie process [Stephan Bergmann]
    tdf#96739 Ctrl+left/right shift doesn't change text direction [Maxim Monastirsky]
    tdf#96918 Rounding display error for 15 digits integers [Eike Rathke]
    tdf#96947 Check marks on menus (Windows 7 Aero theme, OpenGL enabled) miss their borders [Miklos Vajna]
    tdf#99324 Accelerator underlines dont show when pressing Alt (Sidebar, Dialogs, Start Center) [Maxim Monastirsky]
    tdf#100243 System freezes when attempting to print while OpenGL is enabled [Julien Nabet]
    tdf#100761 after insert note, focus cannot return to the input bar [Caolán McNamara]
    tdf#104086 Ignore OpenGL Blacklist checked while use OpenGL for all rendering unchecked, enables OpenGL [Miklos Vajna]
    tdf#104658 Chart bars shrink and jump up on applying bitmap fill [Katarina Behrens]
    tdf#104893 Assert from OpenGL code when activating chart object [Miklos Vajna]
    tdf#105954 When exporting to pdf and choosing "JPEG compression", "reduce image resolution" isn't taken into account. [Miklos Vajna]
    tdf#106084 certain EMF+ images from OOXML document are not rendered correctly LibreOffice [Bartosz Kosiorek]
    tdf#106702 FILESAVE: PDF: Only first page's background is exported [Miklos Vajna]
    tdf#109143 image exported to pdf is not being cropped correctly [Miklos Vajna]
    tdf#111080 Edit form, use 'replace with' to change the type of control - nothing happens [Julien Nabet]
    tdf#111988 README and Download page System requirements are wrong for OSX - states 10.8 supported, but requires minimum 10.9 [Xisco Fauli]
    tdf#112211 FILEOPEN: RTF: Incorrect horizontal bullet position [Miklos Vajna]
    tdf#112501 Pivot table: popupbuttons are placed on wrong cells imported from XLS [Caolán McNamara]
    tdf#113143 FILESAVE PDF: wrong position of a JPEG image on exported notes page [Miklos Vajna]
    tdf#113197 FILEOPEN: EMF+ Incorrect lines' height [Armin Le Grand]
    tdf#113624 Wrong position and size of the characters in EMF/EMF+ dual mode [Bartosz Kosiorek]
    tdf#113894 [Regression] Pasting text from Writer in Calc formula field doesn't strip formatting [Maxim Monastirsky]
    tdf#114132 Tiling bitmaps does not work for charts (Format Wall) [Katarina Behrens]
    tdf#115582 VIEWING: Rotated Text in a Cell gets invisible (steps in comment 6 ) [Armin Le Grand]
    tdf#116365 Crash in: BitmapReadAccess::SetPixelForN24BitTcRgb(unsigned char *,long,BitmapColor const &,ColorMask const &) if OpenGL is enabled [Miklos Vajna]
    tdf#116420 Error when I try to open an Document in a Sharepoint WebDAV directory (# is not allowed in a filename) [Mike Kaganski]
    tdf#116511 Calc crashes when opening Function Wizard through Cmd-F2 shortcut [Tor Lillqvist]
    tdf#116725 !!br0ken!! mysteriously appears in Spellcheck after some steps [Mike Kaganski]
    tdf#116801 Fileopen DOCX: text in table is in the first column only [Miklos Vajna]
    tdf#116821 row and column toolbar not available when selecting non-adjacent rows/columns by pressing ctrl key [Maxim Monastirsky]
    tdf#116841 FILEOPEN: Bullet list has no identation [Miklos Vajna]
    tdf#116925 Automatic text color in textbox does not consider fill style of shape [Miklos Vajna]
    tdf#116939 Problem opening excelfile in latest release - due to overflow [Eike Rathke]
    tdf#116951 LibreOffice crashed when inserted "−" (minus, U+2212) character on Gnome on Wayland [Caolán McNamara]
    tdf#116976 DOCX import: bitmap does not consume its relative size [Miklos Vajna]
    tdf#116985 DOCX import, shape with textbox: incorrect text area size when shape size is relative [Miklos Vajna]
    tdf#116999 Libreoffice command line interface is not opening cgm files [Caolán McNamara]
    tdf#117005 Undo/redo is skipping the comment [Caolán McNamara]
    tdf#117015 "EMF+ Only" mode is not displaying object after GetDC record [Bartosz Kosiorek]
    tdf#117017 Text formatting .un:Subscript, .uno:Superscript work from menu and Sidebar deck, but not completed with assigned keyboard shortcut [Maxim Monastirsky]
    tdf#117028 DOCX import: textbox of shape lacks its transparent background [Miklos Vajna]
    tdf#117039 Print Preview cehrens]
    tdf#117093 Crash in: ScGridWindow::ClickExtern() [Eike Rathke]
    tdf#117105 Libreoffice 6.0.2 crashes when choosing "Tools" > "Options" and secring.gpg is present in Linux [Stephan Bergmann]
    tdf#117161 REPORTBUILDER - Horizontal align is]
    tdf#117246 RTF import: lost page breaks inside nested groups [Miklos Vajna]
    tdf#117268 FILEOPEN: RTF: parser dont draw tables correctly [Mike Kaganski]
    tdf#117311 The CUA bindings for clipboard (Copy-Paste) actions do not function in edit shf master slide is missing from content panel of its Sidebar deck [Xisco Fauli]
    tdf#117403 FILEOPEN: RTF: missing border on table [Miklos Vajna]
    tdf#117413 double display slightly offset when editing a cell [Caolán McNamara]
    tdf#117433 COUNTIF) doesn't properly count empty cells for empty ("" or "=") criteria [Winfried Donkers]
    tdf#117475 CRASH changing the master slide [Caolán McNamara]
    tdf#117477 Make new entry to OpenGL blacklist [Julien Nabet]
    tdf#117505 FILESAVE: RTF: header size changes after RT [Miklos Vajna]
    tdf#117596 Japanese text on the listbox is big in pivot charts [Tomaž Vajngerl]
    tdf#117601 Crash in: libstdc++.so.6.0.22 on merge cells in writer with TDF .debs on Debian 9 [Caolán McNamara]
    tdf#117612 DateAdd("m",...) does not truncate date to last valid day of month anymore [Eike Rathke]
    tdf#117628 Crash after closing Media Player after opening and applying file (kde4 and gen) [Caolán McNamara]
    tdf#117729 l10n: add Frisian [fy] UI translation to builds [Christian Lohmaier]
    tdf#117819 error displaying some integer values if number of decimals is forced to more than 15 [Eike Rathke]
    tdf#117821 Editing: Forms: Replace control menu selection image button places wrong control type on form (combo box) [Julien Nabet]
    tdf#117850 Quitting LibreOffice on macOS while About dialog is open causes process to get stuck consuming CPU [Tor Lillqvist]
    tdf#117864 Fails to cut copy or paste chart elements from the content menu [Caolán McNamara]


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/misc/libreoffice/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/libreoffice/PLIST.java
cvs rdiff -u -r1.56 -r1.57 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_unopkg.sh \
    pkgsrc/misc/libreoffice/patches/patch-svx_source_gengal_gengal.sh
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/libreoffice/patches/patch-download.lst
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.157 pkgsrc/misc/libreoffice/Makefile:1.158
--- pkgsrc/misc/libreoffice/Makefile:1.157      Sun Jun 24 11:16:10 2018
+++ pkgsrc/misc/libreoffice/Makefile    Mon Jun 25 13:34:48 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.157 2018/06/24 11:16:10 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2018/06/25 13:34:48 ryoon Exp $
 
-VERREL=                6.0.4
+VERREL=                6.0.5
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -101,14 +100,14 @@ MORE_DISTFILES= \
        ReemKufi-0.6.tar.gz \
        Scheherazade-2.100.zip
 
-MORE_DISTFILES+=               harfbuzz-1.7.6.tar.bz2
+MORE_DISTFILES+=               harfbuzz-1.8.1.tar.bz2
 
 .for md in ${MORE_DISTFILES}
 DISTFILES+=            ${md}
 SITES.${md}=           http://dev-www.libreoffice.org/src/
 .endfor
 
-SITES.harfbuzz-1.7.6.tar.bz2=  http://www.freedesktop.org/software/harfbuzz/release/
+SITES.harfbuzz-1.8.1.tar.bz2=  http://www.freedesktop.org/software/harfbuzz/release/
 
 .include "options.mk"
 

Index: pkgsrc/misc/libreoffice/PLIST
diff -u pkgsrc/misc/libreoffice/PLIST:1.27 pkgsrc/misc/libreoffice/PLIST:1.28
--- pkgsrc/misc/libreoffice/PLIST:1.27  Tue Feb 13 13:03:06 2018
+++ pkgsrc/misc/libreoffice/PLIST       Mon Jun 25 13:34:48 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2018/02/13 13:03:06 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/06/25 13:34:48 ryoon Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -1371,6 +1371,38 @@ ${PKGNAME}/lib/libreoffice/program/resou
 ${PKGNAME}/lib/libreoffice/program/resource/fr/LC_MESSAGES/wiz.mo
 ${PKGNAME}/lib/libreoffice/program/resource/fr/LC_MESSAGES/wpt.mo
 ${PKGNAME}/lib/libreoffice/program/resource/fr/LC_MESSAGES/xsc.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/acc.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/avmedia.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/basctl.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/chart.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/cnr.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/cui.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/dba.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/dkt.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/editeng.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/flt.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/for.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/fps.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/frm.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/fwk.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/pcr.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/rpt.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sb.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sc.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sca.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/scc.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sd.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sfx.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sm.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/svl.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/svt.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/svx.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/sw.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/uui.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/vcl.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/wiz.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/wpt.mo
+${PKGNAME}/lib/libreoffice/program/resource/fy/LC_MESSAGES/xsc.mo
 ${PKGNAME}/lib/libreoffice/program/resource/ga/LC_MESSAGES/acc.mo
 ${PKGNAME}/lib/libreoffice/program/resource/ga/LC_MESSAGES/avmedia.mo
 ${PKGNAME}/lib/libreoffice/program/resource/ga/LC_MESSAGES/basctl.mo
@@ -4106,6 +4138,7 @@ ${PKGNAME}/lib/libreoffice/readmes/READM
 ${PKGNAME}/lib/libreoffice/readmes/README_fa
 ${PKGNAME}/lib/libreoffice/readmes/README_fi
 ${PKGNAME}/lib/libreoffice/readmes/README_fr
+${PKGNAME}/lib/libreoffice/readmes/README_fy
 ${PKGNAME}/lib/libreoffice/readmes/README_ga
 ${PKGNAME}/lib/libreoffice/readmes/README_gd
 ${PKGNAME}/lib/libreoffice/readmes/README_gl
@@ -4222,6 +4255,7 @@ ${PKGNAME}/lib/libreoffice/share/Scripts
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_fa.properties
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_fi.properties
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_fr.properties
+${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_fy.properties
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_ga.properties
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_gd.properties
 ${PKGNAME}/lib/libreoffice/share/Scripts/python/LibreLogo/LibreLogo_gl.properties
@@ -6455,6 +6489,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_fa.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_fi.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_fr.properties
+${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_fy.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_ga.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_gd.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-en/dialog/en_gl.properties
@@ -6688,6 +6723,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_fa.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_fi.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_fr.properties
+${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_fy.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_ga.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_gd.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-hu/dialog/hu_HU_gl.properties
@@ -6981,6 +7017,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_fa.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_fi.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_fr.properties
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_fy.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_ga.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_gd.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ru/dialog/ru_RU_gl.properties
@@ -7204,6 +7241,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-fa.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-fi.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-fr.txt
+${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-fy.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-ga.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-gd.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/mysql-connector-ooo/description-gl.txt
@@ -8394,6 +8432,7 @@ ${PKGNAME}/lib/libreoffice/share/registr
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-fa.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-fi.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-fr.xcd
+${PKGNAME}/lib/libreoffice/share/registry/Langpack-fy.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-ga.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-gd.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/Langpack-gl.xcd
@@ -8544,6 +8583,7 @@ ${PKGNAME}/lib/libreoffice/share/registr
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_fa.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_fi.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_fr.xcd
+${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_fy.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_ga.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_gd.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_gl.xcd
@@ -8656,6 +8696,7 @@ ${PKGNAME}/lib/libreoffice/share/registr
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_fa.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_fi.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_fr.xcd
+${PKGNAME}/lib/libreoffice/share/registry/res/registry_fy.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_ga.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_gd.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/registry_gl.xcd
@@ -8916,6 +8957,7 @@ ${PKGNAME}/lib/libreoffice/share/wizards
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_fa.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_fi.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_fr.properties
+${PKGNAME}/lib/libreoffice/share/wizards/resources_fy.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_ga.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_gd.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_gl.properties
@@ -9564,6 +9606,7 @@ share/mime/packages/libreoffice.xml
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gl
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gd
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ga
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/fy
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/eu
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/et
 @pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/eo

Index: pkgsrc/misc/libreoffice/PLIST.java
diff -u pkgsrc/misc/libreoffice/PLIST.java:1.6 pkgsrc/misc/libreoffice/PLIST.java:1.7
--- pkgsrc/misc/libreoffice/PLIST.java:1.6      Tue Aug  1 11:57:36 2017
+++ pkgsrc/misc/libreoffice/PLIST.java  Mon Jun 25 13:34:48 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java,v 1.6 2017/08/01 11:57:36 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.7 2018/06/25 13:34:48 ryoon Exp $
 ${PKGNAME}/lib/libreoffice/program/JREProperties.class
 ${PKGNAME}/lib/libreoffice/program/classes/ScriptFramework.jar
 ${PKGNAME}/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar
@@ -118,6 +118,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-fa.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-fi.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-fr.txt
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-fy.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-ga.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-gd.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/description-gl.txt
@@ -520,6 +521,16 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fr/help.jar
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fr/help.key_
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fr/help.tree
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy-xhp.done
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy.done
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.db_
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.ht_
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.idxl/_0.cfs
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.idxl/segments.gen
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.idxl/segments_3
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.jar
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.key_
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/fy/help.tree
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/ga-xhp.done
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/ga.done
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/help/ga/help.db_
@@ -1363,6 +1374,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_fa.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_fi.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_fr.properties
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_fy.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_ga.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_gd.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_gl.properties
@@ -1477,6 +1489,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_fa.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_fi.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
+${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_fy.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_ga.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
 ${PKGNAME}/lib/libreoffice/share/extensions/nlpsolver/locale/NLPSolverStatusDialog_gl.properties
@@ -1608,6 +1621,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-fa.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-fi.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-fr.txt
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-fy.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-ga.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-gd.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/description-gl.txt
@@ -2018,6 +2032,16 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fr/help.jar
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fr/help.key_
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fr/help.tree
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy-xhp.done
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy.done
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.db_
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.ht_
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.idxl/_0.cfs
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.idxl/segments.gen
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.idxl/segments_3
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.jar
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.key_
+${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/fy/help.tree
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/ga-xhp.done
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/ga.done
 ${PKGNAME}/lib/libreoffice/share/extensions/wiki-publisher/help/ga/help.db_

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.56 pkgsrc/misc/libreoffice/distinfo:1.57
--- pkgsrc/misc/libreoffice/distinfo:1.56       Thu May 10 20:11:01 2018
+++ pkgsrc/misc/libreoffice/distinfo    Mon Jun 25 13:34:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2018/05/10 20:11:01 ryoon Exp $
+$NetBSD: distinfo,v 1.57 2018/06/25 13:34:48 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -156,10 +156,10 @@ SHA1 (libreoffice/graphite2-minimal-1.3.
 RMD160 (libreoffice/graphite2-minimal-1.3.10.tgz) = 508f69ef2f6c4e8e3843d4a367aea8e1c00439e3
 SHA512 (libreoffice/graphite2-minimal-1.3.10.tgz) = 0bbf2b586d3b9f09aa6f8e68575482d63ea4ebc712bd2103ba678074b581ac0e5593fdb6d26be60a74fea0261da2797d4c0db7d384d75837fbf93dd4ac3579a2
 Size (libreoffice/graphite2-minimal-1.3.10.tgz) = 155690 bytes
-SHA1 (libreoffice/harfbuzz-1.7.6.tar.bz2) = 67a8754c510dfb68796b1cf6a7011ad6515f504d
-RMD160 (libreoffice/harfbuzz-1.7.6.tar.bz2) = bfd237407c3b8eea5a59f1c6bbab4a467549c767
-SHA512 (libreoffice/harfbuzz-1.7.6.tar.bz2) = 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
-Size (libreoffice/harfbuzz-1.7.6.tar.bz2) = 2586909 bytes
+SHA1 (libreoffice/harfbuzz-1.8.1.tar.bz2) = 43dedc4931de7ace0da169fa12dce55c9715ae00
+RMD160 (libreoffice/harfbuzz-1.8.1.tar.bz2) = ab043112bef5bf2a91f26efa867971529411a3a9
+SHA512 (libreoffice/harfbuzz-1.8.1.tar.bz2) = 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
+Size (libreoffice/harfbuzz-1.8.1.tar.bz2) = 3804867 bytes
 SHA1 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = a6fe98f8966d2deb6cf30009d28e39ea56b304c6
 RMD160 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = 38956930e7664d8bf942897d954901b3f32dd144
 SHA512 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = b1963b6433f720cf41959ac78b10894a19761037781c172064737ef3c44e2a8532d03788999289a32cc598507079701dc56df20d812524ac3283ab2d7855cabd
@@ -176,22 +176,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.g
 RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d
 SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-SHA1 (libreoffice/libreoffice-6.0.4.2.tar.xz) = d6e2d9037bffb81333b0ebd11258ec8966a2ea52
-RMD160 (libreoffice/libreoffice-6.0.4.2.tar.xz) = 8eb8615c635387f05a0a90f097cbbcb86bcf4885
-SHA512 (libreoffice/libreoffice-6.0.4.2.tar.xz) = 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
-Size (libreoffice/libreoffice-6.0.4.2.tar.xz) = 204556512 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 10998a5cf9dafe1addf17e0f9c01a30bb5a5ede4
-RMD160 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 2722c1a86906f038b4a9bbe23e1dade385d76317
-SHA512 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = e7b371e08ce48d53e2b9b565dade6663be0199d07cbe49af176352ec79b23d83370c7cf121b9a545d576eb7230da7960226f1eebd394700fd931100956984502
-Size (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 41653868 bytes
-SHA1 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = ed25496cf1269afc046d5c446641d4b32e23b5e2
-RMD160 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = e23552cd9df13183c3983d737d3e8d2b7668fd28
-SHA512 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
-Size (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = 2972636 bytes
-SHA1 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 15c933088d7584b5fe2c12d1cc5fa95e5a7afc71
-RMD160 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 319889a5bcdb3892cd0f2bbe07006f997684ff61
-SHA512 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 470e1d9d17dcbd4cebd2429d0c2711ee1730be32178684b3128471387708a24b6ee357ea261ac36f6b6a5d8acbcb4fa1ea5c216186705edcb2406bc5cb765124
-Size (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 139214448 bytes
+SHA1 (libreoffice/libreoffice-6.0.5.2.tar.xz) = af589e65af3a893eea82a478955548f6ee2b23ca
+RMD160 (libreoffice/libreoffice-6.0.5.2.tar.xz) = cc4a5ab0921bbb32c4cbc959fcafc3dd36962b79
+SHA512 (libreoffice/libreoffice-6.0.5.2.tar.xz) = 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
+Size (libreoffice/libreoffice-6.0.5.2.tar.xz) = 204795724 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-6.0.5.2.tar.xz) = 9bd39c8b77ffaf744d3debcb57bf9d9b8c0aa15f
+RMD160 (libreoffice/libreoffice-dictionaries-6.0.5.2.tar.xz) = a5510344deff0073456046546ae4d7458e9e780b
+SHA512 (libreoffice/libreoffice-dictionaries-6.0.5.2.tar.xz) = 78ad2d86e29537d80b261bc8cbd04b766dc273597a7aec2d6218d6ad4d937420d44382e15c67dd00406b701d7448379ad108dc289217571d284aedebbf57c0e2
+Size (libreoffice/libreoffice-dictionaries-6.0.5.2.tar.xz) = 41665564 bytes
+SHA1 (libreoffice/libreoffice-help-6.0.5.2.tar.xz) = 9a8cc88d8418f69aa8cbb5395f29b416ffaaa085
+RMD160 (libreoffice/libreoffice-help-6.0.5.2.tar.xz) = 00fa14f5040c2f5966ed25a2f69f7d6940338060
+SHA512 (libreoffice/libreoffice-help-6.0.5.2.tar.xz) = 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
+Size (libreoffice/libreoffice-help-6.0.5.2.tar.xz) = 2972956 bytes
+SHA1 (libreoffice/libreoffice-translations-6.0.5.2.tar.xz) = 2e3145ed8668167712d9680f160f0407dedb29ad
+RMD160 (libreoffice/libreoffice-translations-6.0.5.2.tar.xz) = a1252d7b8d2bcc9c0f4be7d245d9939e3d106c95
+SHA512 (libreoffice/libreoffice-translations-6.0.5.2.tar.xz) = 5de62e013412cc0c681d7447bcbf2cebdeb4f2d6033c320dd95f6f8e39c7716ab9e0d2b864c4495c001381acbc6889e03577b767c7f0a010bacb954bc6887cee
+Size (libreoffice/libreoffice-translations-6.0.5.2.tar.xz) = 139602664 bytes
 SHA1 (libreoffice/noto-fonts-20171024.tar.gz) = e775f61b4ed544198e9497b27b3460623d5560ca
 RMD160 (libreoffice/noto-fonts-20171024.tar.gz) = 02f8d0e2615032daf36dc375d00a2b4575d858a3
 SHA512 (libreoffice/noto-fonts-20171024.tar.gz) = 3888c5f19d85f9ae25413a064a27f01b87e09ba07b40f721b20e563bad3289a5c435686744dc3b52980625a24f82fa0b4b38046b4db971afc50a0cb3a757c179
@@ -209,10 +209,11 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
 SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454
-SHA1 (patch-desktop_scripts_soffice.sh) = b5b2ccf7830d160fd4a1bb087610a1b766b25f08
+SHA1 (patch-desktop_scripts_soffice.sh) = 3d5b64f11258e204f6078e951a2183dd3ef104b4
+SHA1 (patch-desktop_scripts_unopkg.sh) = 72682ee689e43f420b5d229871223d828ca6c1c7
 SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
-SHA1 (patch-download.lst) = ebcdd4ad27656f2199312413c5d118c0049f8316
-SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602
+SHA1 (patch-download.lst) = cc6e6ad0599751b9f3c2c1331f62cbf1ed6e39b8
+SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 60e2ef2081b59b23bd5cc7a7262880513ac03eee
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
@@ -229,6 +230,7 @@ SHA1 (patch-lotuswordpro_source_filter_l
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
+SHA1 (patch-svx_source_gengal_gengal.sh) = 2ed5885bf00e95cd6e93a88cf5442dc979d50540
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
 SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb

Index: pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh
diff -u pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh:1.1 pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh:1.2
--- pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh:1.1        Thu Mar  1 03:25:06 2018
+++ pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh    Mon Jun 25 13:34:48 2018
@@ -1,6 +1,9 @@
-$NetBSD: patch-desktop_scripts_soffice.sh,v 1.1 2018/03/01 03:25:06 ryoon Exp $
+$NetBSD: patch-desktop_scripts_soffice.sh,v 1.2 2018/06/25 13:34:48 ryoon Exp $
 
---- desktop/scripts/soffice.sh.orig    2018-02-08 14:35:19.000000000 +0000
+1. chunk: ?
+other chunks: javaPathHelper is OpenBSD-specific
+
+--- desktop/scripts/soffice.sh.orig    2018-05-04 13:30:05.000000000 +0000
 +++ desktop/scripts/soffice.sh
 @@ -17,6 +17,10 @@
  #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
@@ -13,3 +16,24 @@ $NetBSD: patch-desktop_scripts_soffice.s
  # use POSIX locale for well-defined tool output
  LO_SAVE_LC_ALL="$LC_ALL"
  LC_ALL=C
+@@ -141,7 +145,7 @@ if echo "$checks" | grep -q "cc" ; then
+ fi
+ 
+ case "$(uname -s)" in
+-NetBSD|OpenBSD|DragonFly)
++OpenBSD)
+ # this is a temporary hack until we can live with the default search paths
+     LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+@@ -150,6 +154,11 @@ NetBSD|OpenBSD|DragonFly)
+         export JAVA_HOME
+     fi
+     ;;
++NetBSD|DragonFly)
++# this is a temporary hack until we can live with the default search paths
++    LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++    export LD_LIBRARY_PATH
++    ;;
+ AIX)
+     LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}"
+     export LIBPATH

Index: pkgsrc/misc/libreoffice/patches/patch-download.lst
diff -u pkgsrc/misc/libreoffice/patches/patch-download.lst:1.4 pkgsrc/misc/libreoffice/patches/patch-download.lst:1.5
--- pkgsrc/misc/libreoffice/patches/patch-download.lst:1.4      Sat Mar 17 01:19:25 2018
+++ pkgsrc/misc/libreoffice/patches/patch-download.lst  Mon Jun 25 13:34:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-download.lst,v 1.4 2018/03/17 01:19:25 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.5 2018/06/25 13:34:48 ryoon Exp $
 
 --- download.lst.orig  2018-01-24 20:31:03.000000000 +0000
 +++ download.lst
@@ -8,8 +8,8 @@ $NetBSD: patch-download.lst,v 1.4 2018/0
  export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
 -export HARFBUZZ_SHA256SUM := 042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029
 -export HARFBUZZ_TARBALL := harfbuzz-1.7.0.tar.bz2
-+export HARFBUZZ_SHA256SUM := da7bed39134826cd51e57c29f1dfbe342ccedb4f4773b1c951ff05ff383e2e9b
-+export HARFBUZZ_TARBALL := harfbuzz-1.7.6.tar.bz2
++export HARFBUZZ_SHA256SUM := fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45
++export HARFBUZZ_TARBALL := harfbuzz-1.8.1.tar.bz2
  export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  export HUNSPELL_SHA256SUM := 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4

Index: pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.2 pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.3
--- pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.2    Sat Feb  3 00:39:50 2018
+++ pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk        Mon Jun 25 13:34:48 2018
@@ -1,13 +1,17 @@
-$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.2 2018/02/03 00:39:50 ryoon Exp $
+$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.3 2018/06/25 13:34:48 ryoon Exp $
 
---- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2018-01-24 20:31:03.000000000 +0000
+--- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2018-06-19 22:27:30.000000000 +0000
 +++ external/harfbuzz/UnpackedTarball_harfbuzz.mk
-@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_pat
+@@ -15,12 +15,6 @@ $(eval $(call gb_UnpackedTarball_update_
  
- $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-     external/harfbuzz/clang-cl.patch \
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
+ 
+-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+-    external/harfbuzz/clang-cl.patch \
 -    external/harfbuzz/ubsan.patch \
 -      external/harfbuzz/revert-make-inert.patch \
- ))
- 
+-))
+-
  ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
+ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+     external/harfbuzz/harfbuzz-rtti.patch \

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_unopkg.sh
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_unopkg.sh:1.1
--- /dev/null   Mon Jun 25 13:34:48 2018
+++ pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_unopkg.sh     Mon Jun 25 13:34:48 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-desktop_scripts_unopkg.sh,v 1.1 2018/06/25 13:34:48 ryoon Exp $
+
+javaPathHelper is OpenBSD-specific
+
+--- desktop/scripts/unopkg.sh.orig     2018-05-04 13:30:05.000000000 +0000
++++ desktop/scripts/unopkg.sh
+@@ -37,7 +37,7 @@ cd "$sd_cwd" || exit $?
+ 
+ # this is a temporary hack until we can live with the default search paths
+ case "$(uname -s)" in
+-NetBSD|OpenBSD|FreeBSD|DragonFly)
++OpenBSD)
+     LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+     export LD_LIBRARY_PATH
+@@ -45,6 +45,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
+         export JAVA_HOME
+     fi
+     ;;
++NetBSD|FreeBSD|DragonFly)
++    LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
++    export LD_LIBRARY_PATH
++    ;;
+ AIX)
+     LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}"
+     export LIBPATH
Index: pkgsrc/misc/libreoffice/patches/patch-svx_source_gengal_gengal.sh
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-svx_source_gengal_gengal.sh:1.1
--- /dev/null   Mon Jun 25 13:34:48 2018
+++ pkgsrc/misc/libreoffice/patches/patch-svx_source_gengal_gengal.sh   Mon Jun 25 13:34:48 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-svx_source_gengal_gengal.sh,v 1.1 2018/06/25 13:34:48 ryoon Exp $
+
+javaPathHelper is OpenBSD-specific
+
+--- svx/source/gengal/gengal.sh.orig   2018-05-04 13:30:05.000000000 +0000
++++ svx/source/gengal/gengal.sh
+@@ -35,7 +35,7 @@ cd "$sd_cwd"
+ 
+ # this is a temporary hack until we can live with the default search paths
+ case "$(uname -s)" in
+-NetBSD|OpenBSD|FreeBSD|DragonFly)
++OpenBSD)
+     LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+     export LD_LIBRARY_PATH
+@@ -43,6 +43,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
+         export JAVA_HOME
+     fi
+     ;;
++NetBSD|FreeBSD|DragonFly)
++    LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
++    export LD_LIBRARY_PATH
++    ;;
+ AIX)
+     LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}}
+     export LIBPATH

Prev by Date: CVS commit: pkgsrc/lang/rust
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/rust
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index