From owner-svn-ports-all@freebsd.org Sat Feb 17 09:45:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1AE58F20C20; Sat, 17 Feb 2018 09:45:16 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0952714FA; Sat, 17 Feb 2018 09:45:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A24871B02F; Sat, 17 Feb 2018 09:45:15 +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 w1H9jFwa011703; Sat, 17 Feb 2018 09:45:15 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1H9jFsi011701; Sat, 17 Feb 2018 09:45:15 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201802170945.w1H9jFsi011701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 17 Feb 2018 09:45:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462089 - in branches/2018Q1/databases/mariadb102-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q1/databases/mariadb102-server: . files X-SVN-Commit-Revision: 462089 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Feb 2018 09:45:16 -0000 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: 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 -@comment include/mysql/my_config.h -@comment include/mysql/my_global.h -@comment include/mysql/my_sys.h -@comment include/mysql/mysql_com.h -@comment include/mysql/mysql_version.h -@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