Date: Thu, 27 Sep 2012 13:52:53 +0000 (UTC) From: Sofian Brabez <sbz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304962 - head/lang/python Message-ID: <201209271352.q8RDqrOa029157@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209271352.q8RDqrOa029157>