Index: head/editors/libreoffice/Makefile
===================================================================
--- head/editors/libreoffice/Makefile	(revision 458698)
+++ head/editors/libreoffice/Makefile	(revision 458699)
@@ -1,332 +1,332 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
 DISTFILES=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	libreoffice
 EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 
 CONFLICTS_BUILD=	mdds0
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		zip:archivers/zip \
 		${LOCALBASE}/include/sqlext.h:databases/unixODBC \
 		dmake:devel/dmake \
 		${LOCALBASE}/bin/gperf:devel/gperf \
 		${LOCALBASE}/include/mdds-1.2/mdds/global.hpp:devel/mdds \
 		gpatch:devel/patch \
 		ucpp:devel/ucpp \
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
 		vigra-config:graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_date_time.so:devel/boost-libs \
 		libicutu.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
-		liborcus-0.12.so:devel/liborcus \
+		liborcus-0.13.so:devel/liborcus \
 		libcurl.so:ftp/curl \
 		libcairo.so:graphics/cairo \
 		libgraphite2.so:graphics/graphite2 \
 		liblcms2.so:graphics/lcms2 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libgltf-0.0.so:graphics/libgltf \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libzmf-0.0.so:graphics/libzmf \
 		libGeneratedSaxParser.so:graphics/opencollada \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libCoinMP.so:math/coinmp \
 		liblpsolve55.so:math/lp_solve \
 		libcmis-0.5.so:net/libcmis \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libmspub-0.1.so:print/libmspub01 \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libnss3.so:security/nss \
 		libclucene-core.so:textproc/clucene \
 		libexpat.so:textproc/expat2 \
 		libhunspell-1.6.so:textproc/hunspell \
 		libhyphen.so:textproc/hyphen \
 		libabw-0.1.so:textproc/libabw \
 		libe-book-0.1.so:textproc/libe-book \
 		libexttextcat-2.0.so:textproc/libexttextcat \
 		libmwaw-0.3.so:textproc/libmwaw03 \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		librevenge-0.0.so:textproc/librevenge \
 		libstaroffice-0.0.so:textproc/libstaroffice \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwps-0.4.so:textproc/libwps \
 		libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt \
 		libmythes-1.2.so:textproc/mythes \
 		librdf.so:textproc/redland \
 		libserf-1.so:www/serf
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/emojione-color-font-ttf/EmojiOneColor-SVGinOT.ttf:x11-fonts/emojione-color-font-ttf \
 		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \
 		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 DISTFILES+=	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
 		86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src \
 		cppunit-1.13.2.tar.gz:src
 
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
 
 .if defined(PRERELEASE)
 MASTER_SITES+=	http://dev-builds.libreoffice.org/pre-releases/src/
 .endif
 
 CONFLICTS_INSTALL=	libreoffice4-4.*
 
 INSTALL_TARGET=	distro-pack-install-strip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${LOVERSION}
 
 GNU_CONFIGURE=	yes
 USE_GL=		gl glew glu
 USE_OPENLDAP=	yes
 USE_PERL5=	build
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
 USES=		autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \
 		perl5 pkgconfig python shared-mime-info tar:xz
 
 OPTIONS_DEFINE=	CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
 		TEST WEBDAV
 OPTIONS_DEFAULT=	CUPS GTK2 MMEDIA
 
 GTK3_DESC=	GTK+ 3 GUI toolkit support (experimental)
 JAVA_DESC=	Add Java support (XML filters, macros)
 MMEDIA_DESC=	Enable multimedia backend for impress
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 SDK_DESC=	Build with SDK
 SYSTRAY_DESC=	Enable systemtray quickstarter
 TEST_DESC=	Run all regression tests
 WEBDAV_DESC=	Enable webdav protocol
 
 CUPS_CONFIGURE_ENABLE=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 GNOME_CONFIGURE_ENABLE=	dbus dconf
 GNOME_IMPLIES=	GTK2
 GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=	GNOME=dconf
 
 GTK_USE_GNOME=	gtk-update-icon-cache
 GTK_USES=	desktop-file-utils
 GTK_VARS=	POST_PLIST=add-plist-gnome
 
 GTK2_CONFIGURE_ENABLE=	gtk
 GTK2_USE=	GNOME=gtk20,${GTK_USE_GNOME}
 GTK2_USES=	${GTK_USES}
 GTK2_VARS=	${GTK_VARS}
 
 GTK3_CONFIGURE_ENABLE=	gtk3
 GTK3_USE=	GNOME=gtk30,${GTK_USE_GNOME}
 GTK3_USES=	${GTK_USES}
 GTK3_VARS=	${GTK_VARS}
 
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
 			${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec \
 			${JAVAJARDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \
 			${JAVAJARDIR}/commons-lang.jar:java/jakarta-commons-lang \
 			${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \
 			${JAVAJARDIR}/junit.jar:java/junit \
 			${JAVAJARDIR}/bsh.jar:lang/bsh
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-beanshell-jar=${JAVAJARDIR}/bsh.jar \
 			--with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
 			--with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
 			--with-commons-lang-jar=${JAVAJARDIR}/commons-lang.jar \
 			--with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar \
 			--without-system-jfreereport
 JAVA_CONFIGURE_WITH=	java
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
 		35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
 		39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
 		3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
 		798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \
 		8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \
 		8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \
 		97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
 		a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \
 		ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
 		ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
 JAVA_USE=	JAVA=yes
 JAVA_VARS=	JAVA_BUILD=yes
 
 KDE4_CONFIGURE_ENABLE=	kde4
 KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE_PREFIX}" \
 			QT4DIR="${PREFIX}" \
 			QT4INC="${QT_INCDIR}" \
 			QT4LIB="${QT_LIBDIR}"
 KDE4_USES=	kde:4
 KDE4_USE=	KDE=kdelibs QT4=moc_build,qmake_build
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer-1-0
 MMEDIA_USE=	GSTREAMER1=yes
 
 PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 PGSQL_USES=	pgsql
 
 SDK_BUILD_DEPENDS=	doxygen:devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_OFF=	--without-doxygen
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
 
 SYSTRAY_CONFIGURE_ENABLE=	systray
 
 TEST_ALL_TARGET_OFF=	build-nocheck
 TEST_CONFIGURE_ENABLE=	cve-tests
 
 WEBDAV_CONFIGURE_ENABLE=	neon
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 COLLADA_MODS=	COLLADABaseUtils COLLADAFramework \
 		COLLADASaxFrameworkLoader GeneratedSaxParser
 COLLADA_CFLAGS=	${COLLADA_MODS:S|^|-isystem ${LOCALBASE}/include/opencollada/|}
 COLLADA_LIBS=	-L${LOCALBASE}/lib/opencollada \
 		${COLLADA_MODS:S|^COLLADA|OpenCOLLADA|:S|^|-l|}
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-firebird-sdbc \
 		--disable-mergelibs \
 		--disable-online-update \
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-python=system \
 		--enable-release-build \
 		--exec-prefix=${PREFIX} \
 		--with-alloc=system \
 		--with-boost=${LOCALBASE} \
 		--with-build-version="FreeBSD ports ${PKGVERSION}" \
 		--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 		--with-external-thes-dir=${LOCALBASE}/share/mythes \
 		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
 		--with-os-version=${OSVERSION} \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-libs \
 		--with-system-libxml \
 		--with-system-opencollada \
 		--with-system-ucpp \
 		--with-system-zlib \
 		--with-vendor="FreeBSD ports" \
 		--without-fonts \
 		--without-myspell-dicts \
 		--without-system-cppunit
 
 CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
 		GNUTAR="${TAR}" \
 		GPERF=${LOCALBASE}/bin/gperf \
 		ICU_CFLAGS="`icu-config --cflags`" \
 		ICU_LIBS="`icu-config --ldflags`" \
 		OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
 		OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
 
 MAKE_ARGS+=	TMPDIR=${WRKDIR}
 MAKE_ENV+=	CXXFLAGS_WARN="${CXXFLAGS_WARN}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
 MAKE_ENV+=	DISPLAY=
 MAKE_ENV+=	verbose=1
 
 _MAKE_JOBS=	#
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .if ${COMPILER_FEATURES:Mlibstdc++}
 BROKEN=		Build with system libstdc++ is unsupported
 .endif
 .if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200003) || \
     (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100501) || \
     (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100122) || \
     ${OSVERSION} < 1003506
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx \
 		${PATCHDIR}/extrapatch-vcl_unx_gtk_gtkinst.cxx
 .endif
 .endif # FreeBSD
 
 .if ${COMPILER_TYPE} == "clang"
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-unused-parameter
 .if ${COMPILER_VERSION} >= 36
 CXXFLAGS_WARN+=	-Wno-unused-local-typedefs
 .endif
 .else
 CXXFLAGS_WARN=	-Wshadow -Woverloaded-virtual
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    ${WRKSRC}/shell/source/unix/exec/shellexec.cxx
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/autogen.lastrun
 
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s lib/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
 .for subdir in appdata application-registry applications bash-completion icons mime mime-info mimelnk
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
 
 post-install-SDK-on:
 .for subdir in include share share/doc share/idl
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST}
 .endfor
 
 add-plist-gnome:
 .for subdir in gnome hicolor locolor
 	@${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/editors/libreoffice/files/patch-configure
===================================================================
--- head/editors/libreoffice/files/patch-configure	(revision 458698)
+++ head/editors/libreoffice/files/patch-configure	(revision 458699)
@@ -1,20 +1,70 @@
---- configure.orig	2017-05-03 16:54:21 UTC
+--- configure.orig	2017-10-25 14:32:51 UTC
 +++ configure
-@@ -5039,7 +5039,7 @@ fi
+@@ -5074,7 +5074,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRODUCTNAME" >&5
  $as_echo "$PRODUCTNAME" >&6; }
  
 -PRODUCTNAME_WITHOUT_SPACES=${PRODUCTNAME// /}
 +PRODUCTNAME_WITHOUT_SPACES=$(echo "$PRODUCTNAME" | tr -d ' ')
  
  
  
-@@ -32392,7 +32392,7 @@ fi
+@@ -30076,12 +30076,12 @@ if test -n "$ORCUS_CFLAGS"; then
+     pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null`
++  pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.13 >= 0.13.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -30093,12 +30093,12 @@ if test -n "$ORCUS_LIBS"; then
+     pkg_cv_ORCUS_LIBS="$ORCUS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null`
++  pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.13 >= 0.13.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -30119,14 +30119,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
++	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
+         else
+-	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
++	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ORCUS_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met:
++	as_fn_error $? "Package requirements (liborcus-0.13 >= 0.13.0) were not met:
+ 
+ $ORCUS_PKG_ERRORS
+ 
+@@ -32542,7 +32542,7 @@ fi
  
  
  
 -    elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
 +    elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" -o "$_os" = "FreeBSD" \
              && test "$with_system_openssl" != "no"; then
          with_system_openssl=yes
          SYSTEM_OPENSSL=TRUE
Index: head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx
===================================================================
--- head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx	(revision 458699)
@@ -0,0 +1,40 @@
+--- sc/source/filter/inc/orcusinterface.hxx.orig	2017-10-25 14:25:39 UTC
++++ sc/source/filter/inc/orcusinterface.hxx
+@@ -183,7 +183,8 @@ class ScOrcusSheetProperties : public orcus::spreadshe
+ 
+     virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
+ 
+-    virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
++
++    virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
+ };
+ 
+ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
+@@ -243,6 +244,8 @@ class ScOrcusSheet : public orcus::spreadsheet::iface:
+         orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
+         const char* p, size_t n, const char* p_range, size_t n_range) override;
+ 
++    virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
++
+     SCTAB getIndex() const { return mnTab; }
+ };
+ 
+@@ -418,7 +421,7 @@ class ScOrcusStyles : public orcus::spreadsheet::iface
+     // border
+ 
+     virtual void set_border_count(size_t n) override;
+-    virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
++
+     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
+     virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
+             orcus::spreadsheet::color_elem_t alpha,
+@@ -508,7 +511,8 @@ class ScOrcusFactory : public orcus::spreadsheet::ifac
+ public:
+     ScOrcusFactory(ScDocument& rDoc);
+ 
+-    virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
++    virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
++        orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
+     virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
+     virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
+     virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;

