Thu Dec 30 15:18:11 2021 UTC ()
python310: prepare for upcoming setuptools change

Bump PKGREVISION.


(wiz)
diff -r1.4 -r1.5 pkgsrc/lang/python310/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/python310/PLIST

cvs diff -r1.4 -r1.5 pkgsrc/lang/python310/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python310/Makefile 2021/12/11 10:13:18 1.4
+++ pkgsrc/lang/python310/Makefile 2021/12/30 15:18:11 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.4 2021/12/11 10:13:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2021/12/30 15:18:11 wiz Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 3
4.include "dist.mk" 4.include "dist.mk"
5 5
6PKGNAME= python310-${PY_DISTVERSION} 6PKGNAME= python310-${PY_DISTVERSION}
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
15 15
16PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk 16PLIST_AWK= -f ${PKGSRCDIR}/lang/python/plist-python.awk
@@ -163,31 +163,39 @@ CHECK_INTERPRETER_SKIP+= lib/python${PY_ @@ -163,31 +163,39 @@ CHECK_INTERPRETER_SKIP+= lib/python${PY_
163CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_zip 163CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_zip
164CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/header.sh 164CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/header.sh
165 165
166# contain CONFIGURE_ARGS and CONFIGURE_ENV 166# contain CONFIGURE_ARGS and CONFIGURE_ENV
167CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/_sysconfigdata* 167CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/_sysconfigdata*
168CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/__pycache__/_sysconfigdata* 168CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/__pycache__/_sysconfigdata*
169CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile 169CHECK_WRKREF_SKIP+= lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile
170 170
171# Avoid error: Cannot generate ./Include/opcode.h, python not found ! 171# Avoid error: Cannot generate ./Include/opcode.h, python not found !
172post-configure: 172post-configure:
173 touch ${WRKSRC}/Include/opcode.h 173 touch ${WRKSRC}/Include/opcode.h
174 174
175.if ${OPSYS} == "HPUX" 175.if ${OPSYS} == "HPUX"
176post-install: 176post-install: hpux-postinstall
 177.PHONY: hpux-postinstall
 178hpux-postinstall:
177 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.10.sl \ 179 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.10.sl \
178 ${DESTDIR}${PREFIX}/lib/libpython3.10.sl.1.0 180 ${DESTDIR}${PREFIX}/lib/libpython3.10.sl.1.0
179.endif 181.endif
180 182
 183post-install: setuptools-postinstall
 184.PHONY: setuptools-postinstall
 185setuptools-postinstall:
 186 ${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
 187 ${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
 188
181# needed to make devel/py-readline pick up the correct readline implementation 189# needed to make devel/py-readline pick up the correct readline implementation
182BUILDLINK_DEPMETHOD.readline= build 190BUILDLINK_DEPMETHOD.readline= build
183 191
184.include "../../archivers/bzip2/buildlink3.mk" 192.include "../../archivers/bzip2/buildlink3.mk"
185.include "../../archivers/xz/buildlink3.mk" 193.include "../../archivers/xz/buildlink3.mk"
186.include "../../devel/gettext-lib/buildlink3.mk" 194.include "../../devel/gettext-lib/buildlink3.mk"
187.include "../../devel/libffi/buildlink3.mk" 195.include "../../devel/libffi/buildlink3.mk"
188.include "../../devel/libuuid/buildlink3.mk" 196.include "../../devel/libuuid/buildlink3.mk"
189.include "../../devel/readline/buildlink3.mk" 197.include "../../devel/readline/buildlink3.mk"
190.include "../../devel/zlib/buildlink3.mk" 198.include "../../devel/zlib/buildlink3.mk"
191.include "../../security/openssl/buildlink3.mk" 199.include "../../security/openssl/buildlink3.mk"
192.include "../../mk/bdb.buildlink3.mk" 200.include "../../mk/bdb.buildlink3.mk"
193.include "../../mk/dlopen.buildlink3.mk" 201.include "../../mk/dlopen.buildlink3.mk"

cvs diff -r1.2 -r1.3 pkgsrc/lang/python310/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python310/PLIST 2021/12/07 09:31:09 1.2
+++ pkgsrc/lang/python310/PLIST 2021/12/30 15:18:11 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2021/12/07 09:31:09 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2021/12/30 15:18:11 wiz Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6include/python${PY_VER_SUFFIX}/Python.h 6include/python${PY_VER_SUFFIX}/Python.h
7include/python${PY_VER_SUFFIX}/abstract.h 7include/python${PY_VER_SUFFIX}/abstract.h
8include/python${PY_VER_SUFFIX}/bltinmodule.h 8include/python${PY_VER_SUFFIX}/bltinmodule.h
9include/python${PY_VER_SUFFIX}/boolobject.h 9include/python${PY_VER_SUFFIX}/boolobject.h
10include/python${PY_VER_SUFFIX}/bytearrayobject.h 10include/python${PY_VER_SUFFIX}/bytearrayobject.h
11include/python${PY_VER_SUFFIX}/bytesobject.h 11include/python${PY_VER_SUFFIX}/bytesobject.h
12include/python${PY_VER_SUFFIX}/cellobject.h 12include/python${PY_VER_SUFFIX}/cellobject.h
13include/python${PY_VER_SUFFIX}/ceval.h 13include/python${PY_VER_SUFFIX}/ceval.h
14include/python${PY_VER_SUFFIX}/classobject.h 14include/python${PY_VER_SUFFIX}/classobject.h
@@ -2545,26 +2545,27 @@ lib/python${PY_VER_SUFFIX}/selectors.pyo @@ -2545,26 +2545,27 @@ lib/python${PY_VER_SUFFIX}/selectors.pyo
2545lib/python${PY_VER_SUFFIX}/shelve.py 2545lib/python${PY_VER_SUFFIX}/shelve.py
2546lib/python${PY_VER_SUFFIX}/shelve.pyc 2546lib/python${PY_VER_SUFFIX}/shelve.pyc
2547lib/python${PY_VER_SUFFIX}/shelve.pyo 2547lib/python${PY_VER_SUFFIX}/shelve.pyo
2548lib/python${PY_VER_SUFFIX}/shlex.py 2548lib/python${PY_VER_SUFFIX}/shlex.py
2549lib/python${PY_VER_SUFFIX}/shlex.pyc 2549lib/python${PY_VER_SUFFIX}/shlex.pyc
2550lib/python${PY_VER_SUFFIX}/shlex.pyo 2550lib/python${PY_VER_SUFFIX}/shlex.pyo
2551lib/python${PY_VER_SUFFIX}/shutil.py 2551lib/python${PY_VER_SUFFIX}/shutil.py
2552lib/python${PY_VER_SUFFIX}/shutil.pyc 2552lib/python${PY_VER_SUFFIX}/shutil.pyc
2553lib/python${PY_VER_SUFFIX}/shutil.pyo 2553lib/python${PY_VER_SUFFIX}/shutil.pyo
2554lib/python${PY_VER_SUFFIX}/signal.py 2554lib/python${PY_VER_SUFFIX}/signal.py
2555lib/python${PY_VER_SUFFIX}/signal.pyc 2555lib/python${PY_VER_SUFFIX}/signal.pyc
2556lib/python${PY_VER_SUFFIX}/signal.pyo 2556lib/python${PY_VER_SUFFIX}/signal.pyo
2557lib/python${PY_VER_SUFFIX}/site-packages/README.txt 2557lib/python${PY_VER_SUFFIX}/site-packages/README.txt
 2558lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
2558lib/python${PY_VER_SUFFIX}/site.py 2559lib/python${PY_VER_SUFFIX}/site.py
2559lib/python${PY_VER_SUFFIX}/site.pyc 2560lib/python${PY_VER_SUFFIX}/site.pyc
2560lib/python${PY_VER_SUFFIX}/site.pyo 2561lib/python${PY_VER_SUFFIX}/site.pyo
2561lib/python${PY_VER_SUFFIX}/smtpd.py 2562lib/python${PY_VER_SUFFIX}/smtpd.py
2562lib/python${PY_VER_SUFFIX}/smtpd.pyc 2563lib/python${PY_VER_SUFFIX}/smtpd.pyc
2563lib/python${PY_VER_SUFFIX}/smtpd.pyo 2564lib/python${PY_VER_SUFFIX}/smtpd.pyo
2564lib/python${PY_VER_SUFFIX}/smtplib.py 2565lib/python${PY_VER_SUFFIX}/smtplib.py
2565lib/python${PY_VER_SUFFIX}/smtplib.pyc 2566lib/python${PY_VER_SUFFIX}/smtplib.pyc
2566lib/python${PY_VER_SUFFIX}/smtplib.pyo 2567lib/python${PY_VER_SUFFIX}/smtplib.pyo
2567lib/python${PY_VER_SUFFIX}/sndhdr.py 2568lib/python${PY_VER_SUFFIX}/sndhdr.py
2568lib/python${PY_VER_SUFFIX}/sndhdr.pyc 2569lib/python${PY_VER_SUFFIX}/sndhdr.pyc
2569lib/python${PY_VER_SUFFIX}/sndhdr.pyo 2570lib/python${PY_VER_SUFFIX}/sndhdr.pyo
2570lib/python${PY_VER_SUFFIX}/socket.py 2571lib/python${PY_VER_SUFFIX}/socket.py