Index: bsd.python.mk
===================================================================
--- bsd.python.mk	(revision 332095)
+++ bsd.python.mk	(working copy)
@@ -451,7 +451,7 @@
 								-d ${PYEASYINSTALL_SITELIBDIR} \
 								-s ${PYEASYINSTALL_BINDIR} \
 								${WRKSRC}/dist/${PYEASYINSTALL_EGG}
-.if ${PREFIX} != ${LOCALBASE}
+.if ${PREFIX} != ${LOCALBASE} || !defined(NO_STAGE)
 MAKE_ENV+=						PYTHONPATH=${PYEASYINSTALL_SITELIBDIR}
 .endif
 
@@ -461,8 +461,13 @@
 .endif
 PYEASYINSTALL_EGG?=				${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg
 PYEASYINSTALL_CMD?=				${LOCALBASE}/bin/easy_install-${PYTHON_VER}
+.if !defined(NO_STAGE)
+PYEASYINSTALL_BINDIR?=			${STAGEDIR}${PREFIX}/bin
+PYEASYINSTALL_SITELIBDIR?=		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+.else
 PYEASYINSTALL_BINDIR?=			${PREFIX}/bin
 PYEASYINSTALL_SITELIBDIR?=		${PYTHONPREFIX_SITELIBDIR}
+.endif
 PYEASYINSTALL_INSTALLARGS?=		-q -N -S ${PYTHON_SITELIBDIR} \
 								-d ${PYEASYINSTALL_SITELIBDIR} \
 								-s ${PYEASYINSTALL_BINDIR} \
@@ -483,10 +488,10 @@
 	@# Easiest to fake pyeasyinstall, or it complains about paths
 	@${ECHO_CMD} "@unexec ${REINPLACE_CMD} -i '' \
 			-e '\,^\./${PYEASYINSTALL_EGG}$$,d' \
-			${PYEASYINSTALL_SITELIBDIR}/easy-install.pth" \
+			${PYEASYINSTALL_SITELIBDIR:S,^${STAGEDIR},,}/easy-install.pth" \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${PRINTF} '1a\n./${PYEASYINSTALL_EGG}\n.\nw\nq\n' | \
-			/bin/ed ${PYEASYINSTALL_SITELIBDIR}/easy-install.pth" \
+			/bin/ed ${PYEASYINSTALL_SITELIBDIR:S,^${STAGEDIR},,}/easy-install.pth" \
 		>> ${TMPPLIST}
 .endif		# defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
 
@@ -495,7 +500,7 @@
 PYDISTUTILS_CONFIGUREARGS?=
 PYDISTUTILS_BUILDARGS?=
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
-.if !defined(NO_STAGE)
+.if !defined(NO_STAGE) && defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install"
 PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
 .endif
 PYDISTUTILS_PKGNAME?=	${PORTNAME}
@@ -519,6 +524,12 @@
 PYDISTUTILS_INSTALLARGS:=	--record ${_PYTHONPKGLIST} \
 							${PYDISTUTILS_INSTALLARGS}
 
+.if !defined(NO_STAGE) && ${USE_PYDISTUTILS} == "easy_install"
+_SPREFIX=	${STAGEDIR}${PREFIX}
+.else
+_SPREFIX=	${PREFIX}
+.endif
+
 _RELSITELIBDIR=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 _RELLIBDIR=		${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
 
@@ -528,10 +539,10 @@
 		${SED} '/^\.$$/d' > ${WRKDIR}/.localmtree
 	@${ECHO_CMD} "${_RELSITELIBDIR}" >> ${WRKDIR}/.localmtree
 	@${ECHO_CMD} "${_RELLIBDIR}" >> ${WRKDIR}/.localmtree
-	@${SED} -e 's|^${PREFIX}/||' \
+	@${SED} -e 's|^${_SPREFIX}/||' \
 		-e 's|^\(man/man[0-9]\)/\(.*\.[0-9]\)$$|\1/\2${MANEXT}|' \
 		${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
-	@${SED} -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
+	@${SED} -e 's|^${_SPREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
 		${AWK} '{ num = split($$0, a, "/"); res=""; \
 					for(i = 1; i <= num; ++i) { \
 						if (i == 1) res = a[i]; \