CVS commit: pkgsrc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May  7 10:36:10 UTC 2025

Modified Files:
        pkgsrc/cad/py-gdstk: PLIST
        pkgsrc/lang/python: extension.mk
        pkgsrc/x11/py-qwt-qt5: PLIST

Log Message:
python: add PLIST handling for PYSOABISUFFIX

https://mail-index.netbsd.org/tech-pkg/2025/05/02/msg031102.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cad/py-gdstk/PLIST
cvs rdiff -u -r1.67 -r1.68 pkgsrc/lang/python/extension.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-qwt-qt5/PLIST

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

Modified files:

Index: pkgsrc/cad/py-gdstk/PLIST
diff -u pkgsrc/cad/py-gdstk/PLIST:1.5 pkgsrc/cad/py-gdstk/PLIST:1.6
--- pkgsrc/cad/py-gdstk/PLIST:1.5       Mon Jan 27 22:39:16 2025
+++ pkgsrc/cad/py-gdstk/PLIST   Wed May  7 10:36:09 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2025/01/27 22:39:16 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/05/07 10:36:09 tnn Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
@@ -6,6 +6,6 @@ ${PYSITELIB}/${WHEEL_INFODIR}/licenses/L
 ${PYSITELIB}/gdstk/__init__.py
 ${PYSITELIB}/gdstk/__init__.pyc
 ${PYSITELIB}/gdstk/__init__.pyo
-${PYSITELIB}/gdstk/_gdstk.cpython-${PYVERS}.so
+${PYSITELIB}/gdstk/_gdstk.${PYSOABISUFFIX}
 ${PYSITELIB}/gdstk/_gdstk.pyi
 ${PYSITELIB}/gdstk/py.typed

Index: pkgsrc/lang/python/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.67 pkgsrc/lang/python/extension.mk:1.68
--- pkgsrc/lang/python/extension.mk:1.67        Wed May  7 10:28:03 2025
+++ pkgsrc/lang/python/extension.mk     Wed May  7 10:36:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.67 2025/05/07 10:28:03 tnn Exp $
+# $NetBSD: extension.mk,v 1.68 2025/05/07 10:36:09 tnn Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -53,9 +53,20 @@ do-test:
 
 .endif
 
+# PYSOABISUFFIX should match the output of the following command
+# on the host, without the leading dot.
+# python -c "import importlib.machinery as m; print(m.EXTENSION_SUFFIXES[0])"
+.if !empty(MACHINE_PLATFORM:MLinux-*-*)
+PYSOABISUFFIX?=        cpython-${PYTHON_VERSION}-${MACHINE_ARCH}-linux-gnu.so
+.elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
+PYSOABISUFFIX?=        cpython-${PYTHON_VERSION}-darwin.so
+.else
+PYSOABISUFFIX?=        cpython-${PYTHON_VERSION}.so
+.endif
+
 .if defined(PY_PATCHPLIST)
 PLIST_SUBST+=  PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX} PYSOABISUFFIX=${PYSOABISUFFIX}
 .endif
 
 # mostly for ALTERNATIVES files
@@ -66,6 +77,7 @@ FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFI
 .if empty(_PYTHON_VERSION:M2?)
 PLIST_AWK+=            -f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=                PYVERS="${PYVERSSUFFIX:S/.//}"
+EARLY_PRINT_PLIST_AWK+=        /lib\// { sub(/\.${PYSOABISUFFIX}$$/, ".$${PYSOABISUFFIX}") }
 EARLY_PRINT_PLIST_AWK+=        /^[^@]/ && /[^\/]+\.py[co]$$/ {
 EARLY_PRINT_PLIST_AWK+=        gsub(/__pycache__\//, "")
 EARLY_PRINT_PLIST_AWK+=        gsub(/opt-1\.pyc$$/, "pyo")

Index: pkgsrc/x11/py-qwt-qt5/PLIST
diff -u pkgsrc/x11/py-qwt-qt5/PLIST:1.9 pkgsrc/x11/py-qwt-qt5/PLIST:1.10
--- pkgsrc/x11/py-qwt-qt5/PLIST:1.9     Sat May 11 20:54:11 2024
+++ pkgsrc/x11/py-qwt-qt5/PLIST Wed May  7 10:36:10 2025
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2024/05/11 20:54:11 adam Exp $
+$NetBSD: PLIST,v 1.10 2025/05/07 10:36:10 tnn Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/PyQt5/Qwt.cpython-${PYTHON_VERSION}.so
+${PYSITELIB}/PyQt5/Qwt.${PYSOABISUFFIX}
 ${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml
 ${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip
 ${PYSITELIB}/PyQt5/bindings/Qwt/conversions.sip