CVS commit: pkgsrc/lang/python

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Jun 10 16:11:08 UTC 2020

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

Log Message:
python/extension.mk: Fix print-PLIST target to generate properly sorted PLISTs

Use EARLY_PRINT_PLIST_AWK instead of PRINT_PLIST_AWK so all the transformations
are done before the file/directory lists generated as part of print-PLIST are
sorted.

Discussed on tech-pkg@:

 <https://mail-index.NetBSD.org/tech-pkg/2020/05/27/msg023249.html>


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/lang/python/extension.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/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.56 pkgsrc/lang/python/extension.mk:1.57
--- pkgsrc/lang/python/extension.mk:1.56        Thu May  2 22:06:15 2019
+++ pkgsrc/lang/python/extension.mk     Wed Jun 10 16:11:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.56 2019/05/02 22:06:15 wiz Exp $
+# $NetBSD: extension.mk,v 1.57 2020/06/10 16:11:07 leot Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -74,10 +74,10 @@ FILES_SUBST+=       PYVERSSUFFIX=${PYVERSSUFFI
 .if empty(_PYTHON_VERSION:M2?)
 PLIST_AWK+=            -f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=                PYVERS="${PYVERSSUFFIX:S/.//}"
-PRINT_PLIST_AWK+=      /^[^@]/ && /[^\/]+\.py[co]$$/ {
-PRINT_PLIST_AWK+=      gsub(/__pycache__\//, "")
-PRINT_PLIST_AWK+=      gsub(/opt-1\.pyc$$/, "pyo")
-PRINT_PLIST_AWK+=      gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
+EARLY_PRINT_PLIST_AWK+=        /^[^@]/ && /[^\/]+\.py[co]$$/ {
+EARLY_PRINT_PLIST_AWK+=        gsub(/__pycache__\//, "")
+EARLY_PRINT_PLIST_AWK+=        gsub(/opt-1\.pyc$$/, "pyo")
+EARLY_PRINT_PLIST_AWK+=        gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
 .endif
 
 DISTUTILS_BUILDDIR_IN_TEST_ENV?=       no