From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 21 16:48:02 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F057A3CD;
 Sat, 21 Jun 2014 16:48:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD9692154;
 Sat, 21 Jun 2014 16:48:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LGm2iY077089;
 Sat, 21 Jun 2014 16:48:02 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LGm2BM077088;
 Sat, 21 Jun 2014 16:48:02 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201406211648.s5LGm2BM077088@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 21 Jun 2014 16:48:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r358717 - branches/2014Q2/Mk
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jun 2014 16:48:03 -0000

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}} \
 		' \