4 files changed, 74 insertions, 12 deletions

diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile
index 313dc0e9bb43..f5098c445737 100644
--- a/databases/mariadb100-client/Makefile
+++ b/databases/mariadb100-client/Makefile
@@ -19,7 +19,8 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CLIENT_ONLY=	yes
 
-post-install:
+post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
+	${RM} -rf ${STAGEDIR}${PREFIX}/include/mysql/private
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 0381fa47b5d6..58892d9d2d3e 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.25
+PORTVERSION=	10.0.26
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -17,6 +17,9 @@ MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
+LICENSE_NAME_PerconaFT=	PerconaFT patents license
+LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
+LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_powerpc64=	Does not build
 
@@ -86,8 +89,6 @@ 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
@@ -120,17 +121,18 @@ OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 # See See https://mariadb.atlassian.net/browse/MDEV-8051.
 OQGRAPH_USE=		gcc
 OQGRAPH_BROKEN=		OQGraph does not build
+TOKUDB_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+TOKUDB_PORTDOCS=	PATENTS README.md
+TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 
 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
+.	for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \
+		bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2
+		${RM} ${STAGEDIR}${PREFIX}/${f}
+.	endfor
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo
index ae638e91070e..ad4bc80c0b29 100644
--- a/databases/mariadb100-server/distinfo
+++ b/databases/mariadb100-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mariadb-10.0.25.tar.gz) = 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4
-SIZE (mariadb-10.0.25.tar.gz) = 57459461
+TIMESTAMP = 1466794478
+SHA256 (mariadb-10.0.26.tar.gz) = 578538d9b51f455cbd0cb021f523284a45480b4bba853b4a79f3497c49ec40c0
+SIZE (mariadb-10.0.26.tar.gz) = 57621647
diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist
index 31682b9e86ef..2ceaa37b9723 100644
--- a/databases/mariadb100-server/pkg-plist
+++ b/databases/mariadb100-server/pkg-plist
@@ -35,7 +35,65 @@ bin/resolve_stack_dump
 bin/resolveip
 %%TOKUDB%%bin/tokuft_logprint
 %%TOKUDB%%bin/tokuftdump
+include/mysql/private/atomic/gcc_builtins.h
+include/mysql/private/atomic/generic-msvc.h
+include/mysql/private/atomic/nolock.h
+include/mysql/private/atomic/rwlock.h
+include/mysql/private/atomic/solaris.h
+include/mysql/private/atomic/x86-gcc.h
+include/mysql/private/base64.h
+include/mysql/private/config.h
 include/mysql/private/embedded_priv.h
+include/mysql/private/ft_global.h
+include/mysql/private/hash.h
+include/mysql/private/heap.h
+include/mysql/private/lf.h
+include/mysql/private/maria.h
+include/mysql/private/my_aes.h
+include/mysql/private/my_alarm.h
+include/mysql/private/my_atomic.h
+include/mysql/private/my_base.h
+include/mysql/private/my_bit.h
+include/mysql/private/my_bitmap.h
+include/mysql/private/my_check_opt.h
+include/mysql/private/my_compare.h
+include/mysql/private/my_context.h
+include/mysql/private/my_cpu.h
+include/mysql/private/my_default.h
+include/mysql/private/my_handler_errors.h
+include/mysql/private/my_libwrap.h
+include/mysql/private/my_md5.h
+include/mysql/private/my_nosys.h
+include/mysql/private/my_rdtsc.h
+include/mysql/private/my_rnd.h
+include/mysql/private/my_stacktrace.h
+include/mysql/private/my_time.h
+include/mysql/private/my_tree.h
+include/mysql/private/my_uctype.h
+include/mysql/private/my_user.h
+include/mysql/private/myisam.h
+include/mysql/private/myisamchk.h
+include/mysql/private/myisammrg.h
+include/mysql/private/myisampack.h
+include/mysql/private/mysql_async.h
+include/mysql/private/mysqld_default_groups.h
+include/mysql/private/mysys_err.h
+include/mysql/private/password.h
+include/mysql/private/probes_mysql.h
+include/mysql/private/probes_mysql_nodtrace.h
+include/mysql/private/queues.h
+include/mysql/private/rijndael.h
+include/mysql/private/service_versions.h
+include/mysql/private/sha1.h
+include/mysql/private/sha2.h
+include/mysql/private/t_ctype.h
+include/mysql/private/thr_alarm.h
+include/mysql/private/thr_lock.h
+include/mysql/private/thread_pool_priv.h
+include/mysql/private/violite.h
+include/mysql/private/waiting_threads.h
+include/mysql/private/welcome_copyright_notice.h
+include/mysql/private/wqueue.h
 lib/mysql/libmysqld.a
 lib/mysql/libmysqld.so
 lib/mysql/libmysqld.so.18