svn commit: r447219 - branches/2017Q3/databases/mariadb102-server

[Mark Felder]

Author: feld
Date: Thu Aug  3 14:55:31 2017
New Revision: 447219
URL: https://svnweb.freebsd.org/changeset/ports/447219

Log:
  MFH: r446518
  
  databases/mariadb102-server: Fix mysql_install_db
  
  PR:		218063
  Submitted by:	Joris Dedieu <joris.dedieu at gmail.com>
  
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2017Q3/databases/mariadb102-server/Makefile
  branches/2017Q3/databases/mariadb102-server/pkg-plist
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/databases/mariadb102-server/Makefile
==============================================================================
--- branches/2017Q3/databases/mariadb102-server/Makefile	Thu Aug  3 14:54:24 2017	(r447218)
+++ branches/2017Q3/databases/mariadb102-server/Makefile	Thu Aug  3 14:55:31 2017	(r447219)
@@ -179,8 +179,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/bin/mysqlaccess
 	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
 		${STAGEDIR}/${PREFIX}/share/pkgconfig
-# See https://mariadb.atlassian.net/browse/MDEV-9529
-	${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)

Modified: branches/2017Q3/databases/mariadb102-server/pkg-plist
==============================================================================
--- branches/2017Q3/databases/mariadb102-server/pkg-plist	Thu Aug  3 14:54:24 2017	(r447218)
+++ branches/2017Q3/databases/mariadb102-server/pkg-plist	Thu Aug  3 14:55:31 2017	(r447219)
@@ -193,7 +193,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/fill_help_tables.sql
 %%DATADIR%%/magic
 %%SPIDER%%%%DATADIR%%/install_spider.sql
- at comment %%DATADIR%%/maria_add_gis_sp.sql
+%%DATADIR%%/maria_add_gis_sp.sql
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
 %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql