Re: pkg/58875: python: terminal colours broke in some applications

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

[cc pkgsrc-branch steward du jour jperkin}

The attached patch resolves the problem by using libreadline
unconditionally.  Maybe in the future if libedit is changed to support
colours (which christos tells me it does not right now) we can put the
option back, but until then I think we should have applications work
out of the box.

OK to commit?

From 8b3440b785cf4683bd91bad11ce055ce49c75897 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Date: Thu, 5 Dec 2024 15:25:21 +0000
Subject: [PATCH] lang/python311, lang/python312: Use libreadline
 unconditionally.

libedit breaks some applications.

PR pkg/58875: python: terminal colours broke in some applications
---
 lang/python311/options.mk | 8 ++------
 lang/python312/options.mk | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lang/python311/options.mk b/lang/python311/options.mk
index c057b81f38a2..4e4782124e27 100644
--- a/lang/python311/options.mk
+++ b/lang/python311/options.mk
@@ -41,12 +41,8 @@ CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${PKG_OPTIONS:Mreadline}
-.  include "../../mk/readline.buildlink3.mk"
-.  if ${READLINE_TYPE} == "editline"
-CONFIGURE_ARGS+=	--with-readline=editline
-.  else
-CONFIGURE_ARGS+=	--with-readline
-.  endif
+.  include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-readline=readline
 PLIST.readline=		yes
 .else
 CONFIGURE_ARGS+=	--without-readline
diff --git a/lang/python312/options.mk b/lang/python312/options.mk
index 3bc304fd8626..f09274e40f91 100644
--- a/lang/python312/options.mk
+++ b/lang/python312/options.mk
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${PKG_OPTIONS:Mreadline}
-.  include "../../mk/readline.buildlink3.mk"
+.  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-readline=readline
 PLIST.readline=		yes
 .else