回复: svn commit: r566370 - in head/lang: python-doc-html python39

[wen heping]

Thank your patch.
I shall commit it later.

wen
________________________________
发件人: Jan Beich <jbeich at FreeBSD.org>
发送时间: 2021年2月23日 15:56
收件人: Wen Heping <wen at FreeBSD.org>
抄送: ports-committers at freebsd.org <ports-committers at freebsd.org>; svn-ports-all at freebsd.org <svn-ports-all at freebsd.org>; svn-ports-head at freebsd.org <svn-ports-head at freebsd.org>
主题: Re: svn commit: r566370 - in head/lang: python-doc-html python39

Wen Heping <wen at FreeBSD.org> writes:

> Author: wen
> Date: Tue Feb 23 06:32:07 2021
> New Revision: 566370
> URL: https://apac01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvnweb.freebsd.org%2Fchangeset%2Fports%2F566370&data=04%7C01%7C%7Cd35591e67f0647c13c0008d8d7d07f08%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637496637783342889%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=KHy4hb%2B8EHV84%2BnJWN0xpdfkC%2ByqdnHdX15eOeGWPBU%3D&reserved=0
>
> Log:
>   - Update to 3.9.2
>
> Modified:
>   head/lang/python-doc-html/distinfo
>   head/lang/python39/Makefile.version
>   head/lang/python39/distinfo
>   head/lang/python39/pkg-plist
[...]

Breaks many consumers. Can you apply/approve the patch at the end?

devel/gobject-introspection:
  ===> Checking for items in STAGEDIR missing from pkg-plist
  Error: Orphaned: lib/gobject-introspection/giscanner/_giscanner.cpython-39.so
  ===> Checking for items in pkg-plist which are not in STAGEDIR
  Error: Missing: lib/gobject-introspection/giscanner/_giscanner.so
  ===> Error: Plist issues found.
  *** Error code 1

graphics/py-cairo:
  ===> Checking for items in STAGEDIR missing from pkg-plist
  Error: Orphaned: %%PYTHON_SITELIBDIR%%/cairo/_cairo.cpython-39.so
  ===> Checking for items in pkg-plist which are not in STAGEDIR
  Error: Missing: %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
  ===> Error: Plist issues found.
  *** Error code 1

devel/talloc:
  ===> Checking for items in STAGEDIR missing from pkg-plist
  Error: Orphaned: lib/libpytalloc-util.cpython-39.so
  Error: Orphaned: lib/libpytalloc-util.cpython-39.so.2
  Error: Orphaned: %%PYTHON_SITELIBDIR%%/talloc.cpython-39.so
  Error: Orphaned: %%PKGCONFIGDIR%%/pytalloc-util.cpython-39.pc
  ===> Checking for items in pkg-plist which are not in STAGEDIR
  Error: Missing: lib/libpytalloc-util.so
  Error: Missing: lib/libpytalloc-util.so.2
  Error: Missing: %%PYTHON_SITELIBDIR%%/talloc.so
  Error: Missing: %%PKGCONFIGDIR%%/pytalloc-util.pc
  ===> Error: Plist issues found.
  *** Error code 1

databases/tdb:
  ===> Checking for items in STAGEDIR missing from pkg-plist
  Error: Orphaned: %%PYTHON_SITELIBDIR%%/tdb.cpython-39.so
  ===> Checking for items in pkg-plist which are not in STAGEDIR
  Error: Missing: %%PYTHON_SITELIBDIR%%/tdb.so
  ===> Error: Plist issues found.
  *** Error code 1

diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 8fe19724fde7..704f8da2bd11 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -447,7 +447,7 @@ PYTHON_REL=         # empty
 PYTHON_ABIVER=          # empty
 PYTHON_PORTSDIR=        ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}

-.if ${PYTHON_VER} == 3.8
+.if ${PYTHON_VER} >= 3.8
 PYTHON_EXT_SUFFIX=      .cpython-${PYTHON_SUFFIX}
 .else
 PYTHON_EXT_SUFFIX=      # empty