From owner-svn-ports-head@freebsd.org  Mon Sep 12 15:08:20 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 B8297BD8092;
 Mon, 12 Sep 2016 15:08:20 +0000 (UTC)
 (envelope-from marino@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 8A9F8CFA;
 Mon, 12 Sep 2016 15:08:20 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8CF8JJ9063227;
 Mon, 12 Sep 2016 15:08:19 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8CF8JRE063225;
 Mon, 12 Sep 2016 15:08:19 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609121508.u8CF8JRE063225@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 12 Sep 2016 15:08:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421927 - head/databases/mysql57-server
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2016 15:08:20 -0000

Author: marino
Date: Mon Sep 12 15:08:19 2016
New Revision: 421927
URL: https://svnweb.freebsd.org/changeset/ports/421927

Log:
  databass/mysql57-server: Fix configuration of non-base SSL on all platforms
  
  This simplifies the logic involved.  Now the port will present as BROKEN
  if it's built on FreeBSD 9 using the base SSL library.
  
  Approved by:	SSL blanket

Modified:
  head/databases/mysql57-server/Makefile

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Mon Sep 12 14:52:51 2016	(r421926)
+++ head/databases/mysql57-server/Makefile	Mon Sep 12 15:08:19 2016	(r421927)
@@ -128,27 +128,21 @@ PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
 .endif
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 ### Just for the sake of FreeBSD 9.X ###
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-.if !defined(CLIENT_ONLY)
+.  if !defined(CLIENT_ONLY)
 EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
-.endif
-WITH_OPENSSL_PORT=	yes
-CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
+.  endif
 .endif
 
-.include <bsd.port.pre.mk>
-
-### FreeBSD Version > 9.X ###
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
 .if ${SSL_DEFAULT} == base
+BROKEN_FreeBSD_9=	FreeBSD 9.x requires SSL from ports
 CMAKE_ARGS+=		-DWITH_SSL=system
 .else
 CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif
-.endif
 
 post-extract:
 	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h