From nobody Wed May 31 12:06:53 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QWSg15y71z4YbFQ; Wed, 31 May 2023 12:06:53 +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 4QWSg15CxKz3xW0; Wed, 31 May 2023 12:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WMpDkQJOJVtNS4OnvKWv5MyD9DyTxRUx6yzA4weDqdg=; b=xdxxkmVz2IZBk7cI5AOsvPg1c0MvCBuh3bmEYUEuhAA3eMLV0vH+4skWHWuN9iZiEWogca RMYCfFwGtQ72ucwlykqGgMgNxo529uLJYM4XyVAcYwppXTiyBN5g+NAKK/Mg6EKqwd1Tvy +mKlH6B7fBhqbXD2stcLFNDnLYvyeeaaL8x1uInMevFlkC4qzUhw4vE5Sqahxn0ewjtdt0 JpKgckV5F9EParK+UG1XrhOm3J4Qp4Kmj0sKeUa3ZmKqeeCUaltsdm833Lv96v6yYI2UXY ubSjt3Uk2fr4QPSCgzGRP4+Sg2dvHSUZ+YGzdRLVgEjdnYlISuSs/EdOTgCn3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WMpDkQJOJVtNS4OnvKWv5MyD9DyTxRUx6yzA4weDqdg=; b=dooAzTL/DeU4+Y18QCNse4Gaa7gVKK++aTFKqkBP8873yL0dMhGV/uO64dCrbZ0ugQywh8 6MJJKRpLsDhAqpPLle/9NkqqIe7OAaha0SeMZiBWqEleXT9upRTjxRaetqqm3x521vsGEy lxpBeXgKGXE36BJnlKPcaLzxGfMt6oKAqqnGYKWFhALYB9OtriL5VHizhJODeFfb3fiIho rL5cE7ogr8HotEQCQjLNUDVJf1/BuJi78nEh3matJhmc1JQDbZ18zXwypZOhgdwAxTl5FL QX6BTyMHmR7upOBCGhkZ1nMG7jpcc8kseCGUSMMRS0I+0UrYqm76/3rzR8uyAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685534813; a=rsa-sha256; cv=none; b=cru+mKqxVfamK+my6pFDvBNx8JZ23VaUx5E3HvxGT2VCjAJl3KQMIk2yd0K/B4Qbq20lRh VjWFbxSOb5V8ykN70g4fdh6YhvHhbMOvvuJnLux0I34qsH1W6Q1pbDRqClUX8nw1/mvWbD VRKNhUTgw6BKrjtL31mWLCtC4mIBd00gdF6hzq3A1CEQ59qaaJ9uUSRuQzF3A4AWuGtNP6 BTEB+z+7ix9bAv3NnSNpuu0bwTglEkK1yXioVheE5SZvh/A7XJ4bOtydbX/5vCOJnnsGNb b7P1UeiECC+jJvQB/ueUoH252IWdtAmeHTfO02Dd1kw/PUC8arae+o/DQOszyA== 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 4QWSg14HjSzZ52; Wed, 31 May 2023 12:06:53 +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 34VC6ruW094666; Wed, 31 May 2023 12:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VC6r3x094665; Wed, 31 May 2023 12:06:53 GMT (envelope-from git) Date: Wed, 31 May 2023 12:06:53 GMT Message-Id: <202305311206.34VC6r3x094665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 36a0aafc8e14 - 2023Q2 - databases/mariadb105-server: Update conflicts for 10.0.11 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 36a0aafc8e14c44cbbdb76ee1f37caf1176c28a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=36a0aafc8e14c44cbbdb76ee1f37caf1176c28a9 commit 36a0aafc8e14c44cbbdb76ee1f37caf1176c28a9 Author: Bernard Spil AuthorDate: 2023-04-10 11:39:16 +0000 Commit: Bernard Spil 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]*-//}