From owner-svn-ports-all@freebsd.org  Mon Jul 24 11:00:04 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 777BBC7AD43;
 Mon, 24 Jul 2017 11:00:04 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4644F63F8D;
 Mon, 24 Jul 2017 11:00:04 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6OB03Gi045245;
 Mon, 24 Jul 2017 11:00:03 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6OB039E045241;
 Mon, 24 Jul 2017 11:00:03 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201707241100.v6OB039E045241@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Mon, 24 Jul 2017 11:00:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r446518 - head/databases/mariadb102-server
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: head/databases/mariadb102-server
X-SVN-Commit-Revision: 446518
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jul 2017 11:00:04 -0000

Author: brnrd
Date: Mon Jul 24 11:00:03 2017
New Revision: 446518
URL: https://svnweb.freebsd.org/changeset/ports/446518

Log:
  databases/mariadb102-server: Fix mysql_install_db
  
  PR:		218063
  Submitted by:	Joris Dedieu <joris.dedieu@gmail.com>
  MFH:		2017Q3

Modified:
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/pkg-plist

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Mon Jul 24 10:56:16 2017	(r446517)
+++ head/databases/mariadb102-server/Makefile	Mon Jul 24 11:00:03 2017	(r446518)
@@ -180,8 +180,6 @@ post-install:
 	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
 		${STAGEDIR}/${PREFIX}/share/pkgconfig
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
-# 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: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist	Mon Jul 24 10:56:16 2017	(r446517)
+++ head/databases/mariadb102-server/pkg-plist	Mon Jul 24 11:00:03 2017	(r446518)
@@ -195,7 +195,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/fill_help_tables.sql
 %%DATADIR%%/magic
 %%SPIDER%%%%DATADIR%%/install_spider.sql
-@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