diff -ruN py-setuptools.orig/Makefile py-setuptools/Makefile
--- py-setuptools.orig/Makefile	2011-03-08 15:18:29.000000000 +0100
+++ py-setuptools/Makefile	2011-03-08 14:56:04.000000000 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	setuptools
 PORTVERSION=	0.6c11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -31,12 +31,22 @@
 PLIST_SUB+=	PYTHON_OLD="@comment "
 .endif
 
+SUB_FILES=	pkg-install
+SUB_LIST=	EASYINSTALL_PTH=${EASYINSTALL_PTH}
+
+EASYINSTALL_PTH=	${PYTHON_SITELIBDIR}/easy-install.pth
+
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/site.py ${PYTHON_SITELIBDIR}
 .for opt in -Qold -O
 	${PYTHON_CMD} ${opt} -m compileall -l -x \
 		'^[^s][^i]?[^t]?[^e]?[^.][^p][^y]$$' ${PYTHON_SITELIBDIR}
 .endfor
+	${CP} ${EASYINSTALL_PTH} ${EASYINSTALL_PTH}.dist
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff -ruN py-setuptools.orig/files/pkg-install.in py-setuptools/files/pkg-install.in
--- py-setuptools.orig/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
+++ py-setuptools/files/pkg-install.in	2011-03-08 10:43:06.000000000 +0100
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+EASYINSTALL_PTH=%%EASYINSTALL_PTH%%
+
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+case $2 in
+     PRE-INSTALL)
+		if [ -f ${EASYINSTALL_PTH} ]; then
+		    mv ${EASYINSTALL_PTH} ${EASYINSTALL_PTH}.tmp
+		fi
+		;;
+     POST-INSTALL)
+		if [ -f ${EASYINSTALL_PTH}.tmp ]; then
+		    mv ${EASYINSTALL_PTH}.tmp ${EASYINSTALL_PTH}
+		fi
+		;;
+esac
+
+exit 0
+
diff -ruN py-setuptools.orig/pkg-plist py-setuptools/pkg-plist
--- py-setuptools.orig/pkg-plist	2011-03-08 15:09:14.000000000 +0100
+++ py-setuptools/pkg-plist	2011-03-08 15:01:47.000000000 +0100
@@ -1,8 +1,10 @@
 @comment $FreeBSD: ports/devel/py-setuptools/pkg-plist,v 1.11 2007/11/20 09:10:41 pav Exp $
 bin/easy_install
 bin/easy_install-%%PYVER%%
-%%PYTHON_SITELIBDIR%%/easy-install.pth
 %%PYTHON_SITELIBDIR%%/setuptools.pth
+@unexec if cmp -s %B/easy-install.pth %B/easy-install.pth.dist; then rm %B/easy-install.pth; fi
+%%PYTHON_SITELIBDIR%%/easy-install.pth.dist
+@exec [ ! -f %B/easy-install.pth ]; then cp %B/%f %B/easy-install.pth; fi
 %%PYTHON_SITELIBDIR%%/site.py
 %%PYTHON_SITELIBDIR%%/site.pyc
 %%PYTHON_SITELIBDIR%%/site.pyo