From owner-svn-ports-all@freebsd.org Sun Dec 6 14:41:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5218647F089; Sun, 6 Dec 2020 14:41:17 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CppzK0C9Qz3w4v; Sun, 6 Dec 2020 14:41:16 +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 BFA8A11E05; Sun, 6 Dec 2020 14:41:16 +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 0B6EfGvq024887; Sun, 6 Dec 2020 14:41:16 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B6EfGLU024884; Sun, 6 Dec 2020 14:41:16 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202012061441.0B6EfGLU024884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 6 Dec 2020 14:41:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557137 - in head/databases: mariadb103-client mariadb103-server X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases: mariadb103-client mariadb103-server X-SVN-Commit-Revision: 557137 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.34 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: Sun, 06 Dec 2020 14:41:17 -0000 Author: brnrd Date: Sun Dec 6 14:41:15 2020 New Revision: 557137 URL: https://svnweb.freebsd.org/changeset/ports/557137 Log: databases/mariadb103-client: Don't overwrite my.cnf Reported by: Miroslav Lachman <000.fbsd quip cz> Modified: head/databases/mariadb103-client/Makefile head/databases/mariadb103-client/pkg-plist head/databases/mariadb103-server/Makefile Modified: head/databases/mariadb103-client/Makefile ============================================================================== --- head/databases/mariadb103-client/Makefile Sun Dec 6 14:23:51 2020 (r557136) +++ head/databases/mariadb103-client/Makefile Sun Dec 6 14:41:15 2020 (r557137) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mariadb103-client/pkg-plist ============================================================================== --- head/databases/mariadb103-client/pkg-plist Sun Dec 6 14:23:51 2020 (r557136) +++ head/databases/mariadb103-client/pkg-plist Sun Dec 6 14:41:15 2020 (r557137) @@ -43,7 +43,7 @@ include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h @comment etc/init.d/mysql @comment etc/logrotate.d/mysql -etc/my.cnf +@sample etc/my.cnf.sample @comment libexec/rcmysql %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.so Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb103-server/Makefile Sun Dec 6 14:23:51 2020 (r557136) +++ head/databases/mariadb103-server/Makefile Sun Dec 6 14:41:15 2020 (r557137) @@ -206,6 +206,7 @@ post-install: ${RM} -r ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/include/mysql/server \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${MV} ${STAGEDIR}${PREFIX}/etc/my.cnf ${STAGEDIR}${PREFIX}/etc/my.cnf.sample ${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d post-install-GSSAPI_NONE-off: