Index: devel/py-setuptools/Makefile
===================================================================
--- devel/py-setuptools/Makefile	(revision 336553)
+++ devel/py-setuptools/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	setuptools
-PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,23 +17,28 @@
 PLIST_SUB=	PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \
 		EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
 
-PYDISTUTILS_NOEGGINFO=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_SETUP=	${PYSETUP}
-PYTHON_PY3K_PLIST_HACK=	yes
 
 SUB_LIST=	IF_DEFAULT=${IF_DEFAULT}
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} && !exists(${LOCALBASE}/bin/easy_install)
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
+.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
 SUB_FILES+=	pkg-message
 .endif
 
+post-patch:
+.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
+	@${REINPLACE_CMD} 's,.*yield "easy_install =.*,,' ${WRKSRC}/setup.py
+.endif
+	@${REINPLACE_CMD} 's,#!python,#!${PYTHON_CMD},' \
+		${WRKSRC}/setuptools/command/easy_install.py
+	@${REINPLACE_CMD} 's,#!/usr/bin/python,#!${PYTHON_CMD},' \
+		${WRKSRC}/setuptools/tests/test_resources.py
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
 
Index: devel/py-setuptools/distinfo
===================================================================
--- devel/py-setuptools/distinfo	(revision 336452)
+++ devel/py-setuptools/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (python/setuptools-1.1.7.tar.gz) = b35e3d7c79cfdb5b38cfc71f4b0deab4350c1176fc4bb05bfa8945504ecfb028
-SIZE (python/setuptools-1.1.7.tar.gz) = 682308
+SHA256 (python/setuptools-2.0.1.tar.gz) = 8772b48bdd219bfbbb6eb262ba32419856e9cb4a4d8deda88cc55c28dc6124ce
+SIZE (python/setuptools-2.0.1.tar.gz) = 783570
Index: devel/py-setuptools/files/patch-setuptools_command_install_lib.py
===================================================================
--- devel/py-setuptools/files/patch-setuptools_command_install_lib.py	(revision 0)
+++ devel/py-setuptools/files/patch-setuptools_command_install_lib.py	(working copy)
@@ -0,0 +1,21 @@
+--- setuptools/command/install_lib.py.orig	2013-12-16 22:09:54.602395279 -0200
++++ setuptools/command/install_lib.py	2013-12-16 22:10:50.052393299 -0200
+@@ -4,18 +4,6 @@
+ class install_lib(_install_lib):
+     """Don't add compiled flags to filenames of non-Python files"""
+ 
+-    def _bytecode_filenames (self, py_filenames):
+-        bytecode_files = []
+-        for py_file in py_filenames:
+-            if not py_file.endswith('.py'):
+-                continue
+-            if self.compile:
+-                bytecode_files.append(py_file + "c")
+-            if self.optimize > 0:
+-                bytecode_files.append(py_file + "o")
+-
+-        return bytecode_files
+-
+     def run(self):
+         self.build()
+         outfiles = self.install()

Property changes on: devel/py-setuptools/files/patch-setuptools_command_install_lib.py
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: devel/py-setuptools/pkg-plist
===================================================================
--- devel/py-setuptools/pkg-plist	(revision 336452)
+++ devel/py-setuptools/pkg-plist	(working copy)
@@ -1,216 +1,3 @@
-%%IF_DEFAULT%%bin/easy_install
-bin/easy_install-%%PYVER%%
 @unexec if cmp -s %%EASYINSTALL_PTH%% %%EASYINSTALL_PTH%%.dist; then rm -f %%EASYINSTALL_PTH%%; fi
 %%PYTHON_SITELIBDIR%%/easy-install.pth.dist
 @exec if [ ! -f "%%EASYINSTALL_PTH%%" ]; then cp -p %%EASYINSTALL_PTH%%.dist %%EASYINSTALL_PTH%%; fi
