From owner-svn-ports-all@freebsd.org Tue Jun 14 04:42:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF3E1AF29D0; Tue, 14 Jun 2016 04:42:14 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 870532993; Tue, 14 Jun 2016 04:42:14 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5E4gDH5055126; Tue, 14 Jun 2016 04:42:13 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5E4gD2I055122; Tue, 14 Jun 2016 04:42:13 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201606140442.u5E4gD2I055122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 14 Jun 2016 04:42:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416875 - in head/editors: libreoffice libreoffice/files libreoffice4 libreoffice4/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 04:42:14 -0000 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