From owner-svn-ports-head@freebsd.org Wed Aug 24 18:56:35 2016 Return-Path: Delivered-To: svn-ports-head@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 C9BBFBC5756; Wed, 24 Aug 2016 18:56:35 +0000 (UTC) (envelope-from brnrd@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 8DA881C2C; Wed, 24 Aug 2016 18:56:35 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OIuY56067660; Wed, 24 Aug 2016 18:56:34 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OIuYlq067657; Wed, 24 Aug 2016 18:56:34 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201608241856.u7OIuYlq067657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 24 Aug 2016 18:56:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420816 - in head/databases: mysql57-client/files mysql57-server mysql57-server/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-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 18:56:35 -0000 Author: brnrd Date: Wed Aug 24 18:56:34 2016 New Revision: 420816 URL: https://svnweb.freebsd.org/changeset/ports/420816 Log: databases/mysql57-server: Fix build with LibreSSL - Fix building when OPENSSL_VERSION_NUMBER == 2 - Switch USE_OPENSSL to USES= ssl PR: 211770 Submitted by: Markus Kohlmeyer Reported by: Markus Kohlmeyer Approved by: Mahdi Mokhtari MFH: 2016Q3 Added: head/databases/mysql57-client/files/patch-cmake_ssl.cmake (contents, props changed) head/databases/mysql57-server/files/patch-cmake_ssl.cmake (contents, props changed) Modified: head/databases/mysql57-server/Makefile Added: head/databases/mysql57-client/files/patch-cmake_ssl.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmake_ssl.cmake Wed Aug 24 18:56:34 2016 (r420816) @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF() Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Wed Aug 24 18:51:02 2016 (r420815) +++ head/databases/mysql57-server/Makefile Wed Aug 24 18:56:34 2016 (r420816) @@ -17,9 +17,9 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SLAVEDIRS= databases/mysql57-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix +USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ + cpe libedit localbase perl5 shebangfix ssl -USE_OPENSSL= yes USE_PERL5= run MY_DBDIR= /var/db/mysql Added: head/databases/mysql57-server/files/patch-cmake_ssl.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-cmake_ssl.cmake Wed Aug 24 18:56:34 2016 (r420816) @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF()