From owner-svn-ports-head@FreeBSD.ORG  Wed Jun 18 19:37:50 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1A182F11;
 Wed, 18 Jun 2014 19:37:50 +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 0862828CE;
 Wed, 18 Jun 2014 19:37:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IJbnCL025801;
 Wed, 18 Jun 2014 19:37:49 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IJbnEU025800;
 Wed, 18 Jun 2014 19:37:49 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201406181937.s5IJbnEU025800@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 18 Jun 2014 19:37:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358308 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jun 2014 19:37:50 -0000

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