Property changes on: head/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx
===================================================================
--- head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx	(revision 458699)
@@ -0,0 +1,59 @@
+--- sc/source/filter/orcus/interface.cxx.orig	2017-10-25 14:25:39 UTC
++++ sc/source/filter/orcus/interface.cxx
+@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
+     maStyles(rDoc),
+     mnProgress(0) {}
+ 
+-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
++orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
++    orcus::spreadsheet::sheet_t /*sheet_index*/, const char* sheet_name, size_t sheet_name_length)
+ {
+     OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
+     if (!maDoc.appendSheet(aTabName))
+@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t 
+         mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
+ }
+ 
+-void ScOrcusSheetProperties::set_merge_cell_range(const char* /*p_range*/, size_t /*n_range*/)
++void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /*range*/)
+ {
+ }
+ 
+@@ -576,6 +577,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrc
+         case orcus::spreadsheet::formula_grammar_t::gnumeric:
+             eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
+             break;
++        case orcus::spreadsheet::formula_grammar_t::xls_xml:
++            eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
++            break;
+         case orcus::spreadsheet::formula_grammar_t::unknown:
+             break;
+     }
+@@ -693,6 +697,15 @@ void ScOrcusSheet::set_array_formula(
+ {
+ }
+ 
++orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
++{
++    orcus::spreadsheet::range_size_t ret;
++    ret.rows = MAXROWCOUNT;
++    ret.columns = MAXCOLCOUNT;
++
++    return ret;
++}
++
+ ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
+     mrFactory(rFactory) {}
+ 
+@@ -1281,11 +1294,6 @@ size_t ScOrcusStyles::commit_fill()
+ void ScOrcusStyles::set_border_count(size_t /*n*/)
+ {
+     // needed at all?
+-}
+-
+-void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*dir*/, const char* /*s*/, size_t /*n*/)
+-{
+-    // implement later
+ }
+ 
+ void ScOrcusStyles::set_border_style(

Property changes on: head/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx
===================================================================
--- head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx	(revision 458699)
@@ -0,0 +1,11 @@
+--- sc/source/ui/docshell/datastream.cxx.orig	2017-10-25 14:25:39 UTC
++++ sc/source/ui/docshell/datastream.cxx
+@@ -84,7 +84,7 @@ class CSVHandler (public)
+     static void begin_row() {}
+     static void end_row() {}
+ 
+-    void cell(const char* p, size_t n)
++    void cell(const char* p, size_t n, bool /*transient*/)
+     {
+         if (mnCols >= mnColCount)
+             return;

Property changes on: head/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx
===================================================================
--- head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx	(nonexistent)
+++ head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx	(revision 458699)
@@ -0,0 +1,26 @@
+--- sfx2/source/control/emojiview.cxx.orig	2017-10-25 14:25:39 UTC
++++ sfx2/source/control/emojiview.cxx
+@@ -104,12 +104,12 @@ void EmojiView::Populate()
+     }
+ 
+     // TODO::populate view using the orcus json parser
+-    using node = orcus::json_document_tree::node;
++    using node = orcus::json::node;
+ 
+     // default json config
+     orcus::json_config config;
+ 
+-    orcus::json_document_tree aEmojiInfo;
++    orcus::json::document_tree aEmojiInfo;
+ 
+     // Load JSON string into a document tree.
+     aEmojiInfo.load(msJSONData, config);
+@@ -122,7 +122,7 @@ void EmojiView::Populate()
+         orcus::pstring key = *it;
+         node value = root.child(key);
+ 
+-        if(value.type() == orcus::json_node_t::object)
++        if(value.type() == orcus::json::node_t::object)
+         {
+             // iterate each element to get the keys
+             std::vector<orcus::pstring> aEmojiParams = value.keys();

Property changes on: head/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property