svn commit: r358717 - branches/2014Q2/Mk

[Raphael Kubo da Costa]

Author: rakuco
Date: Sat Jun 21 16:48:02 2014
New Revision: 358717
URL: http://svnweb.freebsd.org/changeset/ports/358717
QAT: https://qat.redports.org/buildarchive/r358717/

Log:
  MFH: r358308
  
  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
  
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q2/Mk/bsd.python.mk
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/Mk/bsd.python.mk
==============================================================================
--- branches/2014Q2/Mk/bsd.python.mk	Sat Jun 21 16:38:43 2014	(r358716)
+++ branches/2014Q2/Mk/bsd.python.mk	Sat Jun 21 16:48:02 2014	(r358717)
@@ -564,6 +564,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}} \
 		' \