aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeld <feld@FreeBSD.org>2017-08-03 22:55:31 +0800
committerfeld <feld@FreeBSD.org>2017-08-03 22:55:31 +0800
commiteaee45bf2a23696776a0ad81a7dcaa2ba14b57c9 (patch)
treef00b2debf309fcce90b1ad3d3a1e10d8959aa3b3
parentd8ed4186a12c2f6c9b8472b67fa919916f6900a9 (diff)
downloadfreebsd-ports-eaee45bf2a23696776a0ad81a7dcaa2ba14b57c9.tar.gz
freebsd-ports-eaee45bf2a23696776a0ad81a7dcaa2ba14b57c9.tar.zst
freebsd-ports-eaee45bf2a23696776a0ad81a7dcaa2ba14b57c9.zip
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)
-rw-r--r--databases/mariadb102-server/Makefile2
-rw-r--r--databases/mariadb102-server/pkg-plist2
2 files changed, 1 insertions, 3 deletions
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index ce0436d674ed..596022cdfc84 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -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)
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index 0d67641a5ce3..16c102b40637 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -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