Index: Makefile
===================================================================
RCS file: /ncvs/ports/lang/python/Makefile,v
retrieving revision 1.161
diff -u -r1.161 Makefile
--- Makefile	31 Jul 2007 16:28:32 -0000	1.161
+++ Makefile	10 Jun 2009 15:40:12 -0000
@@ -24,24 +24,38 @@
 	@${DO_NADA}
 
 # Major upgrade support
-PORTUPGRADE_CMD?=	${LOCALBASE}/sbin/portupgrade
-PKG_WHICH_CMD?=	${LOCALBASE}/sbin/pkg_which
+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:
 	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
 		${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
 		${FALSE}; \
 	 fi
 
-	@for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do \
+	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} -0 ${PKG_WHICH_CMD} | \
+				${XARGS_CMD} ${PKG_WHICH_CMD} | \
 				${GREP} -Fv '?' | \
 				${EGREP} -v '^python2?[0-5]?-2' | \
 				${SORT} -u`; \
 			if [ "$$UPD" ]; then \
-				${PORTUPGRADE_CMD} -f $$UPD; \
+				if [ -n ${PORTUPGRADE_ARGS} ]; then \
+					${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $$UPD; \
+				else \
+					${PORTUPGRADE_CMD} -f $$UPD; \
+				fi; \
 			fi; \
 		fi; \
 	 done \