Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 May 2021 12:52:10 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0d0601924851 - main - databases/mariadb105-client: Do not install server-related man page.
Message-ID:  <202105221252.14MCqAah062186@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0d06019248512331e8fd160abcfc6b5cf0839c18

commit 0d06019248512331e8fd160abcfc6b5cf0839c18
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-05-22 12:49:25 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
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 <brnrd@FreeBSD.org>
 
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105221252.14MCqAah062186>