From nobody Sun Dec 24 18:52:53 2023 X-Original-To: dev-commits-ports-all@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 4Syqsx3xwNz553Bk; Sun, 24 Dec 2023 18:52: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 4Syqsx3N61z4qt5; Sun, 24 Dec 2023 18:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703443973; 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=ozfwyUxwwtzF7tKZ+oOhoDcjvldE7QiJtf3UASuk6Jc=; b=U5XlF8D8tsH8Rfz1wnge65DD96uO/CLZ8u2T1JZFLaNJJjHg17ujGf1A7MPDlOjiscxlFz l/p6gNtUvL2+uGWONSQ4Ss0J8rbzAbmGpHfr9iKJJ7Op6Ym1Wn2oIGImExCBkfN6awaJxj C+QkOtKtkVTwOtOXqvAPDpNpM/DFbF+S1/OFccXobXgiTApgwkOsiEqIdF2bMjOzmxa+O5 lX6hax0nx6w8gbuMY8CAFk+niOPr9Z7QYN0aFklDrqMm2ACIStOgR4MDz5/fs9xQBRe614 dWtHeHO4zY1VIJGm9BLz7w26Z0jLm/8IMUdemkmdEIcJztXwoZX8c1G5TbVLuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703443973; a=rsa-sha256; cv=none; b=bk7MDZ3bfkH9zrI31WFn0z+dVGT1TXGGU5D/AtVqPBar0BnlZrYGP/2xtJ3pxEWC6kG2yz TzRsTQhlnjSH+MgOniPmcfqbjhHp19lUVbJBHH4pbtscwMHFU+ceNTOspTVLZEAgRBL5Qr g+LJ4SjJeDVv2aTmy/QF833WHdYv7aeB0Y5LNzHSIVyOHA8RhX0dvU1pijyzRgqDpQTnBl aTLNIDwG90GD4h8uqCCb3YN0PCfwm0BUF7lKMvCW2Xg4okfhtt4Rg4UfkxUowjd+i0+ju9 qdvHAjqoYLiWHDbIOvZDj1qs4PDrXyOF3EHyOlCcBnDrkC6Hxj+GNHo1ppyTQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703443973; 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=ozfwyUxwwtzF7tKZ+oOhoDcjvldE7QiJtf3UASuk6Jc=; b=iDIjAVk9exbTzDPBYjB+VYSVERc3xAKLnY/13IS+Pa85xqfDQerHWdiXa2ehWPVgNjU9iq FngG0O9DpcrLEIH9tkwdSlkxsNoveBUP+0fp+XBdpwu2xKNdJdRDf0aNkGsl/lhDh7n+Sg wbJhzsVjD/W0hlyY5EM5de+xxf721Ghaox5tKXS+QKcjWA/aOLW/1yZOGpwjtpiAfMsnpd fuCdI3VMf129oEAxthDwtf/Hq3+XqsWIBtFGEZWlmGmNSiCb4zeKAm40isJ5Eo4XyGKjRd /pEhAhqZyfFUDMFxeuiJjbTZio06EOVU0imXNM/1MZ+Qc5QAi6/3aTmuzymSyA== 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 4Syqsx2RSBzg4d; Sun, 24 Dec 2023 18:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BOIqrLJ041308; Sun, 24 Dec 2023 18:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BOIqrpB041305; Sun, 24 Dec 2023 18:52:53 GMT (envelope-from git) Date: Sun, 24 Dec 2023 18:52:53 GMT Message-Id: <202312241852.3BOIqrpB041305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 66f73a2a3fcd - main - Mk/Uses/mysql.mk: Remove percona57 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f73a2a3fcdb3abb848be066aced6da352615e2 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=66f73a2a3fcdb3abb848be066aced6da352615e2 commit 66f73a2a3fcdb3abb848be066aced6da352615e2 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-24 01:06:05 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-24 18:52:43 +0000 Mk/Uses/mysql.mk: Remove percona57 percona57-* was removed from the tree on 2023-10-01 as upstream support ended however the necessary codebase in the Mk infrastructure was still there. This commit removes thos unnecessary part and also syncs with bsd.default-version.mk. --- Mk/Uses/mysql.mk | 24 +++++------------------- Mk/bsd.default-versions.mk | 2 +- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index eb8419f56b59..5f805aa3fd6c 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -48,8 +48,6 @@ _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} _WANT_MYSQL_VER= ${_MYSQL_ARGS} . if (${_WANT_MYSQL_VER:C/[0-9]*//} == "m") _WANT_MYSQL_FLAVOUR= mariadb -. elif (${_WANT_MYSQL_VER:C/[0-9]*//} == "p") -_WANT_MYSQL_FLAVOUR= percona . else _WANT_MYSQL_FLAVOUR= mysql . endif @@ -65,7 +63,6 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. MYSQL57_LIBVER= 20 -MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL81_LIBVER= 22 . for v in 5 6 11 @@ -75,13 +72,9 @@ MYSQL10${v}m_LIBVER= 3 # Setting/finding MySQL version we want. . if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' -_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l -. if ${_PERCONA} == 1 -_MYSQL_VER= ${_MYSQL}p -_MYSQL_FLAVOUR= percona -. elif ${_MARIADB} == 1 +. if ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m _MYSQL_FLAVOUR= mariadb . else @@ -93,13 +86,11 @@ _MYSQL_FLAVOUR= mysql . if defined(_WANT_MYSQL_VER) . if defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m") WITH_MYSQL_FLAVOUR= mariadb -. elif defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "p") -WITH_MYSQL_FLAVOUR= percona . else WITH_MYSQL_FLAVOUR= mysql . endif . if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} -IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mpw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mpw]//}-client +IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mw]//}-client . endif MYSQL_VER= ${_WANT_MYSQL_VER} . elif defined(WITH_MYSQL_VER) @@ -114,15 +105,13 @@ MYSQL_VER= ${DEFAULT_MYSQL_VER} . if ${MYSQL_VER:C/[0-9]*//} == "m" MYSQL_FLAVOUR= mariadb -. elif ${MYSQL_VER:C/[0-9]*//} == "p" -MYSQL_FLAVOUR= percona . else MYSQL_FLAVOUR= mysql . endif . if defined(_MYSQL_VER) . if ${_MYSQL_VER} != ${MYSQL_VER} -IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mpw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mpw]//}-client +IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mw]//}-client . endif . endif @@ -133,9 +122,6 @@ _MYSQL_CLIENT_FLAVOUR= mariadb . if ${MYSQL_VER:C/m//} >= 105 _MYSQL_SHLIB= libmariadb . endif -. elif (${MYSQL_VER:C/[0-9]*//} == "p") -_MYSQL_SERVER_FLAVOUR= percona -_MYSQL_CLIENT_FLAVOUR= percona . elif (${MYSQL_VER:C/[0-9]*//} == "w") _MYSQL_SERVER_FLAVOUR= mysqlwsrep _MYSQL_CLIENT_FLAVOUR= mysql @@ -144,8 +130,8 @@ _MYSQL_SERVER_FLAVOUR= mysql _MYSQL_CLIENT_FLAVOUR= mysql . endif -_MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[mp]//}-client -_MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[mp]//}-server +_MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[m]//}-client +_MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[m]//}-server # And now we are checking if we can use it . if defined(MYSQL${MYSQL_VER}_LIBVER) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 132e461ffc62..ba10e8bbd983 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -105,7 +105,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 -# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m, 5.7p, 5.7w +# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m, 5.7w MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja