CVS commit: pkgsrc/lang/python

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/python
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 28 May 2026 03:58:34 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 28 03:58:34 UTC 2026

Modified Files:
        pkgsrc/lang/python: bootstrap.mk egg.mk extension.mk pyversion.mk
            srcdist.mk wheel.mk

Log Message:
python: cleanup, reviewed by @wiz


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python/bootstrap.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/python/egg.mk \
    pkgsrc/lang/python/srcdist.mk
cvs rdiff -u -r1.68 -r1.69 pkgsrc/lang/python/extension.mk
cvs rdiff -u -r1.176 -r1.177 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python/wheel.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/python/bootstrap.mk
diff -u pkgsrc/lang/python/bootstrap.mk:1.4 pkgsrc/lang/python/bootstrap.mk:1.5
--- pkgsrc/lang/python/bootstrap.mk:1.4 Sun Feb 23 17:30:26 2025
+++ pkgsrc/lang/python/bootstrap.mk     Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2025/02/23 17:30:26 wiz Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2026/05/28 03:58:33 adam Exp $
 #
 # Initial mk for building and installing Python packages that
 # are on the module install bootstrap path.
@@ -31,8 +31,8 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-installer>
 do-install:
        ${RUN} cd ${WRKSRC} && \
        ${SETENV} ${INSTALL_ENV} \
-       ${TOOL_PYTHONBIN} -m installer --destdir ${DESTDIR:Q} \
-               --prefix ${PREFIX:Q} ${WHEELFILE}
+       ${TOOL_PYTHONBIN} -m installer --destdir ${DESTDIR} \
+               --prefix ${PREFIX} ${WHEELFILE}
 .endif
 
 .include "../../lang/python/extension.mk"

Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.46 pkgsrc/lang/python/egg.mk:1.47
--- pkgsrc/lang/python/egg.mk:1.46      Sun Feb  2 10:38:01 2025
+++ pkgsrc/lang/python/egg.mk   Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.46 2025/02/02 10:38:01 he Exp $
+# $NetBSD: egg.mk,v 1.47 2026/05/28 03:58:33 adam Exp $
 #
 # The method used in this Makefile fragment is obsolete.
 # Please use wheel.mk instead.
@@ -29,8 +29,8 @@ PY_PATCHPLIST?=               yes
 # be prefixed with ${PLIST.py3x} - please always test with both
 # python 2.7 and the current python 3.x default!
 
-PLIST_SUBST+=  EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
-PLIST_SUBST+=  EGG_INFODIR=${EGG_INFODIR}
+PLIST_SUBST+=          EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
+PLIST_SUBST+=          EGG_INFODIR=${EGG_INFODIR}
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX:S,.,\.,g}.egg-info/, \
                               "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX:S,.,\.,g}-nspkg.pth/, \
@@ -70,7 +70,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 .endif
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-.if ${PYTHON_FOR_BUILD_ONLY:Uno:tl} == "no" || \
+.  if ${PYTHON_FOR_BUILD_ONLY:Uno:tl} == "no" || \
     ${PYTHON_FOR_BUILD_ONLY:Uno:tl} == "build"
 _COOKIE.pysetupcross=  ${WRKDIR}/.pysetupcross_done
 pre-configure: ${_COOKIE.pysetupcross}
@@ -78,8 +78,8 @@ ${_COOKIE.pysetupcross}:
        @${STEP_MSG} "Adjusting Python setup.cfg for cross-compiling"
        ${RUN} ${PRINTF} "\\n[build]\\nexecutable = '%s'\\n" ${PYTHONBIN:Q} \
                >>${WRKSRC}/setup.cfg
-       ${RUN} touch $@
-.endif
+       ${RUN} touch ${.TARGET}
+.  endif
 .endif
 
 INSTALLATION_DIRS+=    ${PYSITELIB}
