v33.1.1

-------
* 921: Correct issue where certifi fallback not being
  reached on Windows.

v33.1.0
-------
Installation via pip, as indicated in the `Python Packaging
User's Guide <https://packaging.python.org/installing/>`_,
is the officially-supported mechanism for installing
Setuptools, and this recommendation is now explicit in the
much more concise README.

Other edits and tweaks were made to the documentation. The
codebase is unchanged.

v33.0.0
-------
* 619: Removed support for the ``tag_svn_revision``
  distribution option. If Subversion tagging support is
  still desired, consider adding the functionality to
  setuptools_svn in setuptools_svn 2.

4 files changed, 26 insertions, 21 deletions

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index b889a34e42e..e4d8e590c0b 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.120 2016/12/19 09:02:59 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2017/01/26 18:09:19 adam Exp $
 
-DISTNAME=		setuptools-32.1.0
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		devel python
-MASTER_SITES=		${MASTER_SITE_PYPI:=s/setuptools/}
+DISTNAME=	setuptools-33.1.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/setuptools/}
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=		joerg@NetBSD.org
-HOMEPAGE=		https://pypi.python.org/pypi/setuptools
-COMMENT=		New Python packaging system
-LICENSE=		python-software-foundation OR zpl-2.0
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	https://pypi.python.org/pypi/setuptools
+COMMENT=	New Python packaging system
+LICENSE=	python-software-foundation OR zpl-2.0
 
 DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 # not sure if this would introduce a dependency cycle
-#BUILD_DEPENDS+=		${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-
-PLIST_SUBST+=		EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+#BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 REPLACE_PYTHON+=	setuptools/command/easy_install.py
 
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index dad265c7484..8f74f8df486 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2016/12/12 14:58:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2017/01/26 18:09:19 adam Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
@@ -182,6 +182,12 @@ ${PYSITELIB}/setuptools/py27compat.pyo
 ${PYSITELIB}/setuptools/py31compat.py
 ${PYSITELIB}/setuptools/py31compat.pyc
 ${PYSITELIB}/setuptools/py31compat.pyo
+${PYSITELIB}/setuptools/py33compat.py
+${PYSITELIB}/setuptools/py33compat.pyc
+${PYSITELIB}/setuptools/py33compat.pyo
+${PYSITELIB}/setuptools/py36compat.py
+${PYSITELIB}/setuptools/py36compat.pyc
+${PYSITELIB}/setuptools/py36compat.pyo
 ${PYSITELIB}/setuptools/sandbox.py
 ${PYSITELIB}/setuptools/sandbox.pyc
 ${PYSITELIB}/setuptools/sandbox.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index 493a637f988..722c7efdd3b 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.98 2016/12/19 09:02:59 wiz Exp $
+$NetBSD: distinfo,v 1.99 2017/01/26 18:09:19 adam Exp $
 
-SHA1 (setuptools-32.1.0.tar.gz) = e014eaa342442406f84bd0d235058e1cc712ff98
-RMD160 (setuptools-32.1.0.tar.gz) = 23d43206b6f0a3e6ecc439596d1b36bc3b7e8708
-SHA512 (setuptools-32.1.0.tar.gz) = 338fab261c318fefe5871c67fbd0ebccbe02aa95d6630595c76de4034bebee79174f87ad0360ebbac4a8ab362727640bc157923000a14ea2fbc4e294096a9783
-Size (setuptools-32.1.0.tar.gz) = 656843 bytes
-SHA1 (patch-setup.py) = 21fda11ff2f33c57ec49e18375cf7d7b8f8388bf
+SHA1 (setuptools-33.1.1.zip) = 617d3a5175b9bb048b5df95f6cca5fcd5226f82e
+RMD160 (setuptools-33.1.1.zip) = 5e1a67aa9cfad9c33dc753d7f1bad5a03defc6c1
+SHA512 (setuptools-33.1.1.zip) = 15fe2009166621ab0ae7480c5331accbf8fc9cd9e2943999abaecae9eba870634a0914f7829711e43cab4e8da6b6140c1586a9db9bb4623662dca6f5482bc49c
+Size (setuptools-33.1.1.zip) = 702770 bytes
+SHA1 (patch-setup.py) = dd94c9a4e15b8b0dc428515f73369ed168b8c7b2
diff --git a/devel/py-setuptools/patches/patch-setup.py b/devel/py-setuptools/patches/patch-setup.py
index 16a6831d9f0..aa882f63dc5 100644
--- a/devel/py-setuptools/patches/patch-setup.py
+++ b/devel/py-setuptools/patches/patch-setup.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-setup.py,v 1.3 2016/07/21 12:54:49 wiz Exp $
+$NetBSD: patch-setup.py,v 1.4 2017/01/26 18:09:19 adam Exp $
 
 Do not install easy_install without python version suffix to allow
 parallel installation of this package for multiple python versions.
 
 --- setup.py.orig	2016-07-14 05:17:28.000000000 +0000
 +++ setup.py
-@@ -28,7 +28,7 @@ scripts = []
+@@ -30,7 +30,7 @@ scripts = []
  
  
  def _gen_console_scripts():