From nobody Thu Mar 23 06:05:15 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 4Phvvb5gTMz40tSh; Thu, 23 Mar 2023 06:05:15 +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 4Phvvb59C7z3MXR; Thu, 23 Mar 2023 06:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679551515; 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=iqpQd9j/Gmlm/oRZQUC1huQhSwUlAGo3T4WlMGqKR/g=; b=DVWCIF4w/gdaR/9IltEZ5YLKlwGnf1MUIhNQ3LEuO/OE7sAjtpzyKz/tdvfNBbTSq4jIBF VR0aQTxxTI2LITxV9G6fGFX5ESRXskxAmWIgclA/up7usufw/B0GAufO09X8f2VBECJFzG mv06rgXu0M9lv392yuXjFPju7NlYhiKj7aIP/kbj6uZc5GtTIp2doGjbp0bOFoLhW9WY8l 1zthu+vpEHo17ttMSfVJuuXJtSIJRM9vHdtoHbUw9AWBs0RSg729+7PZtXpsI40QP2O4ye NhZCIte3Nh54wuI86mR/2WQOEwCi6UlsZTIpelQQ8OY7wEl/lK7exaZ+YMGbOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679551515; 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=iqpQd9j/Gmlm/oRZQUC1huQhSwUlAGo3T4WlMGqKR/g=; b=uZZNOLKTFeCKwfR0webXdv0z6Qt/iZ/1JGlAOCUabtpp3Qi5VaneDUqvWw2U04XZRWkgn1 5gziGl3T9EqLTjBYnjQA218oKHRi5m+4vGHtJiU1IJPgYE20hkR6gKzOZVUqHxdMDvkPD0 GfpKgmS/tK82BpZI7K/zvv45INUiIf5A+/w4hmidtz4CWTnoKP/2K437si97vShkqJRCRS nLL24ntM1BMceF93xMdd4kd2lKaP8d+jHsV+P/0pgW0Ks+ipPbAU2hsydA9bRRW1JJcb0X S4EHDzzwWHnUpY4oPWm2t46zHoWpNIaSHLPGrFX3G8mnAXJQrjqdRKrHlLzEzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679551515; a=rsa-sha256; cv=none; b=whjKQWc03R8vNpaT4C3BkgcK550OLrPuvhgGFpILhrBD/Ho4Iql+QiBy7IjHA/03+cBQ2N umU20vNL65Dr8HEQ5Z06nt/qoJOf+GqF21FksQrlu0rUwH80JkcRg3vXqXfxzdDp56Xi2/ 02wOm7SlhGNqdNw+yGBydQSgHpEbPbVAgg517ObqTsfa7T3tWbAEy2bwEXgC+DlKvsalIz x3ePxvxt15L0teXsnMdccGDPS6MIhRQ2LdAlED4umPgxsHn1lLGN9arB4+4X4txi3R4aeT 4J13jrJOTUgmOxYr9t6Ma+u94GnZ+tN4BZr0EhMn+3AboTYcP93JmJBC3AemuA== 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 4Phvvb4CmrzPgF; Thu, 23 Mar 2023 06:05:15 +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 32N65FpH056864; Thu, 23 Mar 2023 06:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32N65Fkm056863; Thu, 23 Mar 2023 06:05:15 GMT (envelope-from git) Date: Thu, 23 Mar 2023 06:05:15 GMT Message-Id: <202303230605.32N65Fkm056863@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: b50fe1ebe572 - main - shells/ksh: Remove the now expired ksh2020 from CONFLICTS. 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b50fe1ebe5728883f6dc2b02d9f1f9a23f9b0047 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b50fe1ebe5728883f6dc2b02d9f1f9a23f9b0047 commit b50fe1ebe5728883f6dc2b02d9f1f9a23f9b0047 Author: Cy Schubert AuthorDate: 2023-03-23 06:03:58 +0000 Commit: Cy Schubert CommitDate: 2023-03-23 06:04:59 +0000 shells/ksh: Remove the now expired ksh2020 from CONFLICTS. --- shells/ast-ksh/Makefile | 2 +- shells/ksh-devel/Makefile | 4 ++-- shells/ksh/Makefile | 2 +- shells/ksh93/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile index f179994d100f..727f83d55ea9 100644 --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -33,7 +33,7 @@ GH_TAGNAME= ksh93v # IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in # arcane build failures due to already installed ksh/ksh93 in # $PATH. -CONFLICTS= ksh2020 ksh93 ksh93-devel +CONFLICTS= ksh93 ksh93-devel OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 5acc52492d8f..e298cfb5a242 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -37,8 +37,8 @@ GH_TAGNAME= ${HASH} # arcane build failures due to already installed ksh/ksh93 in # $PATH. KSH_CONFLICTS= pdksh -KSH93_CONFLICTS= ksh2020 ksh93 ast-ksh -KSH93D_CONFLICTS= ksh2020 ksh93 ast-ksh +KSH93_CONFLICTS= ksh93 ast-ksh +KSH93D_CONFLICTS= ksh93 ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile index ca0d38165128..dd37fa96e3ca 100644 --- a/shells/ksh/Makefile +++ b/shells/ksh/Makefile @@ -32,7 +32,7 @@ GH_PROJECT= ksh # arcane build failures due to already installed ksh/ksh93 in # $PATH. KSH_CONFLICTS= pdksh -KSH93_CONFLICTS= ksh2020 ksh93 ast-ksh ksh-devel +KSH93_CONFLICTS= ksh93 ast-ksh ksh-devel OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 59464583933c..99f597269aee 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -32,7 +32,7 @@ GH_ACCOUNT= att GH_PROJECT= ast KSH_CONFLICTS= pdksh -KSH93_CONFLICTS= ksh2020 ksh93-devel ast-ksh +KSH93_CONFLICTS= ksh93-devel ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC