From 2ab650eba7eacf347d637cb7bdff0e2415dc50e0 Mon Sep 17 00:00:00 2001 From: alexbl Date: Tue, 31 Jul 2007 16:28:32 +0000 Subject: - use PORTUPGRADE_CMD instead of PORTUPGRADE so as not to confict with the portupgrade env variable Pointed out by: Miroslav Lachman <000.fbsd@quip.cz> --- lang/python/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang') diff --git a/lang/python/Makefile b/lang/python/Makefile index 3b3a59f..b9625ef 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -24,10 +24,10 @@ do-install: @${DO_NADA} # Major upgrade support -PORTUPGRADE?= ${LOCALBASE}/sbin/portupgrade -PKG_WHICH?= ${LOCALBASE}/sbin/pkg_which +PORTUPGRADE_CMD?= ${LOCALBASE}/sbin/portupgrade +PKG_WHICH_CMD?= ${LOCALBASE}/sbin/pkg_which upgrade-site-packages: - @if [ ! -x ${PORTUPGRADE} ]; then \ + @if [ ! -x ${PORTUPGRADE_CMD} ]; then \ ${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \ ${FALSE}; \ fi @@ -36,12 +36,12 @@ upgrade-site-packages: if [ -d ${PREFIX}/lib/python$$ver ]; then \ UPD=`${FIND} ${PREFIX}/lib/python$$ver \ -type f -print0 | \ - ${XARGS} -0 ${PKG_WHICH} | \ + ${XARGS} -0 ${PKG_WHICH_CMD} | \ ${GREP} -Fv '?' | \ ${EGREP} -v '^python2?[0-5]?-2' | \ ${SORT} -u`; \ if [ "$$UPD" ]; then \ - ${PORTUPGRADE} -f $$UPD; \ + ${PORTUPGRADE_CMD} -f $$UPD; \ fi; \ fi; \ done \ -- cgit v1.1