CVS commit: pkgsrc/lang/python311

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Tue Apr 30 17:01:15 UTC 2024

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

Log Message:
Add option "readline" enabled by default.
Either --with-readline=editline or --with-readline are added
  to CONFIGURE_ARGS depending on READLINE_TYPE.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python311/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.25 pkgsrc/lang/python311/Makefile:1.26
--- pkgsrc/lang/python311/Makefile:1.25 Fri Feb  2 15:50:55 2024
+++ pkgsrc/lang/python311/Makefile      Tue Apr 30 17:01:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/02/02 15:50:55 tsutsui Exp $
+# $NetBSD: Makefile,v 1.26 2024/04/30 17:01:15 cheusov Exp $
 
 .include "dist.mk"
 
@@ -38,7 +38,6 @@ USE_CC_FEATURES+=     c11
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=       --with-readline=readline # XXX editline?
 CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --with-system-ffi
 CONFIGURE_ARGS+=       --without-ensurepip
@@ -246,7 +245,6 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .endif
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"

Index: pkgsrc/lang/python311/options.mk
diff -u pkgsrc/lang/python311/options.mk:1.1 pkgsrc/lang/python311/options.mk:1.2
--- pkgsrc/lang/python311/options.mk:1.1        Mon Oct 31 09:50:40 2022
+++ pkgsrc/lang/python311/options.mk    Tue Apr 30 17:01:15 2024
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2022/10/31 09:50:40 adam Exp $
+# $NetBSD: options.mk,v 1.2 2024/04/30 17:01:15 cheusov Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.python311
-PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11
-PKG_SUGGESTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11 readline
+PKG_SUGGESTED_OPTIONS= x11 readline
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           dtrace
+PLIST_VARS+=           dtrace readline
 
 .if !empty(PKG_OPTIONS:Mdtrace)
 CONFIGURE_ARGS+=       --with-dtrace
@@ -39,3 +39,16 @@ CONFIGURE_ARGS+=     --with-pymalloc
 .else
 CONFIGURE_ARGS+=       --without-pymalloc
 .endif
+
+# readline/editline
+.if empty(PKG_OPTIONS:Mreadline)
+CONFIGURE_ARGS+= --without-readline
+.else
+.include "../../mk/readline.buildlink3.mk"
+.if ${READLINE_TYPE} == "editline"
+CONFIGURE_ARGS+= --with-readline=editline
+.else
+CONFIGURE_ARGS+= --with-readline
+.endif
+PLIST.readline=        yes
+.endif