From owner-dev-commits-ports-all@freebsd.org Sat May 22 12:52:12 2021 Return-Path: Delivered-To: dev-commits-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 042D764D66F; Sat, 22 May 2021 12:52:12 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FnNfM1781z4jnh; Sat, 22 May 2021 12:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AA6A24A45; Sat, 22 May 2021 12:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14MCqAnL062187; Sat, 22 May 2021 12:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14MCqAah062186; Sat, 22 May 2021 12:52:10 GMT (envelope-from git) Date: Sat, 22 May 2021 12:52:10 GMT Message-Id: <202105221252.14MCqAah062186@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 0d0601924851 - main - databases/mariadb105-client: Do not install server-related man page. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d06019248512331e8fd160abcfc6b5cf0839c18 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 12:52:12 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d06019248512331e8fd160abcfc6b5cf0839c18 commit 0d06019248512331e8fd160abcfc6b5cf0839c18 Author: Gleb Popov AuthorDate: 2021-05-22 12:49:25 +0000 Commit: Gleb Popov CommitDate: 2021-05-22 12:51:37 +0000 databases/mariadb105-client: Do not install server-related man page. This removes conflict betweem mariadb-client and mariadb-server with S3 option on. PR: 251622 --- databases/mariadb105-client/Makefile | 1 + databases/mariadb105-client/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile index 1374ded8512f..aa72da837c8d 100644 --- a/databases/mariadb105-client/Makefile +++ b/databases/mariadb105-client/Makefile @@ -1,6 +1,7 @@ # Created by: Bernard Spil PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 105-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist index c01c81b4c079..1e24b40d271a 100644 --- a/databases/mariadb105-client/pkg-plist +++ b/databases/mariadb105-client/pkg-plist @@ -88,7 +88,7 @@ libdata/pkgconfig/mariadb.pc @comment man/man1/aria_ftdump.1.gz @comment man/man1/aria_pack.1.gz @comment man/man1/aria_read_log.1.gz -man/man1/aria_s3_copy.1.gz +@comment man/man1/aria_s3_copy.1.gz @comment man/man1/galera_new_cluster.1.gz @comment man/man1/galera_recovery.1.gz @comment man/man1/innochecksum.1.gz