Update to 4.3.4.

8 files changed, 67 insertions, 27 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 24327e658c74..ea2403884eb9 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Full integrated office productivity suite
 
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 51b946ef1f3a..59d340b63c14 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
-PORTVERSION=	4.3.3
-RCVER=		2
+PORTVERSION=	4.3.4
+RCVER=		1
 #PRERELEASE=	yes
 LOVERSION=	${PORTVERSION}.${RCVER}
 CATEGORIES?=	editors
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index c008935ceeeb..29caaf6465fb 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,11 +1,17 @@
+SHA256 (libreoffice/libreoffice-4.3.4.1.tar.xz) = a2413419dd635eccac20b4f9bf359661e218583af5d8a8c974fd02dc84975775
+SIZE (libreoffice/libreoffice-4.3.4.1.tar.xz) = 152803160
+SHA256 (libreoffice/libreoffice-help-4.3.4.1.tar.xz) = a9ab46e2f775a8914fd4377e4859da87344c05ad1ec928646cc40021717c71a3
+SIZE (libreoffice/libreoffice-help-4.3.4.1.tar.xz) = 1854700
+SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
+SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
+SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
+SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
+SHA256 (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4
+SIZE (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 9691335
 SHA256 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831
 SIZE (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
-SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
-SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
-SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
 SHA256 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2
 SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664
 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
@@ -16,8 +22,6 @@ SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112
 SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157
 SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
 SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610
-SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
-SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
 SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
 SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926
 SHA256 (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908
@@ -26,16 +30,12 @@ SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) =
 SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419
 SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721
-SHA256 (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4
-SIZE (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 9691335
 SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150
 SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
 SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311
 SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031
-SHA256 (libreoffice/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip) = d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
-SIZE (libreoffice/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip) = 5290295
 SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
 SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563
 SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
@@ -48,7 +48,3 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c803
 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
-SHA256 (libreoffice/libreoffice-4.3.3.2.tar.xz) = 60adfbae048e160fa4bef4bc67c7586e77ca72b437e0de52dc4b731e91cd7529
-SIZE (libreoffice/libreoffice-4.3.3.2.tar.xz) = 152744424
-SHA256 (libreoffice/libreoffice-help-4.3.3.2.tar.xz) = 5f1fbe1959ba67a5a9e99af50b10567b09e42541d7519760a7b21f8f6db3a46d
-SIZE (libreoffice/libreoffice-help-4.3.3.2.tar.xz) = 1855116
diff --git a/editors/libreoffice/files/patch-avmedia__Library_avmediaogl.mk b/editors/libreoffice/files/patch-avmedia__Library_avmediaogl.mk
new file mode 100644
index 000000000000..3c03d7bad785
--- /dev/null
+++ b/editors/libreoffice/files/patch-avmedia__Library_avmediaogl.mk
@@ -0,0 +1,11 @@
+--- avmedia/Library_avmediaogl.mk.orig	2014-11-10 06:52:56.000000000 -0500
++++ avmedia/Library_avmediaogl.mk	2014-11-25 15:42:07.000000000 -0500
+@@ -53,7 +53,7 @@
+ $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\
+ 	OpenGL \
+ ))
+-else ifeq ($(OS),LINUX)
++else ifneq ($(filter FREEBSD LINUX,$(OS)),)
+ $(eval $(call gb_Library_add_libs,avmediaogl,\
+     -lGL \
+ ))
diff --git a/editors/libreoffice/files/patch-chart2__Library_chartcore.mk b/editors/libreoffice/files/patch-chart2__Library_chartcore.mk
new file mode 100644
index 000000000000..d0b9567c3f11
--- /dev/null
+++ b/editors/libreoffice/files/patch-chart2__Library_chartcore.mk
@@ -0,0 +1,14 @@
+--- chart2/Library_chartcore.mk.orig	2014-11-10 06:52:56.000000000 -0500
++++ chart2/Library_chartcore.mk	2014-11-25 16:17:07.000000000 -0500
+@@ -261,6 +261,11 @@
+ $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\
+ 	OpenGL \
+ ))
++else ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_libs,chartcore,\
++	-lGL \
++	-lX11 \
++))
+ else ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_add_libs,chartcore,\
+ 	-ldl \
diff --git a/editors/libreoffice/files/patch-chart2__Library_chartopengl.mk b/editors/libreoffice/files/patch-chart2__Library_chartopengl.mk
new file mode 100644
index 000000000000..610d14f9eecd
--- /dev/null
+++ b/editors/libreoffice/files/patch-chart2__Library_chartopengl.mk
@@ -0,0 +1,14 @@
+--- chart2/Library_chartopengl.mk.orig	2014-11-10 06:52:56.000000000 -0500
++++ chart2/Library_chartopengl.mk	2014-11-25 16:22:54.000000000 -0500
+@@ -67,6 +67,11 @@
+ $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
+ 	OpenGL \
+ ))
++else ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_libs,chartopengl,\
++	-lGL \
++	-lX11 \
++))
+ else ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_add_libs,chartopengl,\
+ 	-ldl \
diff --git a/editors/libreoffice/files/patch-configure.ac b/editors/libreoffice/files/patch-configure.ac
deleted file mode 100644
index bcc1b3de7974..000000000000
--- a/editors/libreoffice/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2014-09-16 16:10:41.000000000 -0400
-+++ configure.ac	2014-10-08 20:58:07.000000000 -0400
-@@ -73,6 +73,7 @@
-         cd "$rel" || AC_MSG_ERROR([absolute path resolution failed for "$rel".])
-         absolute_path="$(pwd)"
-         cd - &> /dev/null
-+        cd "$BUILDDIR"
-     else
-         AC_MSG_ERROR([Failed to resolve absolute path.  "$rel" does not exist or is not a directory.])
-     fi
diff --git a/editors/libreoffice/files/patch-vcl__Library_vclopengl.mk b/editors/libreoffice/files/patch-vcl__Library_vclopengl.mk
new file mode 100644
index 000000000000..d30262f0c9c7
--- /dev/null
+++ b/editors/libreoffice/files/patch-vcl__Library_vclopengl.mk
@@ -0,0 +1,15 @@
+--- vcl/Library_vclopengl.mk.orig	2014-11-10 06:52:56.000000000 -0500
++++ vcl/Library_vclopengl.mk	2014-11-25 16:06:48.000000000 -0500
+@@ -53,6 +53,12 @@
+ $(eval $(call gb_Library_use_system_darwin_frameworks,vclopengl,\
+ 	OpenGL \
+ ))
++else ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_libs,vclopengl,\
++    -lGL \
++    -lGLU \
++    -lX11 \
++))
+ else ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_add_libs,vclopengl,\
+     -ldl \