From owner-svn-ports-branches@freebsd.org  Thu Aug  3 14:55:32 2017
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 EB79FDC1AB2;
 Thu,  3 Aug 2017 14:55:32 +0000 (UTC)
 (envelope-from feld@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 BA0D380BB5;
 Thu,  3 Aug 2017 14:55:32 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v73EtVk4076711;
 Thu, 3 Aug 2017 14:55:31 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v73EtV2b076709;
 Thu, 3 Aug 2017 14:55:31 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201708031455.v73EtV2b076709@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 3 Aug 2017 14:55:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r447219 - branches/2017Q3/databases/mariadb102-server
X-SVN-Group: ports-branches
X-SVN-Commit-Author: feld
X-SVN-Commit-Paths: branches/2017Q3/databases/mariadb102-server
X-SVN-Commit-Revision: 447219
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Aug 2017 14:55:33 -0000

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@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
-@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