Date: Wed, 18 Jun 2014 19:37:49 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358308 - head/Mk Message-ID: <201406181937.s5IJbnEU025800@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Jun 18 19:37:49 2014 New Revision: 358308 URL: http://svnweb.freebsd.org/changeset/ports/358308 QAT: https://qat.redports.org/buildarchive/r358308/ Log: PYTHON_PY3K_PLIST_HACK: Take @dirrmtry entries into account as well. When using the plist hack to add __pycache__ entries for Python >= 3.2.0, take @dirrmtry entries into account as well, otherwise if those directories happen to contain __pycache__ subdirectories the latter will not be removed. CR: D191 PR: 190847 Modified: head/Mk/bsd.python.mk Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Wed Jun 18 19:37:37 2014 (r358307) +++ head/Mk/bsd.python.mk Wed Jun 18 19:37:49 2014 (r358308) @@ -629,6 +629,7 @@ add-plist-post: @${AWK} '\ /\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/, "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \ /^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \ + /^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \ {print} \ END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \ ' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406181937.s5IJbnEU025800>