CVS commit: pkgsrc/lang/python

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Sep  6 09:05:59 UTC 2022

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

Log Message:
python: Allow PYDISTUTILSPKG to be overridden on a per-package basis.

This is useful for allowing packages that install python egg metadata
to benefit from the PRINT_PLIST_AWK defined in egg.mk even if they don't
actually use setup.py or normal Python build tools.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/lang/python/extension.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/python/srcdist.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/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.38 pkgsrc/lang/python/egg.mk:1.39
--- pkgsrc/lang/python/egg.mk:1.38      Sun Apr  3 13:59:33 2022
+++ pkgsrc/lang/python/egg.mk   Tue Sep  6 09:05:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.38 2022/04/03 13:59:33 wiz Exp $
+# $NetBSD: egg.mk,v 1.39 2022/09/06 09:05:59 nia Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -13,8 +13,8 @@
 EGG_NAME?=     ${DISTNAME:C/-([^0-9])/_\1/g}
 EGG_INFODIR?=  ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
-PYDISTUTILSPKG=        yes
-PY_PATCHPLIST= yes
+PYDISTUTILSPKG?=       yes
+PY_PATCHPLIST?=                yes
 
 # True eggs always have an egg-info directory. egg.mk can also
 # be used for distutils packages, in which case there will be no

Index: pkgsrc/lang/python/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.59 pkgsrc/lang/python/extension.mk:1.60
--- pkgsrc/lang/python/extension.mk:1.59        Wed Jan 12 08:34:34 2022
+++ pkgsrc/lang/python/extension.mk     Tue Sep  6 09:05:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.59 2022/01/12 08:34:34 wiz Exp $
+# $NetBSD: extension.mk,v 1.60 2022/09/06 09:05:59 nia Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -8,7 +8,7 @@
 # eggs (see egg.mk), via wheels (see wheel.mk), or via more ad hoc
 # methods.
 
-.if defined(PYDISTUTILSPKG)
+.if !empty(PYDISTUTILSPKG:M[yY][eE][sS])
 .include "../../mk/bsd.prefs.mk"
 
 PYSETUP?=              setup.py

Index: pkgsrc/lang/python/srcdist.mk
diff -u pkgsrc/lang/python/srcdist.mk:1.41 pkgsrc/lang/python/srcdist.mk:1.42
--- pkgsrc/lang/python/srcdist.mk:1.41  Thu Dec 30 21:33:09 2021
+++ pkgsrc/lang/python/srcdist.mk       Tue Sep  6 09:05:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.41 2021/12/30 21:33:09 tnn Exp $
+# $NetBSD: srcdist.mk,v 1.42 2022/09/06 09:05:59 nia Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -7,7 +7,7 @@
 PYSUBDIR=      ${DISTNAME}
 WRKSRC=                ${WRKDIR}/${PYSUBDIR}
 
-.if defined(PYDISTUTILSPKG)
+.if !empty(PYDISTUTILSPKG:M[yY][eE][sS])
 # This is used for standard modules shipped with Python but build as
 # separate packages.