Sun Aug 28 09:40:35 2016 UTC ()

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


(richard)

diff -r1.7 -r1.8 pkgsrc/lang/python/distutils.mk
diff -r1.23 -r1.24 pkgsrc/lang/python/egg.mk

--- pkgsrc/lang/python/Attic/distutils.mk 2014/12/31 13:57:28 1.7
+++ pkgsrc/lang/python/Attic/distutils.mk 2016/08/28 09:40:35 1.8

@@ -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"

--- pkgsrc/lang/python/egg.mk 2016/06/01 09:44:52 1.23
+++ pkgsrc/lang/python/egg.mk 2016/08/28 09:40:35 1.24

@@ -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