pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Move PY_PEP3147 specific PRINT_PLIST handling from com...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6ad478fb8921
branches: trunk
changeset: 629615:6ad478fb8921
user: obache <obache%pkgsrc.org@localhost>
date: Fri Jan 24 12:42:52 2014 +0000
description:
Move PY_PEP3147 specific PRINT_PLIST handling from common mk/plist/print-plist.mk
to lang/python/extension.mk, handling reverse way.
diffstat:
lang/python/extension.mk | 5 ++++-
mk/plist/print-plist.mk | 5 +----
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (36 lines):
diff -r 60e62550dd3e -r 6ad478fb8921 lang/python/extension.mk
--- a/lang/python/extension.mk Fri Jan 24 11:30:10 2014 +0000
+++ b/lang/python/extension.mk Fri Jan 24 12:42:52 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.36 2014/01/12 09:01:50 wiz Exp $
+# $NetBSD: extension.mk,v 1.37 2014/01/24 12:42:52 obache Exp $
.include "../../lang/python/pyversion.mk"
@@ -69,4 +69,7 @@
.if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYTHON_SOABI="cpython-${_PYTHON_VERSION}"
+PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py[co]$$/ {
+PRINT_PLIST_AWK+= gsub(/__pycache__\//, "")
+PRINT_PLIST_AWK+= gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
.endif
diff -r 60e62550dd3e -r 6ad478fb8921 mk/plist/print-plist.mk
--- a/mk/plist/print-plist.mk Fri Jan 24 11:30:10 2014 +0000
+++ b/mk/plist/print-plist.mk Fri Jan 24 12:42:52 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.25 2014/01/18 19:48:57 wiz Exp $
+# $NetBSD: print-plist.mk,v 1.26 2014/01/24 12:42:52 obache Exp $
###
### Automatic PLIST generation
@@ -29,9 +29,6 @@
gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/"); \
gsub("^${PKGINFODIR}/", "info/"); \
gsub("^${PKGMANDIR}/", "man/");
-# for Python packages
-_PRINT_PLIST_AWK_SUBST+= gsub(/__pycache__\//, "");
-_PRINT_PLIST_AWK_SUBST+= gsub(/\.cpython-[0-9]+/, "")
_PRINT_PLIST_AWK_SUBST+=}
Home |
Main Index |
Thread Index |
Old Index