- 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>
This commit is contained in:
Alexander Botero-Lowry 2007-07-31 16:28:32 +00:00
parent 61f99d643a
commit 923bd8b2f8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=196840

View file

@ -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 \