From owner-svn-ports-all@freebsd.org  Sat Jan 21 17:40:08 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 7A5F6CBB00F;
 Sat, 21 Jan 2017 17:40:08 +0000 (UTC)
 (envelope-from antoine@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 48F021893;
 Sat, 21 Jan 2017 17:40:08 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LHe7ZD048327;
 Sat, 21 Jan 2017 17:40:07 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LHe7o2048326;
 Sat, 21 Jan 2017 17:40:07 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201701211740.v0LHe7o2048326@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 21 Jan 2017 17:40:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432066 - in head/databases/mysql56-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-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2017 17:40:08 -0000

Author: antoine
Date: Sat Jan 21 17:40:07 2017
New Revision: 432066
URL: https://svnweb.freebsd.org/changeset/ports/432066

Log:
  Revert r432035 part 2, it breaks build with openssl from base
  
  With hat:	portmgr

Deleted:
  head/databases/mysql56-server/files/patch-cmake_ssl.cmake
Modified:
  head/databases/mysql56-server/Makefile

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Sat Jan 21 17:33:35 2017	(r432065)
+++ head/databases/mysql56-server/Makefile	Sat Jan 21 17:40:07 2017	(r432066)
@@ -54,7 +54,6 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ZLIB=system \
-		-DWITH_SSL=${OPENSSLBASE} \
 		-DINSTALL_MYSQLTESTDIR=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
@@ -130,6 +129,12 @@ PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--s
 
 .include <bsd.port.pre.mk>
 
+.if ${SSL_DEFAULT} == base
+CMAKE_ARGS+=		-DWITH_SSL=system
+.else
+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt