From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 10 15:22:13 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7EBD14B7;
 Tue, 10 Jun 2014 15:22:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6BC332229;
 Tue, 10 Jun 2014 15:22:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5AFMD7Z060772;
 Tue, 10 Jun 2014 15:22:13 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5AFMD2l060771;
 Tue, 10 Jun 2014 15:22:13 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201406101522.s5AFMD2l060771@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 10 Jun 2014 15:22:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r357334 - head/databases/mariadb55-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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jun 2014 15:22:13 -0000

Author: bdrewery
Date: Tue Jun 10 15:22:12 2014
New Revision: 357334
URL: http://svnweb.freebsd.org/changeset/ports/357334
QAT: https://qat.redports.org/buildarchive/r357334/

Log:
  - Explain to user how to build if they have openssl installed. Another option
    is to auto select OPENSSL and PORTSSL options but I stuck with letting the
    user make that decision.
  
  PR:		186566
  Reported by:	agifford@infowest.com

Modified:
  head/databases/mariadb55-server/Makefile

Modified: head/databases/mariadb55-server/Makefile
==============================================================================
--- head/databases/mariadb55-server/Makefile	Tue Jun 10 15:20:59 2014	(r357333)
+++ head/databases/mariadb55-server/Makefile	Tue Jun 10 15:22:12 2014	(r357334)
@@ -83,9 +83,14 @@ CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
+.if exists(${LOCALBASE}/include/openssl/opensslv.h)
+.  if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
+IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
+.  endif
+.endif
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
-.if empty(PORT_OPTIONS:MPORTSSL)
+.if !${PORT_OPTIONS:MPORTSSL}
 WITH_OPENSSL_BASE=	yes
 .else
 WITH_OPENSSL_PORT=	yes