git: 36a0aafc8e14 - 2023Q2 - databases/mariadb105-server: Update conflicts for 10.0.11

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Wed, 31 May 2023 12:06:53 UTC
The branch 2023Q2 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=36a0aafc8e14c44cbbdb76ee1f37caf1176c28a9

commit 36a0aafc8e14c44cbbdb76ee1f37caf1176c28a9
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-04-10 11:39:16 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-05-31 12:04:16 +0000

    databases/mariadb105-server: Update conflicts for 10.0.11
    
     * All remaining MariaDB ports
    
    (cherry picked from commit 3f5ce6a80dd99332a63661c6f8b418ca1c0fd6df)
---
 databases/mariadb103-server/Makefile | 1 +
 databases/mariadb104-server/Makefile | 1 +
 databases/mariadb105-server/Makefile | 1 +
 3 files changed, 3 insertions(+)

diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 2998a99c979f..466eb9920306 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -102,6 +102,7 @@ DISABLED_PLUGINS+=	DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
 DATADIR=	${PREFIX}/share/mysql
 
 CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysqlwsrep*-server \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index ce2439156ee4..f78509b05303 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -112,6 +112,7 @@ DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
 CONFLICTS_INSTALL=	mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysqlwsrep*-server \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 61bff4323c5f..bae23221a78c 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -121,6 +121,7 @@ DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
 CONFLICTS_INSTALL=	mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
 			mysqlwsrep*-server \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}