Index: pkgsrc/lang/python/srcdist.mk
diff -u pkgsrc/lang/python/srcdist.mk:1.46 pkgsrc/lang/python/srcdist.mk:1.47
--- pkgsrc/lang/python/srcdist.mk:1.46  Tue Sep 30 16:07:37 2025
+++ pkgsrc/lang/python/srcdist.mk       Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.46 2025/09/30 16:07:37 wiz Exp $
+# $NetBSD: srcdist.mk,v 1.47 2026/05/28 03:58:33 adam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.${PYPACKAGE}+=        ${P
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_CROSS_COMPILE:tl} == "yes"
+.  if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+= ${PYDEPENDENCY}
 DEPENDS+=      ${PYDEPENDENCY}
-ALL_ENV+=      _PYTHON_PROJECT_BASE=${WRKSRC:Q}
-CPPFLAGS+=     -I${LOCALBASE:Q}/${PYINC:Q}
-.endif
+ALL_ENV+=      _PYTHON_PROJECT_BASE=${WRKSRC}
+CPPFLAGS+=     -I${LOCALBASE}/${PYINC:Q}
+.  endif
 
 python-std-patchsetup:
        ${SED} ${PY_SETUP_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \

Index: pkgsrc/lang/python/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.68 pkgsrc/lang/python/extension.mk:1.69
--- pkgsrc/lang/python/extension.mk:1.68        Wed May  7 10:36:09 2025
+++ pkgsrc/lang/python/extension.mk     Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.68 2025/05/07 10:36:09 tnn Exp $
+# $NetBSD: extension.mk,v 1.69 2026/05/28 03:58:33 adam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -17,7 +17,7 @@ PYSETUPBUILDTARGET?=  build
 PYSETUPBUILDARGS?=     # empty
 # Python 3.5+ supports parallel building
 .  if defined(MAKE_JOBS) && ${_PYTHON_VERSION} != 27
-.    if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
+.    if !defined(MAKE_JOBS_SAFE) || ${MAKE_JOBS_SAFE:U:tl} != no
 PYSETUPBUILDARGS+=     -j${MAKE_JOBS}
 .    endif
 .  endif
@@ -44,7 +44,7 @@ do-install:
         ${TOOL_PYTHONBIN} ${PYSETUP} ${PYSETUPARGS} "install" \
         ${_PYSETUPINSTALLARGS})
 
-.  if !target(do-test) && !(defined(TEST_TARGET) && !empty(TEST_TARGET))
+.  if !target(do-test) && !(!empty(TEST_TARGET))
 do-test:
        (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${TEST_ENV} \
         ${TOOL_PYTHONBIN} ${PYSETUP} ${PYSETUPARGS} ${PYSETUPTESTTARGET} \
@@ -95,5 +95,5 @@ DISTUTILS_BUILDDIR_IN_TEST_ENV?=      no
 
 .if ${DISTUTILS_BUILDDIR_IN_TEST_ENV} == "yes"
 DISTUTILS_BUILDDIR_CMD=        cd ${WRKSRC} && ${TOOL_PYTHONBIN} ${.CURDIR}/../../lang/python/distutils-builddir.py
-TEST_ENV+=     PYTHONPATH=${DISTUTILS_BUILDDIR_CMD:sh}
+TEST_ENV+=             PYTHONPATH=${DISTUTILS_BUILDDIR_CMD:sh:Q}
 .endif

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.176 pkgsrc/lang/python/pyversion.mk:1.177
--- pkgsrc/lang/python/pyversion.mk:1.176       Wed Oct  8 07:17:07 2025
+++ pkgsrc/lang/python/pyversion.mk     Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.176 2025/10/08 07:17:07 adam Exp $
+# $NetBSD: pyversion.mk,v 1.177 2026/05/28 03:58:33 adam Exp $
 
 # This file provides an interface to decide which version of python
 # should be used in building a package.  It should be directly
@@ -56,7 +56,7 @@
 #      The preferred Python version to use.  Typical use is to move
 #      to a newer version before pkgsrc moves.  Another possible use
 #      is to stay on an older version when pkgsrc advances.
-#      
+#
 #      Reasonable values: Default value of PYTHON_VERSIONS_ACCEPTED.
 #      Possible values: Reasonable values and "old 3.x".
 #      Default: 313
@@ -143,17 +143,17 @@ PYTHON_PYVERSION_MK=      defined
 
 # derive a python version from the package name if possible
 # optionally handled quoted package names
-.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
-    defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
+.if !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
+    !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?=  ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
-.elif defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9][0-9]-*) || \
-    defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9][0-9]-*)
+.elif !empty(PKGNAME_REQD:Mpy[0-9][0-9][0-9]-*) || \
+      !empty(PKGNAME_REQD:M*-py[0-9][0-9][0-9]-*)
 PYTHON_VERSION_REQD?=  ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9][0-9])-.*/\2/}
