From db7f65e76cf763d534a66f6aa83db6031e41fe56 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 9 Sep 2013 20:37:42 +0000
Subject: [PATCH] Update to 1.1.4:

-----
1.1.4
-----

* Issue #77: Fix error in upload command (Python 2.4).

-----
1.1.3
-----

* Fix NameError in previous patch.

-----
1.1.2
-----

* Issue #69: Correct issue where 404 errors are returned for URLs with
  fragments in them (such as #egg=).

-----
1.1.1
-----

* Issue #75: Add ``--insecure`` option to ez_setup.py to accommodate
  environments where a trusted SSL connection cannot be validated.
* Issue #76: Fix AttributeError in upload command with Python 2.4.
---
 devel/py-setuptools/Makefile |  5 +++--
 devel/py-setuptools/PLIST    | 11 +++++++----
 devel/py-setuptools/distinfo |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 5164e724b8c74..a2d47177f7924 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2013/09/03 09:03:09 tron Exp $
+# $NetBSD: Makefile,v 1.32 2013/09/09 20:37:42 wiz Exp $
 
-EGG_VERSION=		1.1
+EGG_VERSION=		1.1.4
 DISTNAME=		setuptools-${EGG_VERSION}
 EGG_NAME=		setuptools-${EGG_VERSION}
 PKGNAME=		${PYPKGPREFIX}-setuptools-${EGG_VERSION}
@@ -37,6 +37,7 @@ DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/entry_points.txt.orig
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/requires.txt.orig
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/*
 
 .include "../../lang/python/application.mk"
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 3fa7ab4a84f16..32246f1cefe9f 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2013/09/03 09:03:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/09/09 20:37:42 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/_markerlib/__init__.py
 ${PYSITELIB}/_markerlib/__init__.pyc
@@ -22,9 +22,6 @@ ${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo
-${PYSITELIB}/setuptools/version.py
-${PYSITELIB}/setuptools/version.pyc
-${PYSITELIB}/setuptools/version.pyo
 ${PYSITELIB}/setuptools/_backport/__init__.py
 ${PYSITELIB}/setuptools/_backport/__init__.pyc
 ${PYSITELIB}/setuptools/_backport/__init__.pyo
@@ -127,6 +124,9 @@ ${PYSITELIB}/setuptools/package_index.pyo
 ${PYSITELIB}/setuptools/py24compat.py
 ${PYSITELIB}/setuptools/py24compat.pyc
 ${PYSITELIB}/setuptools/py24compat.pyo
+${PYSITELIB}/setuptools/py26compat.py
+${PYSITELIB}/setuptools/py26compat.pyc
+${PYSITELIB}/setuptools/py26compat.pyo
 ${PYSITELIB}/setuptools/py27compat.py
 ${PYSITELIB}/setuptools/py27compat.pyc
 ${PYSITELIB}/setuptools/py27compat.pyo
@@ -196,3 +196,6 @@ ${PYSITELIB}/setuptools/tests/test_test.pyo
 ${PYSITELIB}/setuptools/tests/test_upload_docs.py
 ${PYSITELIB}/setuptools/tests/test_upload_docs.pyc
 ${PYSITELIB}/setuptools/tests/test_upload_docs.pyo
+${PYSITELIB}/setuptools/version.py
+${PYSITELIB}/setuptools/version.pyc
+${PYSITELIB}/setuptools/version.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index 30d96b0b12b3a..358453961e018 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2013/09/02 16:12:49 wiz Exp $
+$NetBSD: distinfo,v 1.14 2013/09/09 20:37:42 wiz Exp $
 
-SHA1 (setuptools-1.1.tar.gz) = 0c789b38afa522605407515efb74a0278b867628
-RMD160 (setuptools-1.1.tar.gz) = 537aae8005e631ea09d2dd6e0411a98c5661bb9e
-Size (setuptools-1.1.tar.gz) = 679747 bytes
+SHA1 (setuptools-1.1.4.tar.gz) = b8bf9c2b8a114045598f0e16681d6a63a4d6cdf9
+RMD160 (setuptools-1.1.4.tar.gz) = cbbff51fc3ceca01ebdec1fba27ac6992780efcd
+Size (setuptools-1.1.4.tar.gz) = 681658 bytes
 SHA1 (patch-setup.py) = 8072ebce17d029f7efc1c05528d1e5c0d0f40800