-%%PYTHON_SITELIBDIR%%/_markerlib/__init__.py
-%%PYTHON_SITELIBDIR%%/_markerlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/_markerlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/_markerlib/markers.py
-%%PYTHON_SITELIBDIR%%/_markerlib/markers.pyc
-%%PYTHON_SITELIBDIR%%/_markerlib/markers.pyo
-%%PYTHON_SITELIBDIR%%/easy_install.py
-%%PYTHON_SITELIBDIR%%/easy_install.pyc
-%%PYTHON_SITELIBDIR%%/easy_install.pyo
-%%PYTHON_SITELIBDIR%%/pkg_resources.py
-%%PYTHON_SITELIBDIR%%/pkg_resources.pyc
-%%PYTHON_SITELIBDIR%%/pkg_resources.pyo
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/entry_points.txt
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/entry_points.txt.orig
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/requires.txt
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/top_level.txt
-%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/zip-safe
-%%PYTHON_SITELIBDIR%%/setuptools/__init__.py
-%%PYTHON_SITELIBDIR%%/setuptools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/__init__.py
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/__init__.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/__init__.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/__init__.py
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha.py
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha256.py
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha256.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha256.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha512.py
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha512.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha512.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/archive_util.py
-%%PYTHON_SITELIBDIR%%/setuptools/archive_util.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/archive_util.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/__init__.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/__init__.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/__init__.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/alias.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/alias.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/alias.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_egg.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_egg.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_egg.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_rpm.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_rpm.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_rpm.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_wininst.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_wininst.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_wininst.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_ext.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_ext.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_ext.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_py.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_py.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/build_py.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/develop.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/develop.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/develop.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/easy_install.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/easy_install.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/easy_install.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/egg_info.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/egg_info.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/egg_info.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/install.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/install.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/install.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_egg_info.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_egg_info.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_egg_info.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_lib.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_lib.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_lib.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_scripts.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_scripts.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/install_scripts.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/register.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/register.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/register.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/rotate.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/rotate.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/rotate.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/saveopts.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/saveopts.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/saveopts.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/sdist.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/sdist.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/sdist.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/setopt.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/setopt.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/setopt.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/test.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/test.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/test.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload_docs.py
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload_docs.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/command/upload_docs.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/compat.py
-%%PYTHON_SITELIBDIR%%/setuptools/compat.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/compat.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/depends.py
-%%PYTHON_SITELIBDIR%%/setuptools/depends.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/depends.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/dist.py
-%%PYTHON_SITELIBDIR%%/setuptools/dist.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/dist.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/extension.py
-%%PYTHON_SITELIBDIR%%/setuptools/extension.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/extension.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/package_index.py
-%%PYTHON_SITELIBDIR%%/setuptools/package_index.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/package_index.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/py24compat.py
-%%PYTHON_SITELIBDIR%%/setuptools/py24compat.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/py24compat.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/py26compat.py
-%%PYTHON_SITELIBDIR%%/setuptools/py26compat.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/py26compat.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/py27compat.py
-%%PYTHON_SITELIBDIR%%/setuptools/py27compat.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/py27compat.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/sandbox.py
-%%PYTHON_SITELIBDIR%%/setuptools/sandbox.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/sandbox.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/script template (dev).py
-%%PYTHON_SITELIBDIR%%/setuptools/script template (dev).pyc
-%%PYTHON_SITELIBDIR%%/setuptools/script template (dev).pyo
-%%PYTHON_SITELIBDIR%%/setuptools/script template.py
-%%PYTHON_SITELIBDIR%%/setuptools/script template.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/script template.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/site-patch.py
-%%PYTHON_SITELIBDIR%%/setuptools/site-patch.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/site-patch.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/ssl_support.py
-%%PYTHON_SITELIBDIR%%/setuptools/ssl_support.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/ssl_support.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/doctest.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/doctest.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/doctest.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/py26compat.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/py26compat.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/py26compat.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/script-with-bom.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/script-with-bom.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/script-with-bom.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/server.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/server.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/server.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_bdist_egg.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_bdist_egg.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_bdist_egg.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_build_ext.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_build_ext.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_build_ext.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_develop.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_develop.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_develop.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_dist_info.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_dist_info.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_dist_info.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_easy_install.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_easy_install.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_easy_install.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_egg_info.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_egg_info.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_egg_info.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_markerlib.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_markerlib.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_markerlib.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_packageindex.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_packageindex.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_packageindex.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_resources.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_resources.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_resources.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sandbox.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sandbox.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sandbox.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sdist.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sdist.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sdist.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_test.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_test.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_test.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_upload_docs.py
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_upload_docs.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/tests/test_upload_docs.pyo
-%%PYTHON_SITELIBDIR%%/setuptools/version.py
-%%PYTHON_SITELIBDIR%%/setuptools/version.pyc
-%%PYTHON_SITELIBDIR%%/setuptools/version.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/tests
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/command
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/_backport
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info
-@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools
-@dirrmtry %%PYTHON_SITELIBDIR%%/_markerlib
-@dirrmtry %%PYTHON_SITELIBDIR%%