-.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
-      defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
+.elif !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
+      !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?=  ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
-.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9][0-9]-*) || \
-      defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9][0-9]-*)
+.elif !empty(PKGNAME_OLD:Mpy[0-9][0-9][0-9]-*) || \
+      !empty(PKGNAME_OLD:M*-py[0-9][0-9][0-9]-*)
 PYTHON_VERSION_REQD?=  ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9][0-9])-.*/\2/}
 .endif
 
@@ -253,12 +253,12 @@ PTHREAD_OPTS+=    require
 
 PYTHON_FOR_BUILD_ONLY?=                no
 .if defined(PYPKGSRCDIR)
-.  if !empty(PYTHON_FOR_BUILD_ONLY:M[tT][oO][oO][lL])
+.  if ${PYTHON_FOR_BUILD_ONLY:tl} == tool
 TOOL_DEPENDS+=                 ${PYDEPENDENCY}
-.  elif !empty(PYTHON_FOR_BUILD_ONLY:M[tT][eE][sS][tT])
+.  elif ${PYTHON_FOR_BUILD_ONLY:tl} == test
 TEST_DEPENDS+=                 ${PYDEPENDENCY}
 .  else
-.    if !empty(PYTHON_FOR_BUILD_ONLY:M[yY][eE][sS])
+.    if ${PYTHON_FOR_BUILD_ONLY:tl} == yes
 BUILDLINK_DEPMETHOD.python?=   build
 .    else
 BUILDLINK_DEPMETHOD.python?=   full
@@ -266,7 +266,7 @@ BUILDLINK_DEPMETHOD.python?=        full
 .    include "${PYPKGSRCDIR}/buildlink3.mk"
 .    if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+=                 ${PYDEPENDENCY}
-MAKE_ENV+=                     PYTHONPATH=${WRKDIR:Q}/.pysite:${_CROSS_DESTDIR:Q}${LOCALBASE:Q}/${PYLIB:Q}
+MAKE_ENV+=                     PYTHONPATH=${WRKDIR}/.pysite:${_CROSS_DESTDIR:Q}${LOCALBASE}/${PYLIB:Q}
 pre-configure: ${WRKDIR}/.pysite/sitecustomize.py
 .include "${PYPKGSRCDIR}/platname.mk"
 ${WRKDIR}/.pysite/sitecustomize.py:
@@ -281,7 +281,7 @@ ${WRKDIR}/.pysite/sitecustomize.py:
                        sys.exec_prefix \
                        sys.prefix \
                ; do \
-                       ${PRINTF} "%s = '%s'\\n" "$$v" ${LOCALBASE:Q}; \
+                       ${PRINTF} "%s = '%s'\\n" "$$v" ${LOCALBASE}; \
                done; \
        ) >${.TARGET}.tmp
        ${RUN} ${MV} -f ${.TARGET}.tmp ${.TARGET}
