svn commit: r459005 - in head/databases: mariadb102-client mariadb102-server mariadb102-server/files

[Bernard Spil]

Author: brnrd
Date: Sun Jan 14 21:53:59 2018
New Revision: 459005
URL: https://svnweb.freebsd.org/changeset/ports/459005

Log:
  databases/mariadb102-server: Update to 10.2.12
  
   - Fix some client utility builds [1]
  
  PR:		222825 [1]
  Submitted by:	Piotr Kubaj [1]

Deleted:
  head/databases/mariadb102-server/files/patch-MDEV-14337
Modified:
  head/databases/mariadb102-client/Makefile
  head/databases/mariadb102-client/pkg-plist
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/distinfo
  head/databases/mariadb102-server/pkg-plist

Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb102-client/Makefile	Sun Jan 14 21:38:50 2018	(r459004)
+++ head/databases/mariadb102-client/Makefile	Sun Jan 14 21:53:59 2018	(r459005)
@@ -29,7 +29,9 @@ post-configure:
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
+.	for f in server my_global.h my_sys.h mysql_com.h mysql_version.h
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/${f}
+.	endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/policy
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388

Modified: head/databases/mariadb102-client/pkg-plist
==============================================================================
--- head/databases/mariadb102-client/pkg-plist	Sun Jan 14 21:38:50 2018	(r459004)
+++ head/databases/mariadb102-client/pkg-plist	Sun Jan 14 21:53:59 2018	(r459005)
@@ -22,14 +22,10 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
 include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.so

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Sun Jan 14 21:38:50 2018	(r459004)
+++ head/databases/mariadb102-server/Makefile	Sun Jan 14 21:53:59 2018	(r459005)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.11
-PORTREVISION?=	1
+PORTVERSION=	10.2.12
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -180,6 +180,12 @@ post-install:
 	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
 		${STAGEDIR}/${PREFIX}/share/pkgconfig
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
+	${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \
+		${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \
+		${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
+		${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \
+		${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \
+		${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)

Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo	Sun Jan 14 21:38:50 2018	(r459004)
+++ head/databases/mariadb102-server/distinfo	Sun Jan 14 21:53:59 2018	(r459005)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512075561
-SHA256 (mariadb-10.2.11.tar.gz) = 63555a810db905175a8bd714f6ec77d1b1a11fcfa6d4b97b448cf5bcb6caa3e8
-SIZE (mariadb-10.2.11.tar.gz) = 72772830
+TIMESTAMP = 1515105515
+SHA256 (mariadb-10.2.12.tar.gz) = 2ab22d7fbacfabc30fe18f71a8afb173250074502d889457e3cde2e203d341ec
+SIZE (mariadb-10.2.12.tar.gz) = 72818636

Modified: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist	Sun Jan 14 21:38:50 2018	(r459004)
+++ head/databases/mariadb102-server/pkg-plist	Sun Jan 14 21:53:59 2018	(r459005)
@@ -45,10 +45,10 @@ bin/wsrep_sst_rsync
 bin/wsrep_sst_xtrabackup
 bin/wsrep_sst_xtrabackup-v2
 @comment include/mysql/my_config.h
- at comment include/mysql/my_global.h
- at comment include/mysql/my_sys.h
- at comment include/mysql/mysql_com.h
- at comment include/mysql/mysql_version.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
 @comment include/mysql/mysqld_error.h
 include/mysql/server/private/embedded_priv.h
 @comment lib/mysql/libmariadb.so
@@ -147,6 +147,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
 %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
 %%DATADIR%%/my-huge.cnf
 %%DATADIR%%/my-innodb-heavy-4G.cnf
 %%DATADIR%%/my-large.cnf
@@ -162,3 +163,9 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/wsrep.cnf
 %%DATADIR%%/wsrep_notify
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/EXCEPTIONS-CLIENT
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-wsrep
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga/README.md