From nobody Mon Apr 10 11:40:29 2023 X-Original-To: dev-commits-ports-main@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 4Pw6V81G4Rz457yw; Mon, 10 Apr 2023 11:40:32 +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 4Pw6V61sWVz4MXR; Mon, 10 Apr 2023 11:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681126830; 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=qM2PaMr7etbzqvovqvRn5k+sxvOCCqx4z5zivR+uwBc=; b=UHwelCKsx+oQuHJ86yh4xCp9DCBkxPsRi8CNifAo/pXgXCBzlP+g9Iok6Q6IuEpOBenjai 6AWIXsGz15yCa04Mf3mmqiQy8io8NeH2pM9gCW2ebHhj+6SVp9fHiLGIkEC+RLMUOaKkzJ OOeWskhiSB2zKYDrKNyswSKmFwmZiDMxz6w6Uhb/gYQ/w+KRFdVK3US7z/8J5tMliZ1Fvp AyuqWnCQqnJAfORpS03SAuw4jc8NeqW8zdDeX1nYiLtACypDAZEd13F3eR7qjs6LDrtWVw aueylPwNTIJuCZrB8hEY/1+zde4NQ+LsUi9aRE/bSHUkYSwRd2/klJMHPk3bOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681126830; 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=qM2PaMr7etbzqvovqvRn5k+sxvOCCqx4z5zivR+uwBc=; b=JZVljeE6jZdCqI1E5E5JNFbG5g9O10S4Ry8DUYW+bsA/NszE+v4GiIoEFmWQkIbx9Hp23C 4vBLTOMxVxPx5UpZr9zPVVfbmYsB8JwbObHZYO5jI5fRLOA4iBTRxk5sjTwTiUJYCulUZ/ HbKLaTdA90tCmbL8mFUVDbaYD5M4iDWKqrIsSZvQp+v8qYjIqc0UZxTWgJFXC3AP+mQ95j G5hOtVgh7xTEfHucoYvkXbtR1MOCUhbqg4HbcQztaxeQe5ScF01VljNq6V1q4wu2iFuLl/ hjc7KT80Y5idZQjehTYVFnwjbkRQ/hZ112K7pnvcAfA5rYE4ZtiXHbbQUGjTtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681126830; a=rsa-sha256; cv=none; b=SepsAsD4bD7Lb2jBfMYeAyTgf4elEYkOjlDmNtCr4DIc/dZWOlTRBCck75UWAsldkU7Vhc 3ufDhcLHsYOoEjDajmGWDd/IaegiCwzrR+sz6hGfKhMzDn4JTYcFp64ctJD5+hYedE2Vy7 KUI4vVHHngpIBkEbq0PR6hhE7KDICw/eoKGtGd1l34il6zVlDmK+oy2hdGuwzA+JDCvKju XgCtTzYHq82LjsVGTKS1/CCaCWedxQkQf5YhGwwMIVHGsx2+DpOc/7oHtRMaND2tmIm3uV lcSolaeMRYA/yUERGXHxBErEC0bfZ4uaoIHExCrd1faHxm9Qx/HkqCOxfrgZfg== 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 4Pw6V52fbBznrQ; Mon, 10 Apr 2023 11:40:29 +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 33ABeT0w073886; Mon, 10 Apr 2023 11:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ABeT9J073885; Mon, 10 Apr 2023 11:40:29 GMT (envelope-from git) Date: Mon, 10 Apr 2023 11:40:29 GMT Message-Id: <202304101140.33ABeT9J073885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 3f5ce6a80dd9 - main - databases/mariadb105-server: Update conflicts for 10.0.11 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 3f5ce6a80dd99332a63661c6f8b418ca1c0fd6df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f5ce6a80dd99332a63661c6f8b418ca1c0fd6df commit 3f5ce6a80dd99332a63661c6f8b418ca1c0fd6df Author: Bernard Spil AuthorDate: 2023-04-10 11:39:16 +0000 Commit: Bernard Spil CommitDate: 2023-04-10 11:40:23 +0000 databases/mariadb105-server: Update conflicts for 10.0.11 * All remaining MariaDB ports --- 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 2bbf28b692ca..716614ac4078 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -115,6 +115,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]*-//}