git: b50fe1ebe572 - main - shells/ksh: Remove the now expired ksh2020 from CONFLICTS.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Mar 2023 06:05:15 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b50fe1ebe5728883f6dc2b02d9f1f9a23f9b0047
commit b50fe1ebe5728883f6dc2b02d9f1f9a23f9b0047
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-03-23 06:03:58 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
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