CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Dec  6 06:19:12 UTC 2024

Modified Files:
        pkgsrc/lang/python311: Makefile options.mk
        pkgsrc/lang/python312: Makefile options.mk
        pkgsrc/lang/python313: Makefile options.mk

Log Message:
lang/python*: Use libreadline unconditionally.

libedit breaks some applications.  Maybe we can fix it later but for
now let's just go back to using libreadline unconditionally like we
did before.

PKGREVISION++ because this materially affects the build product -- it
built before this change but didn't work right for some applications.
(No change to platforms without libedit -- which is most non-NetBSD
platforms, probably -- but we don't have per-platform PKGREVISION, so
gotta bump it for everyone.)

No change to 2.7, 3.9, or 3.10 because they already use libreadline
unconditionally; respecting READLINE_TYPE is a new change in >=3.11
since April which broke applications.

ok jperkin

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


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python311/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python312/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python313/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.35 pkgsrc/lang/python311/Makefile:1.36
--- pkgsrc/lang/python311/Makefile:1.35 Thu Dec  5 07:51:12 2024
+++ pkgsrc/lang/python311/Makefile      Fri Dec  6 06:19:12 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2024/12/05 07:51:12 adam Exp $
+# $NetBSD: Makefile,v 1.36 2024/12/06 06:19:12 riastradh Exp $
 
+PKGREVISION=   1
 .include "dist.mk"
 
 PKGNAME=       python311-${PY_DISTVERSION}

Index: pkgsrc/lang/python311/options.mk
diff -u pkgsrc/lang/python311/options.mk:1.3 pkgsrc/lang/python311/options.mk:1.4
--- pkgsrc/lang/python311/options.mk:1.3        Thu May  2 06:50:00 2024
+++ pkgsrc/lang/python311/options.mk    Fri Dec  6 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/05/02 06:50:00 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2024/12/06 06:19:12 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.python311
 PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11 readline
@@ -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

Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.22 pkgsrc/lang/python312/Makefile:1.23
--- pkgsrc/lang/python312/Makefile:1.22 Thu Dec  5 07:52:32 2024
+++ pkgsrc/lang/python312/Makefile      Fri Dec  6 06:19:12 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2024/12/05 07:52:32 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/12/06 06:19:12 riastradh Exp $
 
+PKGREVISION=   1
 .include "dist.mk"
 
 PKGNAME=       python312-${PY_DISTVERSION}

Index: pkgsrc/lang/python312/options.mk
diff -u pkgsrc/lang/python312/options.mk:1.8 pkgsrc/lang/python312/options.mk:1.9
--- pkgsrc/lang/python312/options.mk:1.8        Thu May  2 08:49:46 2024
+++ pkgsrc/lang/python312/options.mk    Fri Dec  6 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2024/05/02 08:49:46 jperkin Exp $
+# $NetBSD: options.mk,v 1.9 2024/12/06 06:19:12 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.python312
 PKG_SUPPORTED_OPTIONS= dtrace pymalloc tkinter x11 readline
@@ -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

Index: pkgsrc/lang/python313/Makefile
diff -u pkgsrc/lang/python313/Makefile:1.6 pkgsrc/lang/python313/Makefile:1.7
--- pkgsrc/lang/python313/Makefile:1.6  Thu Dec  5 07:54:03 2024
+++ pkgsrc/lang/python313/Makefile      Fri Dec  6 06:19:12 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2024/12/05 07:54:03 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/12/06 06:19:12 riastradh Exp $
 
+PKGREVISION=   1
 .include "dist.mk"
 
 PKGNAME=       python313-${PY_DISTVERSION}

Index: pkgsrc/lang/python313/options.mk
diff -u pkgsrc/lang/python313/options.mk:1.1 pkgsrc/lang/python313/options.mk:1.2
--- pkgsrc/lang/python313/options.mk:1.1        Wed Oct  9 19:53:19 2024
+++ pkgsrc/lang/python313/options.mk    Fri Dec  6 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/10/09 19:53:19 adam Exp $
+# $NetBSD: options.mk,v 1.2 2024/12/06 06:19:12 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.python313
 PKG_SUPPORTED_OPTIONS= dtrace pymalloc tkinter x11 readline
@@ -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