diff -ur py-setuptools.orig/Makefile py-setuptools/Makefile
--- py-setuptools.orig/Makefile	Mon Jul 30 13:41:21 2007
+++ py-setuptools/Makefile	Thu Aug  9 15:06:57 2007
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	setuptools
-PORTVERSION=	0.6c5
+PORTVERSION=	0.6c6
 CATEGORIES=	devel python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/s/setuptools/
+# MASTER_SITES=	http://cheeseshop.python.org/packages/source/s/setuptools/
+MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
+MASTER_SITE_SUBDIR=	source/s/setuptools
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff -ur py-setuptools.orig/distinfo py-setuptools/distinfo
--- py-setuptools.orig/distinfo	Thu Feb  1 10:52:58 2007
+++ py-setuptools/distinfo	Thu Aug  9 15:06:57 2007
@@ -1,3 +1,3 @@
-MD5 (python/setuptools-0.6c5.tar.gz) = c43562970b700ab779d5328ec170f659
-SHA256 (python/setuptools-0.6c5.tar.gz) = ae1ee9b1a4a26d93e7920b19e3f322318faa3f6b98e38f3d40d04a5c131abe2f
-SIZE (python/setuptools-0.6c5.tar.gz) = 245470
+MD5 (python/setuptools-0.6c6.tar.gz) = e3d56d4d19776042607cbbecae823c8b
+SHA256 (python/setuptools-0.6c6.tar.gz) = 075172b39f0933d3fbd1d4e90f29742c1402a29da26db04357eb18fd46ffd6b1
+SIZE (python/setuptools-0.6c6.tar.gz) = 248601