[pkgsrc/trunk]: pkgsrc/lang/python Let print-PLIST generate python version ag...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/991da0f64b6d
branches:  trunk
changeset: 351797:991da0f64b6d
user:      richard <richard%pkgsrc.org@localhost>
date:      Sun Aug 28 09:40:35 2016 +0000

description:
Let print-PLIST generate python version agnostic PYVERSSUFFIX in filenames.
This is somewhat related to the recent PLIST_SUBST commit.  Ok'd by wiz@

diffstat:

 lang/python/distutils.mk |  4 +++-
 lang/python/egg.mk       |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 1800ed8b8210 -r 991da0f64b6d lang/python/distutils.mk
--- a/lang/python/distutils.mk  Sun Aug 28 07:00:50 2016 +0000
+++ b/lang/python/distutils.mk  Sun Aug 28 09:40:35 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $
+# $NetBSD: distutils.mk,v 1.8 2016/08/28 09:40:35 richard Exp $
 #
 # Common logic for python distributions that use distutils.
 #
@@ -28,5 +28,7 @@
 PLIST_SUBST+=  EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 PRINT_PLIST_AWK+=      { gsub("${EGG_NAME}-py${PYVERSSUFFIX}.egg-info", \
                                "$${EGG_FILE}") }
+PRINT_PLIST_AWK+=      { gsub(/${PYVERSSUFFIX}/, \
+                               "$${PYVERSSUFFIX}") }
 
 .include "../../lang/python/extension.mk"
diff -r 1800ed8b8210 -r 991da0f64b6d lang/python/egg.mk
--- a/lang/python/egg.mk        Sun Aug 28 07:00:50 2016 +0000
+++ b/lang/python/egg.mk        Sun Aug 28 09:40:35 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.23 2016/06/01 09:44:52 wiz Exp $
+# $NetBSD: egg.mk,v 1.24 2016/08/28 09:40:35 richard Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -32,6 +32,8 @@
                               "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \
                               "$${EGG_NAME}-nspkg.pth") }
+PRINT_PLIST_AWK+=      { gsub(/${PYVERSSUFFIX}/, \
+                              "$${PYVERSSUFFIX}") }
 
 _PYSETUPTOOLSINSTALLARGS=      --single-version-externally-managed