pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang
Module Name: pkgsrc
Committed By: wiz
Date: Mon Oct 23 06:36:01 UTC 2023
Modified Files:
pkgsrc/lang/python: egg.mk
pkgsrc/lang/python27: Makefile PLIST distinfo
pkgsrc/lang/python27/patches: patch-setup.py
pkgsrc/lang/python310: Makefile PLIST distinfo
pkgsrc/lang/python310/patches: patch-setup.py
pkgsrc/lang/python311: Makefile PLIST distinfo
pkgsrc/lang/python311/patches: patch-setup.py
pkgsrc/lang/python312: Makefile PLIST
pkgsrc/lang/python38: Makefile PLIST distinfo
pkgsrc/lang/python38/patches: patch-setup.py
pkgsrc/lang/python39: Makefile PLIST distinfo
pkgsrc/lang/python39/patches: patch-setup.py
Added Files:
pkgsrc/lang/python: batteries-included.mk
Log Message:
python*: include some standard modules in the base Python package
As proposed on tech-pkg
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/python/batteries-included.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.107 -r1.108 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python27/PLIST
cvs rdiff -u -r1.93 -r1.94 pkgsrc/lang/python27/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python27/patches/patch-setup.py
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/python310/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python310/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python310/patches/patch-setup.py
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python311/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python311/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python311/patches/patch-setup.py
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python312/Makefile \
pkgsrc/lang/python312/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python38/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/python38/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/python38/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python38/patches/patch-setup.py
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/python39/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/python39/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/python39/patches/patch-setup.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.40 pkgsrc/lang/python/egg.mk:1.41
--- pkgsrc/lang/python/egg.mk:1.40 Tue Jun 27 10:31:21 2023
+++ pkgsrc/lang/python/egg.mk Mon Oct 23 06:35:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.40 2023/06/27 10:31:21 riastradh Exp $
+# $NetBSD: egg.mk,v 1.41 2023/10/23 06:35:59 wiz Exp $
#
# Common logic to handle Python Eggs
#
@@ -41,9 +41,9 @@ USE_PKG_RESOURCES?= no
# py-setuptools.
BOOTSTRAP_SETUPTOOLS?= no
.if ${BOOTSTRAP_SETUPTOOLS} == "yes"
-TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
do-build: ensurepip
.PHONY: ensurepip
+.include "../../lang/python/batteries-included.mk"
ensurepip:
${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} -m ensurepip --user
Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.107 pkgsrc/lang/python27/Makefile:1.108
--- pkgsrc/lang/python27/Makefile:1.107 Tue Jun 27 10:35:29 2023
+++ pkgsrc/lang/python27/Makefile Mon Oct 23 06:35:59 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2023/06/27 10:35:29 riastradh Exp $
+# $NetBSD: Makefile,v 1.108 2023/10/23 06:35:59 wiz Exp $
.include "dist.mk"
PKGNAME= python27-${PY_DISTVERSION}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +14,12 @@ LICENSE= python-software-foundation
DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py27-cElementTree-[0-9]*
+CONFLICTS+= py27-curses-[0-9]*
+CONFLICTS+= py27-cursespanel-[0-9]*
+CONFLICTS+= py27-expat-[0-9]*
+CONFLICTS+= py27-readline-[0-9]*
+CONFLICTS+= py27-sqlite3-[0-9]*
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
@@ -31,6 +37,11 @@ LDFLAGS+= -L${WRKSRC}
# $RANDOM usage there is fine
CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
.include "../../mk/pthread.buildlink3.mk"
@@ -101,7 +112,7 @@ SUBST_FILES.sdkpath= Lib/distutils/unixc
SUBST_VARS.sdkpath= OSX_SDK_PATH
. endif
. if exists(${OSX_SDK_PATH}/System/Library/Frameworks/QuickTime.framework)
-PLIST.qt= yes
+PLIST.qt= yes
. endif
.endif
@@ -183,11 +194,11 @@ SUBST_SED.findlib= -e 's,/usr/local,${PR
SUBST_SED.findlib+= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
SUBST_NOOP_OK.findlib= yes
-SUBST_CLASSES+= pkgversion
-SUBST_STAGE.pkgversion= pre-configure
-SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
-SUBST_FILES.pkgversion+=Lib/distutils/command/install_egg_info.py
-SUBST_VARS.pkgversion= PKGVERSION_NOREV
+SUBST_CLASSES+= pkgversion
+SUBST_STAGE.pkgversion= pre-configure
+SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
+SUBST_FILES.pkgversion+= Lib/distutils/command/install_egg_info.py
+SUBST_VARS.pkgversion= PKGVERSION_NOREV
SUBST_CLASSES+= urllib
SUBST_MESSAGE.urllib= Fixing path to urllib.cfg.
@@ -226,15 +237,15 @@ post-install:
CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
.endif
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libffi/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python27/PLIST
diff -u pkgsrc/lang/python27/PLIST:1.5 pkgsrc/lang/python27/PLIST:1.6
--- pkgsrc/lang/python27/PLIST:1.5 Thu Aug 11 01:32:50 2022
+++ pkgsrc/lang/python27/PLIST Mon Oct 23 06:35:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/08/11 01:32:50 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/10/23 06:35:59 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1905,6 +1905,9 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_functools.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
@@ -1917,6 +1920,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_multiprocessing.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
@@ -1941,6 +1945,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/m
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
Index: pkgsrc/lang/python27/distinfo
diff -u pkgsrc/lang/python27/distinfo:1.93 pkgsrc/lang/python27/distinfo:1.94
--- pkgsrc/lang/python27/distinfo:1.93 Mon May 29 23:33:48 2023
+++ pkgsrc/lang/python27/distinfo Mon Oct 23 06:35:59 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.93 2023/05/29 23:33:48 gutteridge Exp $
+$NetBSD: distinfo,v 1.94 2023/10/23 06:35:59 wiz Exp $
BLAKE2s (Python-2.7.18.tar.xz) = 1b673ec8c9362a178e044691392bc4f67ad13457d7fddd84a88de346f23f9812
SHA512 (Python-2.7.18.tar.xz) = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
@@ -62,4 +62,4 @@ SHA1 (patch-Modules_sunaudiodev.c) = d83
SHA1 (patch-Python_thread__pthread.h) = 517cfefc2f2e13631d22bad28c327513cdf17c10
SHA1 (patch-configure) = a8bcacd360ca3a451c43a05a4be3bcea56f70617
SHA1 (patch-pyconfig.h.in) = 66d1a685e17ef7977bf09cdc64bdf80087216bc7
-SHA1 (patch-setup.py) = 4ab14fc01a1622b7a35bfb45b93a12d16dfc8b82
+SHA1 (patch-setup.py) = 9a4007fd03be0020d7997807c7fef0c2bd21fdfd
Index: pkgsrc/lang/python27/patches/patch-setup.py
diff -u pkgsrc/lang/python27/patches/patch-setup.py:1.3 pkgsrc/lang/python27/patches/patch-setup.py:1.4
--- pkgsrc/lang/python27/patches/patch-setup.py:1.3 Tue Sep 28 12:31:25 2021
+++ pkgsrc/lang/python27/patches/patch-setup.py Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.3 2021/09/28 12:31:25 jperkin Exp $
+$NetBSD: patch-setup.py,v 1.4 2023/10/23 06:36:00 wiz Exp $
Disable certain modules, so they can be built as separate packages.
Only check the BUILDLINK_DIR for libraries etc, do not pick up random
@@ -29,7 +29,7 @@ cygwin 2.7.3-no-libm.patch
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-+disabled_module_list = ["_bsddb", "bsddb185", "_curses", "_curses_panel", "_elementtree", "gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "linuxaudiodev", "ossaudiodev", "sunaudiodev"]
++disabled_module_list = ["_bsddb", "bsddb185", "gdbm", "_tkinter", "linuxaudiodev", "ossaudiodev", "sunaudiodev"]
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
Index: pkgsrc/lang/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.20 pkgsrc/lang/python310/Makefile:1.21
--- pkgsrc/lang/python310/Makefile:1.20 Tue Aug 15 14:39:08 2023
+++ pkgsrc/lang/python310/Makefile Mon Oct 23 06:36:00 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2023/08/15 14:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2023/10/23 06:36:00 wiz Exp $
.include "dist.mk"
PKGNAME= python310-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,6 +12,12 @@ COMMENT= Interpreted, interactive, objec
LICENSE= python-software-foundation
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py310-cElementTree-[0-9]*
+CONFLICTS+= py310-curses-[0-9]*
+CONFLICTS+= py310-cursespanel-[0-9]*
+CONFLICTS+= py310-expat-[0-9]*
+CONFLICTS+= py310-readline-[0-9]*
+CONFLICTS+= py310-sqlite3-[0-9]*
PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS=310
@@ -31,6 +38,11 @@ CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
@@ -209,11 +221,9 @@ setuptools-preinstall:
${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.if ${USE_BUILTIN.gettext:U:tl} == no
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=yes
@@ -223,7 +233,9 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdoma
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python310/PLIST
diff -u pkgsrc/lang/python310/PLIST:1.12 pkgsrc/lang/python310/PLIST:1.13
--- pkgsrc/lang/python310/PLIST:1.12 Thu Apr 6 11:16:52 2023
+++ pkgsrc/lang/python310/PLIST Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2023/04/06 11:16:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2023/10/23 06:36:00 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -2013,9 +2013,12 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_datetime.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_decimal.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
@@ -2035,6 +2038,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_statistics.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -2057,6 +2061,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/g
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Index: pkgsrc/lang/python310/distinfo
diff -u pkgsrc/lang/python310/distinfo:1.25 pkgsrc/lang/python310/distinfo:1.26
--- pkgsrc/lang/python310/distinfo:1.25 Fri Aug 25 08:26:49 2023
+++ pkgsrc/lang/python310/distinfo Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2023/08/25 08:26:49 adam Exp $
+$NetBSD: distinfo,v 1.26 2023/10/23 06:36:00 wiz Exp $
BLAKE2s (Python-3.10.13.tar.xz) = c714daeb2437980ce940e76db70f037d844bcddc06dddb6ac966cef281a2b514
SHA512 (Python-3.10.13.tar.xz) = 7579772e501486b2b07f78142082dee1e99c7643640098860ac0cf2ca87daf7588b0c00b1db1960146b37f56a6ed98fd08297c25c9a19b612cf6e6a258984da8
@@ -13,4 +13,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
SHA1 (patch-Python_thread__pthread.h) = bf1aeab011b3afedc02e68fcf5cef091b3e0aefa
SHA1 (patch-configure) = 8ffe98e51407d10e46e7d1531f2e0e0b58e1cfa6
SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = 0fd4a3eb38b324296e6da91612048f5d2dd10995
+SHA1 (patch-setup.py) = 5ab776a53ad361fdea9004817a7157743ab42db7
Index: pkgsrc/lang/python310/patches/patch-setup.py
diff -u pkgsrc/lang/python310/patches/patch-setup.py:1.6 pkgsrc/lang/python310/patches/patch-setup.py:1.7
--- pkgsrc/lang/python310/patches/patch-setup.py:1.6 Thu Jul 7 15:26:43 2022
+++ pkgsrc/lang/python310/patches/patch-setup.py Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.6 2022/07/07 15:26:43 khorben Exp $
+$NetBSD: patch-setup.py,v 1.7 2023/10/23 06:36:00 wiz Exp $
Disable certain modules, so they can be built as separate packages.
Do not look for ncursesw.
@@ -43,7 +43,7 @@ Enable cross-build by setting sys._home
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
-+DISABLED_MODULE_LIST = ["_curses", "_curses_panel", "_elementtree", "_gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "xxlimited"]
++DISABLED_MODULE_LIST = ["_gdbm", "_tkinter", "xxlimited"]
# --list-module-names option used by Tools/scripts/generate_module_names.py
LIST_MODULE_NAMES = False
Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.11 pkgsrc/lang/python311/Makefile:1.12
--- pkgsrc/lang/python311/Makefile:1.11 Fri Aug 25 08:28:22 2023
+++ pkgsrc/lang/python311/Makefile Mon Oct 23 06:36:00 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2023/08/25 08:28:22 adam Exp $
+# $NetBSD: Makefile,v 1.12 2023/10/23 06:36:00 wiz Exp $
.include "dist.mk"
PKGNAME= python311-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,6 +12,12 @@ COMMENT= Interpreted, interactive, objec
LICENSE= python-software-foundation
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py311-cElementTree-[0-9]*
+CONFLICTS+= py311-curses-[0-9]*
+CONFLICTS+= py311-cursespanel-[0-9]*
+CONFLICTS+= py311-expat-[0-9]*
+CONFLICTS+= py311-readline-[0-9]*
+CONFLICTS+= py311-sqlite3-[0-9]*
PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS=311
@@ -31,6 +38,11 @@ CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
@@ -207,11 +219,9 @@ setuptools-preinstall:
${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.if ${USE_BUILTIN.gettext:U:tl} == no
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=yes
@@ -221,7 +231,9 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdoma
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python311/PLIST
diff -u pkgsrc/lang/python311/PLIST:1.7 pkgsrc/lang/python311/PLIST:1.8
--- pkgsrc/lang/python311/PLIST:1.7 Mon Oct 2 19:59:04 2023
+++ pkgsrc/lang/python311/PLIST Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2023/10/02 19:59:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/10/23 06:36:00 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -2059,9 +2059,12 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_datetime.so
${PLIST.dbm}lib/python${PY_VER_SUFFIX}/lib-dynload/_dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_decimal.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
@@ -2081,6 +2084,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_statistics.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -2104,6 +2108,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/g
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Index: pkgsrc/lang/python311/distinfo
diff -u pkgsrc/lang/python311/distinfo:1.10 pkgsrc/lang/python311/distinfo:1.11
--- pkgsrc/lang/python311/distinfo:1.10 Mon Oct 2 19:59:04 2023
+++ pkgsrc/lang/python311/distinfo Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/10/02 19:59:04 adam Exp $
+$NetBSD: distinfo,v 1.11 2023/10/23 06:36:00 wiz Exp $
BLAKE2s (Python-3.11.6.tar.xz) = d1e2f7505bcc6bd571ce51df385712a1f82b01d6b9f7e7779694c148ca104a36
SHA512 (Python-3.11.6.tar.xz) = 94b1038f6f53de0c44f99f72ed0f2e0791fd9d2a325ae00ba145b2b2c332c27b300b3ea3473017518089478f15e01867b1bb203c16610039cce36f8366de341a
@@ -11,4 +11,4 @@ SHA1 (patch-Lib_sysconfig.py) = bc6d91bf
SHA1 (patch-Makefile.pre.in) = fdb5794d112f422a1f28aa9f8b179dc05520f9e1
SHA1 (patch-Modules_socketmodule.c) = dcf93806374bb8d983b7c8cefd7a3360a90064d7
SHA1 (patch-configure) = a6d9a00ff160581245bc30d1b0d2ec0e9da8fb0b
-SHA1 (patch-setup.py) = e9d63094f547bd0a9e00d4ded88ebcdfeb3a7ea2
+SHA1 (patch-setup.py) = a601ce207f5e61d15503c8781e925353d1e516b9
Index: pkgsrc/lang/python311/patches/patch-setup.py
diff -u pkgsrc/lang/python311/patches/patch-setup.py:1.1 pkgsrc/lang/python311/patches/patch-setup.py:1.2
--- pkgsrc/lang/python311/patches/patch-setup.py:1.1 Mon Oct 31 09:50:40 2022
+++ pkgsrc/lang/python311/patches/patch-setup.py Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.1 2022/10/31 09:50:40 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2023/10/23 06:36:00 wiz Exp $
Disable certain modules, so they can be built as separate packages.
Do not look for ncursesw.
@@ -44,7 +44,7 @@ Module _crypt might need -lcrypt (taken
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
-+DISABLED_MODULE_LIST = ["_curses", "_curses_panel", "_elementtree", "_gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "xxlimited"]
++DISABLED_MODULE_LIST = ["_gdbm", "_tkinter", "xxlimited"]
# --list-module-names option used by Tools/scripts/generate_module_names.py
LIST_MODULE_NAMES = False
Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.1 pkgsrc/lang/python312/Makefile:1.2
--- pkgsrc/lang/python312/Makefile:1.1 Mon Oct 2 20:07:14 2023
+++ pkgsrc/lang/python312/Makefile Mon Oct 23 06:36:00 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2023/10/02 20:07:14 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/10/23 06:36:00 wiz Exp $
.include "dist.mk"
PKGNAME= python312-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,6 +12,12 @@ COMMENT= Interpreted, interactive, objec
LICENSE= python-software-foundation
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py312-cElementTree-[0-9]*
+CONFLICTS+= py312-curses-[0-9]*
+CONFLICTS+= py312-cursespanel-[0-9]*
+CONFLICTS+= py312-expat-[0-9]*
+CONFLICTS+= py312-readline-[0-9]*
+CONFLICTS+= py312-sqlite3-[0-9]*
PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS=312
@@ -28,17 +35,23 @@ CONFIGURE_ARGS+= --with-openssl=${BUILDL
CONFIGURE_ARGS+= --without-ensurepip
CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
-CONFIGURE_ENV+= py_cv_module__curses="n/a"
-CONFIGURE_ENV+= py_cv_module__curses_panel="n/a"
-CONFIGURE_ENV+= py_cv_module__elementtree="n/a"
CONFIGURE_ENV+= py_cv_module__gdbm="n/a"
-CONFIGURE_ENV+= py_cv_module__sqlite3="n/a"
CONFIGURE_ENV+= py_cv_module__tkinter="n/a"
-CONFIGURE_ENV+= py_cv_module_pyexpat="n/a"
-CONFIGURE_ENV+= py_cv_module_readline="n/a"
+# example module
CONFIGURE_ENV+= py_cv_module_xxlimited="n/a"
PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx update_panels
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+# libpanelw seems to be a Linux thing?
+SUBST_CLASSES+= panel
+SUBST_MESSAGE.panel= Replacing panelw with panel.
+SUBST_STAGE.panel= pre-configure
+SUBST_FILES.panel+= configure
+SUBST_SED.panel+= -e "s,panelw,panel,"
+
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
@@ -71,13 +84,6 @@ PKG_CXX= clang++
CFLAGS.SunOS+= -DPKGSRC_OPSYS_VERSION=${OPSYS_VERSION}
LIBS.SunOS+= -lrt # fdatasync()
LIBS.SunOS+= -luuid
-.if ${OPSYS} == "SunOS" && ${OPSYS_VERSION} < 051100
-SUBST_CLASSES+= setup
-SUBST_MESSAGE.setup= Replacing crypt with crypt_i
-SUBST_STAGE.setup= pre-configure
-SUBST_FILES.setup= setup.py
-SUBST_SED.setup= -e "s,'crypt','crypt_i',"
-.endif
LIBS.NetBSD+= -lcrypt
@@ -175,7 +181,6 @@ SUBST_MESSAGE.findlib= Fixing find_libra
SUBST_STAGE.findlib= pre-configure
SUBST_FILES.findlib= Lib/ctypes/macholib/dyld.py
SUBST_FILES.findlib+= Lib/ctypes/util.py
-SUBST_FILES.findlib+= Lib/distutils/unixccompiler.py
SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_SED.findlib+= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${PREFIX}/lib', '-L${PREFIX}/lib', \1!"
SUBST_NOOP_OK.findlib= yes
@@ -217,11 +222,9 @@ setuptools-preinstall:
${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.if ${USE_BUILTIN.gettext:U:tl} == no
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=yes
@@ -231,7 +234,9 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdoma
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python312/PLIST
diff -u pkgsrc/lang/python312/PLIST:1.1 pkgsrc/lang/python312/PLIST:1.2
--- pkgsrc/lang/python312/PLIST:1.1 Mon Oct 2 20:07:14 2023
+++ pkgsrc/lang/python312/PLIST Mon Oct 23 06:36:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/10/02 20:07:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/10/23 06:36:00 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/idle${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
@@ -1641,9 +1641,12 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_datetime.so
${PLIST.dbm}lib/python${PY_VER_SUFFIX}/lib-dynload/_dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_decimal.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
@@ -1662,6 +1665,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha2.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_statistics.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -1686,6 +1690,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/g
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Index: pkgsrc/lang/python38/Makefile
diff -u pkgsrc/lang/python38/Makefile:1.30 pkgsrc/lang/python38/Makefile:1.31
--- pkgsrc/lang/python38/Makefile:1.30 Tue Aug 15 14:39:08 2023
+++ pkgsrc/lang/python38/Makefile Mon Oct 23 06:36:01 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2023/08/15 14:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2023/10/23 06:36:01 wiz Exp $
.include "dist.mk"
PKGNAME= python38-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,6 +12,12 @@ COMMENT= Interpreted, interactive, objec
LICENSE= python-software-foundation
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py38-cElementTree-[0-9]*
+CONFLICTS+= py38-curses-[0-9]*
+CONFLICTS+= py38-cursespanel-[0-9]*
+CONFLICTS+= py38-expat-[0-9]*
+CONFLICTS+= py38-readline-[0-9]*
+CONFLICTS+= py38-sqlite3-[0-9]*
PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS=38
@@ -31,13 +38,18 @@ CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.prefs.mk"
# http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
+.if ${MACHINE_PLATFORM:MDarwin-1[12].*}
PKGSRC_COMPILER= clang
PKG_CC= clang
PKG_CXX= clang++
@@ -65,13 +77,6 @@ USE_TOOLS+= gmake
.include "platname.mk"
PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
-# ossaudiodev is only available on x86 for the following platforms
-PLIST_VARS+= oss
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
- (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
-PLIST.oss= yes
-.endif
-
# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
# certain modules will not be built.
.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
@@ -198,11 +203,9 @@ setuptools-preinstall:
${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.if ${USE_BUILTIN.gettext:U:tl} == no
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=yes
@@ -212,7 +215,9 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdoma
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python38/PLIST
diff -u pkgsrc/lang/python38/PLIST:1.14 pkgsrc/lang/python38/PLIST:1.15
--- pkgsrc/lang/python38/PLIST:1.14 Wed Jun 7 13:25:08 2023
+++ pkgsrc/lang/python38/PLIST Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/06/07 13:25:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2023/10/23 06:36:01 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1957,9 +1957,12 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_datetime.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_decimal.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
@@ -1979,6 +1982,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_statistics.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -2000,6 +2004,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/m
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Index: pkgsrc/lang/python38/distinfo
diff -u pkgsrc/lang/python38/distinfo:1.32 pkgsrc/lang/python38/distinfo:1.33
--- pkgsrc/lang/python38/distinfo:1.32 Fri Aug 25 08:25:28 2023
+++ pkgsrc/lang/python38/distinfo Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2023/08/25 08:25:28 adam Exp $
+$NetBSD: distinfo,v 1.33 2023/10/23 06:36:01 wiz Exp $
BLAKE2s (Python-3.8.18.tar.xz) = 50d4cf46bbe1837031e576173873b90ca0b329c6ebb73fbcaea97f3cd0e4b406
SHA512 (Python-3.8.18.tar.xz) = 0be1d85cafade25e99b8277ba51d7b9b3a3d2dbbcc52fd0d1c633c47982e5dd87fd7a0ca180a78d7801d79a8ecafa79bd9d501d544cd7b6da53ea409daa70adf
@@ -20,4 +20,4 @@ SHA1 (patch-Python_pytime.c) = 41981f821
SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
SHA1 (patch-configure) = 114060a92a3d6fc20ad4adc12ae396307b5f4c16
SHA1 (patch-pyconfig.h.in) = dc98ffe351623df2e8453e9350c30d705f4e99bd
-SHA1 (patch-setup.py) = 0b05bdc61289ee75758dcf8e422b988ff2067cba
+SHA1 (patch-setup.py) = 55af7e9da463a23bf7b3f3fd388703b9ea3be300
Index: pkgsrc/lang/python38/patches/patch-setup.py
diff -u pkgsrc/lang/python38/patches/patch-setup.py:1.6 pkgsrc/lang/python38/patches/patch-setup.py:1.7
--- pkgsrc/lang/python38/patches/patch-setup.py:1.6 Tue May 4 05:16:07 2021
+++ pkgsrc/lang/python38/patches/patch-setup.py Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.6 2021/05/04 05:16:07 adam Exp $
+$NetBSD: patch-setup.py,v 1.7 2023/10/23 06:36:01 wiz Exp $
- Disable certain modules, so they can be built as separate packages.
- Do not look for ncursesw.
@@ -22,7 +22,7 @@ $NetBSD: patch-setup.py,v 1.6 2021/05/04
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
-+DISABLED_MODULE_LIST = ["_curses", "_curses_panel", "_elementtree", "_gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "xxlimited"]
++DISABLED_MODULE_LIST = ["_gdbm", "_tkinter", "xxlimited"]
def get_platform():
Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.26 pkgsrc/lang/python39/Makefile:1.27
--- pkgsrc/lang/python39/Makefile:1.26 Tue Aug 15 14:39:08 2023
+++ pkgsrc/lang/python39/Makefile Mon Oct 23 06:36:01 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2023/08/15 14:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2023/10/23 06:36:01 wiz Exp $
.include "dist.mk"
PKGNAME= python39-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,6 +12,12 @@ COMMENT= Interpreted, interactive, objec
LICENSE= python-software-foundation
CONFLICTS+= python-[0-9]*
+CONFLICTS+= py39-cElementTree-[0-9]*
+CONFLICTS+= py39-curses-[0-9]*
+CONFLICTS+= py39-cursespanel-[0-9]*
+CONFLICTS+= py39-expat-[0-9]*
+CONFLICTS+= py39-readline-[0-9]*
+CONFLICTS+= py39-sqlite3-[0-9]*
PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS=39
@@ -31,6 +38,11 @@ CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
@@ -56,7 +68,7 @@ ALL_ENV+= \
.endif
# http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
+.if ${MACHINE_PLATFORM:MDarwin-1[12].*}
PKGSRC_COMPILER= clang
PKG_CC= clang
PKG_CXX= clang++
@@ -209,11 +221,9 @@ setuptools-preinstall:
${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
-# needed to make devel/py-readline pick up the correct readline implementation
-BUILDLINK_DEPMETHOD.readline= build
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.if ${USE_BUILTIN.gettext:U:tl} == no
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=yes
@@ -223,7 +233,9 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdoma
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python39/PLIST
diff -u pkgsrc/lang/python39/PLIST:1.13 pkgsrc/lang/python39/PLIST:1.14
--- pkgsrc/lang/python39/PLIST:1.13 Wed Jun 7 13:25:52 2023
+++ pkgsrc/lang/python39/PLIST Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2023/06/07 13:25:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2023/10/23 06:36:01 wiz Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1986,9 +1986,12 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_csv.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ctypes_test.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_curses_panel.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_datetime.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_decimal.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_elementtree.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_hashlib.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_heapq.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
@@ -2008,6 +2011,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_sqlite3.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_statistics.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -2030,6 +2034,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/m
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/readline.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.35 pkgsrc/lang/python39/distinfo:1.36
--- pkgsrc/lang/python39/distinfo:1.35 Fri Aug 25 08:26:13 2023
+++ pkgsrc/lang/python39/distinfo Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2023/08/25 08:26:13 adam Exp $
+$NetBSD: distinfo,v 1.36 2023/10/23 06:36:01 wiz Exp $
BLAKE2s (Python-3.9.18.tar.xz) = 429256eb52e94427ae86302633ce8b01ba42d37c44c59e89fa0ae09b721da63f
SHA512 (Python-3.9.18.tar.xz) = aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7
@@ -18,4 +18,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
SHA1 (patch-configure) = 944b8bb9601fd064333305778fb57997ce0ac531
SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = 81c2ddc3a343c62e228392572d3b6c88b5f49b51
+SHA1 (patch-setup.py) = dab93079027f8ac6a259c9e683d35fe7b66c57e5
Index: pkgsrc/lang/python39/patches/patch-setup.py
diff -u pkgsrc/lang/python39/patches/patch-setup.py:1.9 pkgsrc/lang/python39/patches/patch-setup.py:1.10
--- pkgsrc/lang/python39/patches/patch-setup.py:1.9 Thu Jul 7 15:26:43 2022
+++ pkgsrc/lang/python39/patches/patch-setup.py Mon Oct 23 06:36:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.9 2022/07/07 15:26:43 khorben Exp $
+$NetBSD: patch-setup.py,v 1.10 2023/10/23 06:36:01 wiz Exp $
Disable certain modules, so they can be built as separate packages.
Do not look for ncursesw.
@@ -44,7 +44,7 @@ Enable cross-build by setting sys._home
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
-+DISABLED_MODULE_LIST = ["_curses", "_curses_panel", "_elementtree", "_gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "xxlimited"]
++DISABLED_MODULE_LIST = ["_gdbm", "_tkinter", "xxlimited"]
def get_platform():
Added files:
Index: pkgsrc/lang/python/batteries-included.mk
diff -u /dev/null pkgsrc/lang/python/batteries-included.mk:1.1
--- /dev/null Mon Oct 23 06:36:02 2023
+++ pkgsrc/lang/python/batteries-included.mk Mon Oct 23 06:35:59 2023
@@ -0,0 +1,11 @@
+# $NetBSD: batteries-included.mk,v 1.1 2023/10/23 06:35:59 wiz Exp $
+#
+# Makefile fragment that pulls in the required Python versions
+# that provide formerly separately packaged Python modules.
+
+BUILDLINK_API_DEPENDS.python27+= python27-2.7.18nb12
+BUILDLINK_API_DEPENDS.python38+= python38-3.8.18nb1
+BUILDLINK_API_DEPENDS.python39+= python39-3.9.18nb1
+BUILDLINK_API_DEPENDS.python310+= python310-3.10.13nb1
+BUILDLINK_API_DEPENDS.python311+= python311>=3.11.6nb1
+BUILDLINK_API_DEPENDS.python312+= python312-3.12.0nb1
Home |
Main Index |
Thread Index |
Old Index