svn commit: r446485 - in branches/2017Q3/databases: percona55-server percona56-server

[Mark Felder]

Author: feld
Date: Sun Jul 23 14:39:58 2017
New Revision: 446485
URL: https://svnweb.freebsd.org/changeset/ports/446485

Log:
  MFH: r446475
  
  databases/percona55-server percona56-server:
  
  Fix OPENSSL option to actually enable linking with OpenSSL
  
  Differential Revision:	https://reviews.freebsd.org/D9122
  
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2017Q3/databases/percona55-server/Makefile
  branches/2017Q3/databases/percona56-server/Makefile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/databases/percona55-server/Makefile
==============================================================================
--- branches/2017Q3/databases/percona55-server/Makefile	Sun Jul 23 14:37:24 2017	(r446484)
+++ branches/2017Q3/databases/percona55-server/Makefile	Sun Jul 23 14:39:58 2017	(r446485)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	percona
 DISTVERSION=	5.5.54-38.6
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
 PKGNAMESUFFIX?=	55-server
@@ -48,7 +48,8 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
-CMAKE_ARGS+=	-DWITH_SSL=bundled
+CMAKE_ARGS+=	-DWITH_SSL=system
+OPENSSL_USES=	ssl
 .endif
 .if ${PORT_OPTIONS:MFASTMTX}
 CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1

Modified: branches/2017Q3/databases/percona56-server/Makefile
==============================================================================
--- branches/2017Q3/databases/percona56-server/Makefile	Sun Jul 23 14:37:24 2017	(r446484)
+++ branches/2017Q3/databases/percona56-server/Makefile	Sun Jul 23 14:39:58 2017	(r446485)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	percona
 DISTVERSION=	5.6.35-80.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
 PKGNAMESUFFIX?=	56-server
@@ -27,7 +27,8 @@ FASTMTX_DESC=	Replace mutexes with spinlocks
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
 INNODBMEMCACHED_DESC=	InnoDB Memcached plugin
 INNODBMEMCACHED_CMAKE_ON=	-DWITH_INNODB_MEMCACHED=1
-OPENSSL_CMAKE_ON=	-DWITH_SSL=bundled
+OPENSSL_CMAKE_ON=	-DWITH_SSL=system
+OPENSSL_USES=	ssl
 TOKUDB_DESC=	TokuDB Engine (experimental)
 TOKUDB_CMAKE_ON=	-DUSE_CTAGS=0
 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb