Index: branches/2016Q2/databases/mariadb100-server/Makefile
===================================================================
--- branches/2016Q2/databases/mariadb100-server/Makefile	(revision 415085)
+++ branches/2016Q2/databases/mariadb100-server/Makefile	(revision 415086)
@@ -1,165 +1,167 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.0.25
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
 		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
 		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
 		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
 		http://mirror.layerjet.com/${SITESDIR}/ \
 		http://mirror.switch.ch/mirror/${SITESDIR}/
 PKGNAMESUFFIX?=	100-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb100-client
 USES=		bison:build cmake compiler:c++11-lib cpe execinfo gmake shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 
 OPTIONS_DEFINE=		FASTMTX
 NO_OPTIONS_SORT=	yes
 
 FASTMTX_DESC=		Replace mutexes with spinlocks
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mariadb" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mariadb" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR= \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR= \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_UNIT_TESTS=0 \
 		-DWITH_LIBEDIT=0 \
 		-DWITH_SSL=${OPENSSLBASE} \
 		-DWITH_LIBWRAP=1 \
 		-DEXECINFO_ROOT=${LOCALBASE} \
 		-DCOMPILATION_COMMENT="FreeBSD Ports"
 
 DATADIR=	${PREFIX}/share/mysql
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
 .endif
 
 CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 
 .if !defined(CLIENT_ONLY)
 # MySQL-Server options
 USE_LDCONFIG+=		${PREFIX}/lib/mysql/plugin
 OPTIONS_DEFINE+=	MAXKEY
 OPTIONS_DEFAULT+=	MAXKEY
 OPTIONS_GROUP=		ENGINES
 OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
 
 ENGINES_DESC=	Optional MariaDB storage engines
 INNOBASE_DESC=	Build InnoDB engine next to XtraDB
 MAXKEY_DESC=	Change max key length from 1000 to 4000
 MROONGA_DESC=	Mroonga Full Text Search engine
 OQGRAPH_DESC=	Open Query Graph Computation engine (Requires GCC)
 SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 TOKUDB_DESC=	Fractal tree index tree data structure engine
 
 OPTIONS_SUB=	yes
 
 TOKUDB_PORTDOCS=	PATENTS README.md
 
 .endif
 
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
 USE_OPENSSL=		yes
+# See PR209419, MariaDB 10.0 fails to build with base SSL libs
+WITH_OPENSSL_PORT=	yes
 
 .if defined(CLIENT_ONLY)
 # MySQL-Client part
 USES+=		readline
 .else
 # MySQL-Server part
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	100m
 USE_RC_SUBR=	mysql-server
 USERS=		mysql
 GROUPS=		mysql
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
 
 .for ENGINE in ${OPTIONS_GROUP_ENGINES}
 ${ENGINE}_CMAKE_OFF=    -DWITHOUT_${ENGINE}=1
 .endfor
 
 MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
 MROONGA_CMAKE_OFF=	-DWITHOUT_MROONGA=1
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 # Currently OQGraph does not build using clang.
 # See See https://mariadb.atlassian.net/browse/MDEV-8051.
 OQGRAPH_USE=		gcc
 OQGRAPH_BROKEN=		OQGraph does not build
 
 post-install:
 	# Remove programs to avoid conflict with mariadb100-client
 	# These are "client" components, so there should be a switch that
 	# prevents them from being installed but it's unknown right now
 	${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
 		${STAGEDIR}${PREFIX}/bin/mysql_config \
 		${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
 		${STAGEDIR}${PREFIX}/bin/mysqlaccess \
 		${STAGEDIR}${DOCSDIR}/COPYING.AGPLv3 \
 		${STAGEDIR}${DOCSDIR}/COPYING.GPLv2
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
 CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
 .else
 CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 .endif
 
 .if ${PORT_OPTIONS:MTOKUDB}
 NOT_FOR_ARCHS=  i386
 NOT_FOR_ARCHS_REASON=   TokuDB not supported on 32-bit platforms, see \
                         https://github.com/percona/PerconaFT/blob/master/README.md
 .endif
 
 .if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
 # Server segfaults on i386 when built with clang >= 3.4
 USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
 	@${RM} -rf ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
 	${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 415085)
+++ branches/2016Q2	(revision 415086)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r415024