svn commit: r416875 - in head/editors: libreoffice libreoffice/files libreoffice4 libreoffice4/files

[Jung-uk Kim]

Author: jkim
Date: Tue Jun 14 04:42:13 2016
New Revision: 416875
URL: https://svnweb.freebsd.org/changeset/ports/416875

Log:
  Fix build on head.

Added:
  head/editors/libreoffice/files/patch-configure.ac   (contents, props changed)
Modified:
  head/editors/libreoffice/Makefile
  head/editors/libreoffice4/Makefile
  head/editors/libreoffice4/files/patch-configure.ac

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Tue Jun 14 01:50:33 2016	(r416874)
+++ head/editors/libreoffice/Makefile	Tue Jun 14 04:42:13 2016	(r416875)
@@ -253,8 +253,6 @@ CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dm
 		GPERF=${LOCALBASE}/bin/gperf \
 		OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
 		OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
-		OPENSSL_CFLAGS="-I/usr/include" \
-		OPENSSL_LIBS="-lcrypto -lssl" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
 

Added: head/editors/libreoffice/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-configure.ac	Tue Jun 14 04:42:13 2016	(r416875)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2016-05-04 21:28:24 UTC
++++ configure.ac
+@@ -9304,7 +9304,7 @@ if test "$enable_openssl" = "yes"; then
+ 
+         with_system_openssl=no
+         libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
+-    elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
++    elif test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
+             && test "$with_system_openssl" != "no"; then
+         with_system_openssl=yes
+         SYSTEM_OPENSSL=TRUE

Modified: head/editors/libreoffice4/Makefile
==============================================================================
--- head/editors/libreoffice4/Makefile	Tue Jun 14 01:50:33 2016	(r416874)
+++ head/editors/libreoffice4/Makefile	Tue Jun 14 04:42:13 2016	(r416875)
@@ -113,8 +113,6 @@ CONFIGURE_ENV=		DMAKE=${LOCALBASE}/bin/d
 			GPERF=${LOCALBASE}/bin/gperf \
 			OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
 			OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
-			OPENSSL_CFLAGS="-I/usr/include" \
-			OPENSSL_LIBS="-lcrypto -lssl" \
 			PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 			PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
 

Modified: head/editors/libreoffice4/files/patch-configure.ac
==============================================================================
--- head/editors/libreoffice4/files/patch-configure.ac	Tue Jun 14 01:50:33 2016	(r416874)
+++ head/editors/libreoffice4/files/patch-configure.ac	Tue Jun 14 04:42:13 2016	(r416875)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2015-01-28 07:00:34.000000000 -0500
-+++ configure.ac	2015-01-28 18:11:00.936172000 -0500
-@@ -7789,7 +7789,7 @@
+--- configure.ac.orig	2015-04-20 19:36:29 UTC
++++ configure.ac
+@@ -7798,7 +7798,7 @@ dnl Check for system libcmis
  dnl ===================================================================
  # libcmis requires curl and we can't build curl for iOS
  if test $_os != iOS; then
@@ -9,3 +9,12 @@
      ENABLE_CMIS=TRUE
  else
      ENABLE_CMIS=
+@@ -9428,7 +9428,7 @@ if test "$enable_openssl" = "yes"; then
+ 
+         with_system_openssl=no
+         libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
+-    elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
++    elif test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
+             && test "$with_system_openssl" != "no"; then
+         with_system_openssl=yes
+         SYSTEM_OPENSSL=TRUE