Index: head/devel/py-setuptools/Makefile
===================================================================
--- head/devel/py-setuptools/Makefile	(revision 408676)
+++ head/devel/py-setuptools/Makefile	(revision 408677)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	setuptools
-PORTVERSION=	19.2
+PORTVERSION=	20.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python packages installer
 
 LICENSE=	PSFL
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 PYDISTUTILS_SETUP=	${PYSETUP}
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
 MAKE_ENV+=		SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 
 PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
 SUB_FILES+=	pkg-message
 SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
 .endif
 
 # These create dependency loops in redports/poudriere, because setuptools
 # is currently an explicit BUILD & RUN dependency in Uses/python.mk.
 #TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
 #.if ${PYTHON_REL} < 3300
 #TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 #.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: head/devel/py-setuptools/distinfo
===================================================================
--- head/devel/py-setuptools/distinfo	(revision 408676)
+++ head/devel/py-setuptools/distinfo	(revision 408677)
@@ -1,2 +1,2 @@
-SHA256 (python/setuptools-19.2.tar.gz) = f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a
-SIZE (python/setuptools-19.2.tar.gz) = 641777
+SHA256 (python/setuptools-20.0.tar.gz) = a6f7b295f399fed3de918c4bea9e2053a5fbd9e3a55a6fef7aafe9d1f474866d
+SIZE (python/setuptools-20.0.tar.gz) = 641692
Index: head/devel/py-setuptools/files/patch-setuptools__command__install_egg_info.py
===================================================================
--- head/devel/py-setuptools/files/patch-setuptools__command__install_egg_info.py	(revision 408676)
+++ head/devel/py-setuptools/files/patch-setuptools__command__install_egg_info.py	(nonexistent)
@@ -1,15 +0,0 @@
-# install_egg_info command includes directory entries in --record output
-# Issue: https://bitbucket.org/pypa/setuptools/issue/118
-# TODO: Merge upstream (was merged, then backed out)
-
---- setuptools/command/install_egg_info.py.orig	2015-05-31 02:01:18 UTC
-+++ setuptools/command/install_egg_info.py
-@@ -27,7 +27,7 @@ class install_egg_info(Command):
-         ).egg_name() + '.egg-info'
-         self.source = ei_cmd.egg_info
-         self.target = os.path.join(self.install_dir, basename)
--        self.outputs = [self.target]
-+        self.outputs = []
- 
-     def run(self):
-         self.run_command('egg_info')

Property changes on: head/devel/py-setuptools/files/patch-setuptools__command__install_egg_info.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property