From owner-svn-ports-all@FreeBSD.ORG  Thu Sep 27 13:52:54 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1743A1065670;
	Thu, 27 Sep 2012 13:52:54 +0000 (UTC) (envelope-from sbz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DD2918FC17;
	Thu, 27 Sep 2012 13:52:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RDqrWq029160;
	Thu, 27 Sep 2012 13:52:53 GMT (envelope-from sbz@svn.freebsd.org)
Received: (from sbz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RDqrOa029157;
	Thu, 27 Sep 2012 13:52:53 GMT (envelope-from sbz@svn.freebsd.org)
Message-Id: <201209271352.q8RDqrOa029157@svn.freebsd.org>
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Thu, 27 Sep 2012 13:52:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304962 - head/lang/python
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 27 Sep 2012 13:52:54 -0000

Author: sbz
Date: Thu Sep 27 13:52:53 2012
New Revision: 304962
URL: http://svn.freebsd.org/changeset/ports/304962

Log:
  - Speed up upgrade-site-packages [1]
  - Use make modifiers [2]
  
  PR:		ports/155970
  Submitted by:	Julien Laffaye <kimelto at gmail.com> [1], sbz (myself) [2]
  Exp-run by:	beat

Modified:
  head/lang/python/Makefile

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Thu Sep 27 13:44:01 2012	(r304961)
+++ head/lang/python/Makefile	Thu Sep 27 13:52:53 2012	(r304962)
@@ -25,15 +25,9 @@ do-install:
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
-PKG_WHICH_CMD=	${LOCALBASE}/sbin/pkg_which
-XARGS_CMD=	${XARGS} -0
 
 .if defined(USE_PORTMASTER)
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
-PORTUPGRADE_ARGS?=	""
-PKG_WHICH_CMD=	/usr/sbin/pkg_info -qW
-JOBS=	${SYSCTL} -n kern.smp.cpus
-XARGS_CMD=	${XARGS} -L 1 -0 -P $$(${JOBS})
 .endif
 
 upgrade-site-packages:
@@ -42,22 +36,21 @@ upgrade-site-packages:
 		${FALSE}; \
 	 fi
 
-	@for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do \
-		if [ -d ${PREFIX}/lib/python$$ver ]; then \
-			UPD=`${FIND} ${PREFIX}/lib/python$$ver \
-					-type f -print0 | \
-				${XARGS_CMD} ${PKG_WHICH_CMD} | \
-				${GREP} -Fv '?' | \
-				${EGREP} -v '^python2?[0-5]?-2' | \
-				${SORT} -u`; \
-			if [ "$$UPD" ]; then \
-				if [ -n ${PORTUPGRADE_ARGS} ]; then \
-					${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $$UPD; \
-				else \
-					${PORTUPGRADE_CMD} -f $$UPD; \
-				fi; \
-			fi; \
+	@GREP_ARGS="-q"; \
+	for ver in `echo ${_PYTHON_ALLBRANCHES:C/${PYTHON_VER}//}`; do \
+		GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
+	done; \
+	UPD=""; \
+	for pkg in `${PKG_INFO} -Ea`; do \
+		${PKG_INFO} -L $${pkg} | ${GREP} $${GREP_ARGS} && \
+			UPD="$${UPD} $${pkg}"; \
+	done; \
+	if [ "$${UPD}" ]; then \
+		if [ -n ${PORTUPGRADE_ARGS} ]; then \
+			${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \
+		else \
+			${PORTUPGRADE_CMD} -f $${UPD}; \
 		fi; \
-	 done \
+	fi; \
 
 .include <bsd.port.mk>