git: 640802444aac - main - shells/ksh-devel: Fixup conflict with ksh93
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Feb 2026 18:45:48 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=640802444aac631cbc0755389f412abfceb4e13b
commit 640802444aac631cbc0755389f412abfceb4e13b
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-02-27 18:45:01 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-02-27 18:45:01 +0000
shells/ksh-devel: Fixup conflict with ksh93
ksh-devel only conflicts with ksh93 when it installs the same binary.
---
shells/ksh-devel/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile
index 5783f67a977d..5ed155352059 100644
--- a/shells/ksh-devel/Makefile
+++ b/shells/ksh-devel/Makefile
@@ -34,7 +34,7 @@ GH_TAGNAME= ${HASH}
# $PATH.
KSH_CONFLICTS= pdksh
KSH93_CONFLICTS= ksh93 ast-ksh
-KSH93D_CONFLICTS= ksh93 ast-ksh
+KSH93D_CONFLICTS= ast-ksh
OPTIONS_DEFAULT= KSH93 EXAMPLES
OPTIONS_DEFINE= EXAMPLES STATIC