@@ -296,7 +296,7 @@ PYTHONCONFIG=       ${TOOLBASE}/bin/python${PY
 .else
 PYTHONCONFIG=  ${TOOLBASE}/bin/python${PYVERSSUFFIX}-config
 .endif
-PY_COMPILE_ALL= \
+PY_COMPILE_ALL=        \
        ${TOOL_PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
 PY_COMPILE_O_ALL= \
        ${TOOL_PYTHONBIN} -O ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
@@ -316,25 +316,25 @@ PRINT_PLIST_AWK+= /(^|^\$$.+\})${PYLIB:S
 ALL_ENV+=              PYTHON=${TOOL_PYTHONBIN}
 .if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindPython
-CMAKE_CONFIGURE_ARGS+=         -DPython_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_CONFIGURE_ARGS+=         -DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
 # used by FindPython2
 .  if !empty(_PYTHON_VERSION:M2*)
-CMAKE_CONFIGURE_ARGS+=         -DPython2_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_CONFIGURE_ARGS+=         -DPython2_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython2_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython2_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
 .  endif
 # used by FindPython3
 .  if !empty(_PYTHON_VERSION:M3*)
-CMAKE_CONFIGURE_ARGS+=         -DPython3_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_CONFIGURE_ARGS+=         -DPython3_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython3_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython3_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
 .  endif
 # used by FindPythonInterp.cmake and FindPythonLibs.cmake
-CMAKE_CONFIGURE_ARGS+=         -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
 # set this explicitly, as by default it will prefer the built in framework
 # on Darwin
-CMAKE_CONFIGURE_ARGS+=         -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_CONFIGURE_ARGS+=         -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_CONFIGURE_ARGS+=         -DPYTHON_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
 .endif
 
 _VARGROUPS+=           pyversion
@@ -345,7 +345,7 @@ _PKG_VARS.pyversion=        \
 _SYS_VARS.pyversion=   \
        PYTHON_VERSION PYTHON_VERSION_REQD PYPACKAGE PYVERSSUFFIX       \
        PYPKGSRCDIR PYPKGPREFIX PYTHONBIN PYTHONCONFIG PY_COMPILE_ALL   \
-       PY_COMPILE_O_ALL PYINC PYLIB PYSITELIB CMAKE_CONFIGURE_ARGS             \
+       PY_COMPILE_O_ALL PYINC PYLIB PYSITELIB CMAKE_CONFIGURE_ARGS \
        TOOL_PYTHONBIN
 _USE_VARS.pyversion=   \
        PKGNAME_REQD PKGNAME_OLD LOCALBASE PREFIX BUILDLINK_DIR PKGNAME

Index: pkgsrc/lang/python/wheel.mk
diff -u pkgsrc/lang/python/wheel.mk:1.25 pkgsrc/lang/python/wheel.mk:1.26
--- pkgsrc/lang/python/wheel.mk:1.25    Mon Apr 27 22:38:34 2026
+++ pkgsrc/lang/python/wheel.mk Thu May 28 03:58:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: wheel.mk,v 1.25 2026/04/27 22:38:34 gdt Exp $
+# $NetBSD: wheel.mk,v 1.26 2026/05/28 03:58:33 adam Exp $
 #
 # Build and install Python wheels
 #
@@ -80,13 +80,13 @@ do-install:
        ${RUN} cd ${WRKSRC}/${PYSETUPSUBDIR} && \
        ${SETENV} ${INSTALL_ENV} ${TOOL_PYTHONBIN} \
                -m installer \
-               --destdir ${DESTDIR:Q} \
-               --prefix ${PREFIX:Q} \
+               --destdir ${DESTDIR} \
+               --prefix ${PREFIX} \
                ${PYINSTALL_EXEC} \
                ${WHEELFILE}
-.for f in ${PY_RENAME_BINARIES}
+.  for f in ${PY_RENAME_BINARIES}
        cd ${DESTDIR}/${PREFIX}/bin && ${MV} ${f} ${f}-${PYVERSSUFFIX} || ${TRUE}
-.endfor
+.  endfor
 .endif
 
 USE_PYTEST?=   yes

Prev by Date: CVS commit: pkgsrc/x11/qt5-qtwebkit
Next by Date: CVS commit: pkgsrc/misc/py-platformdirs
Previous by Thread: CVS commit: pkgsrc/x11/qt5-qtwebkit
Next by Thread: CVS commit: pkgsrc/misc/py-platformdirs
Indexes:

Home | Main Index | Thread Index | Old Index