svn commit: r462089 - in branches/2018Q1/databases/mariadb102-server: . files

[Bernard Spil]

Author: brnrd
Date: Sat Feb 17 09:45:15 2018
New Revision: 462089
URL: https://svnweb.freebsd.org/changeset/ports/462089

Log:
  databases/mariadb102-server: Fix broken commit in 2018Q1
  
   - Missing intermediate commits merged
  
  PR:             225963
  Reported by:    <rainer ultra-secure de>
  
  Approved by:	portmgr (fixit blanket)

Deleted:
  branches/2018Q1/databases/mariadb102-server/files/patch-MDEV-14337
Modified:
  branches/2018Q1/databases/mariadb102-server/Makefile
  branches/2018Q1/databases/mariadb102-server/pkg-plist

Modified: branches/2018Q1/databases/mariadb102-server/Makefile
==============================================================================
--- branches/2018Q1/databases/mariadb102-server/Makefile	Sat Feb 17 09:42:12 2018	(r462088)
+++ branches/2018Q1/databases/mariadb102-server/Makefile	Sat Feb 17 09:45:15 2018	(r462089)
@@ -181,6 +181,13 @@ 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
+	${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)

Modified: branches/2018Q1/databases/mariadb102-server/pkg-plist
==============================================================================
--- branches/2018Q1/databases/mariadb102-server/pkg-plist	Sat Feb 17 09:42:12 2018	(r462088)
+++ branches/2018Q1/databases/mariadb102-server/pkg-plist	Sat Feb 17 09:45:15 2018	(r462089)
@@ -45,12 +45,6 @@ bin/wsrep_sst_mysqldump
 bin/wsrep_sst_rsync
 bin/wsrep_sst_xtrabackup
 bin/wsrep_sst_xtrabackup-v2
- at 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
- at comment include/mysql/mysqld_error.h
 include/mysql/server/private/embedded_priv.h
 @comment lib/mysql/libmariadb.so
 @comment lib/mysql/libmariadb.so.3
@@ -148,6 +142,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