From 4f45143bbddee8a4da2b5248b7c29a45f5420b6f Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 29 Sep 2015 10:52:11 +0000
Subject: [PATCH] bump REVISION for setuptools dep change.

---
 devel/py-nose/Makefile                | 3 ++-
 devel/py-path.py/Makefile             | 3 ++-
 devel/py-peak-rules/Makefile          | 4 ++--
 devel/py-pip/Makefile                 | 3 ++-
 devel/py-pretend/Makefile             | 3 ++-
 devel/py-prioritized_methods/Makefile | 4 ++--
 devel/py-progressbar/Makefile         | 4 ++--
 devel/py-protocols/Makefile           | 8 +++-----
 devel/py-py/Makefile                  | 4 ++--
 devel/py-pyprof2calltree/Makefile     | 3 ++-
 devel/py-pyro/Makefile                | 3 ++-
 devel/py-rope/Makefile                | 3 ++-
 devel/py-ruledispatch/Makefile        | 9 +++------
 devel/py-send2trash/Makefile          | 3 ++-
 devel/py-setuptools/Makefile          | 3 ++-
 devel/py-simplegeneric/Makefile       | 3 ++-
 devel/py-singledispatch/Makefile      | 4 ++--
 devel/py-six/Makefile                 | 4 ++--
 devel/py-smmap/Makefile               | 4 ++--
 devel/py-suds/Makefile                | 4 ++--
 devel/py-symboltype/Makefile          | 4 ++--
 devel/py-test-cov/Makefile            | 3 ++-
 devel/py-test/Makefile                | 4 ++--
 devel/py-texscythe/Makefile           | 3 ++-
 devel/py-turbocheetah/Makefile        | 4 ++--
 devel/py-turbokid/Makefile            | 4 ++--
 devel/py-tz/Makefile                  | 3 ++-
 devel/py-unittest2/Makefile           | 3 ++-
 devel/py-urwid/Makefile               | 4 ++--
 devel/py-vcversioner/Makefile         | 3 ++-
 devel/py-virtualenv/Makefile          | 3 ++-
 devel/py-wbem/Makefile                | 3 ++-
 devel/py-wsgiutils/Makefile           | 4 ++--
 devel/py-xmlrunner/Makefile           | 3 ++-
 devel/py-zopeinterface/Makefile       | 4 ++--
 devel/py-zopetesting/Makefile         | 4 ++--
 devel/pyflakes/Makefile               | 3 ++-
 games/fretsonfire/Makefile            | 4 ++--
 games/hypatia/Makefile                | 4 ++--
 games/mnemosyne/Makefile              | 4 ++--
 games/pyganim/Makefile                | 4 ++--
 geo/gdal/Makefile                     | 3 ++-
 geo/mapproxy/Makefile                 | 3 ++-
 geo/tilecache/Makefile                | 4 ++--
 graphics/gprof2dot/Makefile           | 9 +++------
 graphics/py-Pillow/Makefile           | 3 ++-
 graphics/py-matplotlib/Makefile       | 4 ++--
 graphics/py-opengl/Makefile           | 3 ++-
 graphics/pycha/Makefile               | 4 ++--
 math/py-numpy/Makefile                | 4 ++--
 50 files changed, 103 insertions(+), 88 deletions(-)

diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index f4238f2f201..92c04380c36 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2015/09/23 20:14:53 jca Exp $
+# $OpenBSD: Makefile,v 1.32 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=		discovery-based unittest extension
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION=	1.3.7
 DISTNAME=		nose-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel
+REVISION=		0
 
 HOMEPAGE=		http://readthedocs.org/docs/nose/en/latest/
 
diff --git a/devel/py-path.py/Makefile b/devel/py-path.py/Makefile
index 4d5dffa6de4..d39fe176d33 100644
--- a/devel/py-path.py/Makefile
+++ b/devel/py-path.py/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/08/20 12:56:32 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		os.path wrapper for Python
 
 MODPY_EGG_VERSION =	7.6
 DISTNAME =		path.py-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/py-peak-rules/Makefile b/devel/py-peak-rules/Makefile
index b47eea50891..5a8acc02b49 100644
--- a/devel/py-peak-rules/Makefile
+++ b/devel/py-peak-rules/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/03/11 10:50:26 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		generic functions support systems
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	0.5
 REV = 			2582
 DISTNAME =		PEAK-Rules-${MODPY_EGG_VERSION}a1.dev-r${REV}
 PKGNAME =		py-peak-rules-${MODPY_EGG_VERSION}r${REV}
-REVISION=		0
+REVISION=		1
 EPOCH =			0
 
 CATEGORIES =		devel
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index f0b2b763b3f..6e28562e376 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/07/19 02:03:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		Python easy_install replacement
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	7.1.0
 DISTNAME =		pip-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		http://www.pip-installer.org/
 
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index e2ca7ff94f1..3248ca26107 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/06/08 10:33:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		a library for stubbing in Python
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	1.0.8
 DISTNAME =		pretend-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		https://github.com/alex/pretend
 
diff --git a/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index 9b5a3ca3c34..ae551b66ff1 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		extension to PEAK-Rules to prioritize methods
 
 MODPY_EGG_VERSION =	0.2.1
 DISTNAME =		prioritized_methods-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 
diff --git a/devel/py-progressbar/Makefile b/devel/py-progressbar/Makefile
index 22cd72b344f..b1846bcb844 100644
--- a/devel/py-progressbar/Makefile
+++ b/devel/py-progressbar/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2013/08/07 21:31:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		text progressbar library for python
 
 MODPY_EGG_VERSION =	2.3
 DISTNAME =		progressbar-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 CATEGORIES =		devel
 
 HOMEPAGE =		https://code.google.com/p/python-progressbar/
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index ef1895cb653..026552d5a52 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2015/09/29 09:02:55 edd Exp $
+# $OpenBSD: Makefile,v 1.24 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=		protocol definition, declaration and adaptation
 
 MODPY_EGG_VERSION =	1.0a0dev_r0
 DISTNAME=		PyProtocols-1.0a0dev_r2306
 PKGNAME=		py-protocols-1.0r2306
-REVISION=		2
+REVISION=		3
 EPOCH=			0
 
 WRKSRC =		${WRKDIR}/PyProtocols
@@ -23,12 +23,10 @@ WANTLIB += ${MODPY_WANTLIB}
 WANTLIB += pthread
 
 MODULES=		lang/python
-RUN_DEPENDS=		devel/py-decoratortools \
-			devel/py-setuptools>=18.2v0
+RUN_DEPENDS=		devel/py-decoratortools
 TEST_DEPENDS=		${RUN_DEPENDS}
 
 MODPY_SETUPTOOLS=	Yes
-BUILD_DEPENDS +=	devel/py-setuptools>=18.2v0
 
 # make regress happy after fake
 post-install:
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 5687b363718..72706dd7a80 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.26 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=		cross-python path, ini-parsing, io, code, log facilities
 
 MODPY_EGG_VERSION =	1.4.23
 DISTNAME=		py-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES=		devel
 
diff --git a/devel/py-pyprof2calltree/Makefile b/devel/py-pyprof2calltree/Makefile
index 8e607d565f5..516f513d619 100644
--- a/devel/py-pyprof2calltree/Makefile
+++ b/devel/py-pyprof2calltree/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2015/09/19 08:27:56 benoit Exp $
+# $OpenBSD: Makefile,v 1.11 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =	help visualize profiling data collected with the cProfile
 
 MODPY_EGG_VERSION = 1.3.2
 DISTNAME =	pyprof2calltree-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
+REVISION =	0
 
 CATEGORIES =	devel
 
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index 8966404970f..c897a88eac4 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =	distributed object middleware for Python
 
 MODPY_EGG_VERSION = 3.16
 DISTNAME =	Pyro-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
+REVISION =	0
 
 CATEGORIES =	devel
 
diff --git a/devel/py-rope/Makefile b/devel/py-rope/Makefile
index 7890e70cd66..70537ad4d82 100644
--- a/devel/py-rope/Makefile
+++ b/devel/py-rope/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2015/04/02 19:03:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=		refactoring library
 
 MODPY_EGG_VERSION=	0.9.4
 DISTNAME=		rope-${MODPY_EGG_VERSION}
 CATEGORIES=     	devel
+REVISION=		0
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index f5ef423c98e..49d54e1951c 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2015/09/29 09:02:55 edd Exp $
+# $OpenBSD: Makefile,v 1.24 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=		rule-based dispatching and generic functions
 
 MODPY_EGG_VERSION =	RuleDispatch-0.5a0.dev_r0
 DISTNAME=		RuleDispatch-0.5a0.dev-r2306
 PKGNAME=		py-ruledispatch-0.5r2306
-REVISION=		2
+REVISION=		3
 EPOCH=			0
 
 WRKDIST =		${WRKDIR}/RuleDispatch
@@ -23,13 +23,10 @@ WANTLIB += ${MODPY_WANTLIB}
 WANTLIB += pthread
 
 MODULES=		lang/python
-RUN_DEPENDS=		devel/py-protocols \
-			devel/py-setuptools>=18.2v0
+RUN_DEPENDS=		devel/py-protocols
 TEST_DEPENDS=		${RUN_DEPENDS}
 
 MODPY_SETUPTOOLS=	Yes
-BUILD_DEPENDS +=	devel/py-setuptools>=18.2v0
-
 
 # make regress happy after fake
 post-install:
diff --git a/devel/py-send2trash/Makefile b/devel/py-send2trash/Makefile
index 4edb5ed21a4..46e4efef528 100644
--- a/devel/py-send2trash/Makefile
+++ b/devel/py-send2trash/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		send files to the trash natively
 
 MODPY_EGG_VERSION =	1.3.0
 DISTNAME =		Send2Trash-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 38a59838238..ec738953604 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/09/29 08:49:37 edd Exp $
+# $OpenBSD: Makefile,v 1.28 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT=	simplified packaging system for Python modules
 
@@ -8,6 +8,7 @@ PKGNAME=		py-${DISTNAME:S/c/./}
 EPOCH = 		0
 CATEGORIES=		devel
 PKG_ARCH=		*
+REVISION=		0
 
 
 MODPY_PI =	Yes
diff --git a/devel/py-simplegeneric/Makefile b/devel/py-simplegeneric/Makefile
index 870d020b547..b7c847cb977 100644
--- a/devel/py-simplegeneric/Makefile
+++ b/devel/py-simplegeneric/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/08/16 19:42:05 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:11 sthen Exp $
 
 COMMENT =		simple generic functions
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	0.8.1
 DISTNAME =		simplegeneric-${MODPY_EGG_VERSION}
 EXTRACT_SUFX =		.zip
 PKGNAME =		py-${DISTNAME}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile
index 0f89dd7659b..3c34d4c9067 100644
--- a/devel/py-singledispatch/Makefile
+++ b/devel/py-singledispatch/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2015/08/25 13:18:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2015/09/29 10:52:11 sthen Exp $
 
 MODPY_EGG_VERSION =	3.4.0.3
 COMMENT =	backport of functools.singledispatch to Python 2.6-3.3
 DISTNAME =	singledispatch-${MODPY_EGG_VERSION}
 PKGNAME =	py-singledispatch-${MODPY_EGG_VERSION}
 CATEGORIES =	devel
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://pypi.python.org/pypi/singledispatch
 
diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
index cd193c60962..2d68e7f32f8 100644
--- a/devel/py-six/Makefile
+++ b/devel/py-six/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2015/08/25 13:18:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =	Python 2 and 3 compatibility library
 MODPY_EGG_VERSION =	1.9.0
 DISTNAME =	six-${MODPY_EGG_VERSION}
 PKGNAME =	py-six-${MODPY_EGG_VERSION}
 CATEGORIES =	devel
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://pythonhosted.org/six/
 
diff --git a/devel/py-smmap/Makefile b/devel/py-smmap/Makefile
index 04f972b5cc7..a26d1d8bf5d 100644
--- a/devel/py-smmap/Makefile
+++ b/devel/py-smmap/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		pure Python implementation of an SMM manager
 
 MODPY_EGG_VERSION=	0.8.2
 DISTNAME=		smmap-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel
 
diff --git a/devel/py-suds/Makefile b/devel/py-suds/Makefile
index c83609a4aaa..e7348435673 100644
--- a/devel/py-suds/Makefile
+++ b/devel/py-suds/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		lightweight python SOAP client
 
 MODPY_EGG_VERSION =	0.4
 DISTNAME =		suds-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES =		devel
 
diff --git a/devel/py-symboltype/Makefile b/devel/py-symboltype/Makefile
index f5431c3aba8..84fc0b56652 100644
--- a/devel/py-symboltype/Makefile
+++ b/devel/py-symboltype/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2015/05/18 06:56:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		symbol type for python
 
 MODPY_EGG_VERSION =	1.0
 DISTNAME =		SymbolType-${MODPY_EGG_VERSION}
 PKGNAME =		py-symboltype-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 
diff --git a/devel/py-test-cov/Makefile b/devel/py-test-cov/Makefile
index dee763befc7..cb77adc3053 100644
--- a/devel/py-test-cov/Makefile
+++ b/devel/py-test-cov/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/06/26 07:34:01 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		library for stubbing in Python
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	1.8.1
 DISTNAME =		pytest-cov-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		https://pypi.python.org/pypi/pytest-cov
 
diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile
index 0f68c9b864d..fba42b58f1b 100644
--- a/devel/py-test/Makefile
+++ b/devel/py-test/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		cross-project testing tool for Python
 
 MODPY_EGG_VERSION=	2.6.1
 DISTNAME=		pytest-${MODPY_EGG_VERSION}
 PKGNAME=		py-test-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES=		devel
 
diff --git a/devel/py-texscythe/Makefile b/devel/py-texscythe/Makefile
index cfd3f335451..edf3ca10686 100644
--- a/devel/py-texscythe/Makefile
+++ b/devel/py-texscythe/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/09/22 19:49:05 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		TeX Live texmf subsetter tool and Python library.
 
 DISTNAME =		texscythe-${MODPY_EGG_VERSION}
 PKGNAME =		py-texscythe-${MODPY_EGG_VERSION}
 MODPY_EGG_VERSION =	0.1.1
+REVISION =		0
 
 CATEGORIES =		devel print
 
diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index 24609f39a76..a098540223d 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2015/04/02 19:38:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		plugin to support use of Cheetah templates
 
 MODPY_EGG_VERSION=	1.0
 DISTNAME=		TurboCheetah-${MODPY_EGG_VERSION}
 PKGNAME=		py-turbocheetah-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES=		devel
 
diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index bfe1401904c..fb2b9f47b1c 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/11 10:50:26 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		template plugin that supports Kid templates
 
 VERSION=		1.0.4
 DISTNAME=		TurboKid-${VERSION}
 PKGNAME=		py-turbokid-${VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES=		devel
 
diff --git a/devel/py-tz/Makefile b/devel/py-tz/Makefile
index 998be4b2d06..8fb148092ed 100644
--- a/devel/py-tz/Makefile
+++ b/devel/py-tz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2015/06/23 21:55:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		Python API for dealing with timezones
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	2015.4
 DISTNAME =		pytz-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/^py/py-/}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		http://pytz.sourceforge.net/
 MAINTAINER =		frantisek holop <minusf@obiit.org>
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 14d2e6c48f7..d4dbf1cc8b9 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2015/04/02 14:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		backport of new features added to unittest
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	0.5.1
 DISTNAME =		unittest2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		http://pypi.python.org/pypi/unittest2
 MAINTAINER =		frantisek holop <minusf@obiit.org>
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index ed4f28545ee..f07deebab4d 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2015/07/18 00:41:07 jca Exp $
+# $OpenBSD: Makefile,v 1.21 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =	console user interface library for python
 
 MODPY_EGG_VERSION = 1.3.0
-REVISION =	0
+REVISION =	1
 DISTNAME =	urwid-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
diff --git a/devel/py-vcversioner/Makefile b/devel/py-vcversioner/Makefile
index ada086a6e2c..e3f547bb96e 100644
--- a/devel/py-vcversioner/Makefile
+++ b/devel/py-vcversioner/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/08/20 12:45:47 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		use version control tags to discover version numbers
 
 MODPY_EGG_VERSION =	2.14.0.0
 DISTNAME =		vcversioner-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index a2ddc07e987..47f13edd949 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/06/10 12:16:12 benoit Exp $
+# $OpenBSD: Makefile,v 1.13 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		virtual Python environment builder
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	13.0.3
 DISTNAME =		virtualenv-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		http://www.virtualenv.org/
 
diff --git a/devel/py-wbem/Makefile b/devel/py-wbem/Makefile
index ff8d7920991..7a7ecdcc3e7 100644
--- a/devel/py-wbem/Makefile
+++ b/devel/py-wbem/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/07/04 12:48:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		CIM operations over HTTP in Python
 
@@ -8,6 +8,7 @@ WRKDIST=		${WRKDIR}/pywbem-0.8.0-dev
 PKGNAME=		py-wbem-0.8.0pre728
 EXTRACT_SUFX=		.zip
 CATEGORIES=		devel
+REVISION=		0
 
 HOMEPAGE=		http://sourceforge.net/apps/mediawiki/pywbem/
 
diff --git a/devel/py-wsgiutils/Makefile b/devel/py-wsgiutils/Makefile
index 4ab03e71a34..4d1a2311c05 100644
--- a/devel/py-wsgiutils/Makefile
+++ b/devel/py-wsgiutils/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/11 10:50:27 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		libraries for WSGI development
 
 MODPY_EGG_VERSION =	0.7
 DISTNAME =		WSGIUtils-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		devel textproc www
 
diff --git a/devel/py-xmlrunner/Makefile b/devel/py-xmlrunner/Makefile
index df94016363d..a77aa91acb8 100644
--- a/devel/py-xmlrunner/Makefile
+++ b/devel/py-xmlrunner/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2015/04/02 14:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		test runner with JUnit like XML reporting
 
 MODPY_EGG_VERSION =	1.4.3
 DISTNAME =		unittest-xml-reporting-${MODPY_EGG_VERSION}
 PKGNAME =		py-xmlrunner-${MODPY_EGG_VERSION}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/py-zopeinterface/Makefile b/devel/py-zopeinterface/Makefile
index 7d28c4730f4..935ff2cf47b 100644
--- a/devel/py-zopeinterface/Makefile
+++ b/devel/py-zopeinterface/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2015/04/21 18:33:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=	object interface infrastructure from Zope 3
 
 MODPY_EGG_VERSION=	3.6.1
-REVISION=	3
+REVISION=	4
 
 DISTNAME=	zope.interface-${MODPY_EGG_VERSION}
 PKGNAME=	py-zopeinterface-${MODPY_EGG_VERSION}
diff --git a/devel/py-zopetesting/Makefile b/devel/py-zopetesting/Makefile
index 6522e0725d8..2c47dd82c9d 100644
--- a/devel/py-zopetesting/Makefile
+++ b/devel/py-zopetesting/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2015/04/02 14:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=	testing frameworks from Zope 3
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION=	3.7.4
 
 DISTNAME=	zope.testing-${MODPY_EGG_VERSION}
 PKGNAME=	py-zopetesting-${MODPY_EGG_VERSION}
-REVISION =	2
+REVISION =	3
 CATEGORIES=	devel
 
 HOMEPAGE=	http://pypi.python.org/pypi/zope.testing
diff --git a/devel/pyflakes/Makefile b/devel/pyflakes/Makefile
index b6f8292bda3..e35aaf1e307 100644
--- a/devel/pyflakes/Makefile
+++ b/devel/pyflakes/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2015/04/02 14:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =		passive checker of Python programs
 
 MODPY_EGG_VERSION =	0.8.1
 DISTNAME =		pyflakes-${MODPY_EGG_VERSION}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 5f9ab7fc172..30be4193e95 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2015/03/26 12:14:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2015/09/29 10:52:12 sthen Exp $
 
 BROKEN = fails at runtime "python2.7 in free(): error: modified chunk-pointer 0x..."
 
@@ -6,7 +6,7 @@ V =			1.3.110
 COMMENT =		guitar hero clone
 DISTNAME =		FretsOnFire-${V}
 PKGNAME =		${DISTNAME:L}
-REVISION =		10
+REVISION =		11
 
 CATEGORIES =		games x11
 
diff --git a/games/hypatia/Makefile b/games/hypatia/Makefile
index d50698bfc36..3532bf0ceea 100644
--- a/games/hypatia/Makefile
+++ b/games/hypatia/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2015/09/21 14:35:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =	2D action adventure game engine
 DISTNAME =	hypatia-${GH_TAGNAME}
 CATEGORIES =	games x11
 SUBST_VARS +=	GH_TAGNAME
-REVISION =	1
+REVISION =	2
 
 GH_ACCOUNT =	hypatia-engine
 GH_PROJECT =	hypatia
diff --git a/games/mnemosyne/Makefile b/games/mnemosyne/Makefile
index 5ee633c3925..f968f84993f 100644
--- a/games/mnemosyne/Makefile
+++ b/games/mnemosyne/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2015/08/25 13:18:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2015/09/29 10:52:12 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ MODPY_EGG_VERSION=2.3.3
 DISTNAME=	Mnemosyne-${MODPY_EGG_VERSION}
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	games education
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.mnemosyne-proj.org/
 
diff --git a/games/pyganim/Makefile b/games/pyganim/Makefile
index 82548befb4f..961a166ccef 100644
--- a/games/pyganim/Makefile
+++ b/games/pyganim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2015/08/25 13:18:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2015/09/29 10:52:12 sthen Exp $
 
 MODPY_EGG_VERSION =	0.9.0
 COMMENT =	sprite animation module for pygame
@@ -6,7 +6,7 @@ DISTNAME =	Pyganim-${MODPY_EGG_VERSION}
 PKGNAME =	pyganim-${MODPY_EGG_VERSION}
 EXTRACT_SUFX =	.zip
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://inventwithpython.com/pyganim/
 
diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile
index 935f364038b..64a2955b15c 100644
--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2015/09/25 08:19:21 landry Exp $
+# $OpenBSD: Makefile,v 1.41 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
@@ -11,6 +11,7 @@ SHARED_ONLY =	Yes
 PKGNAME-main =	${DISTNAME}
 PKGNAME-python =py-${DISTNAME}
 PKGNAME-perl =	p5-Geo-GDAL-${V}
+REVISION-python =	0
 
 SHARED_LIBS =	gdal 23.0 #20.0
 CATEGORIES =	geo devel
diff --git a/geo/mapproxy/Makefile b/geo/mapproxy/Makefile
index 2dfdda08117..fa85210fb5e 100644
--- a/geo/mapproxy/Makefile
+++ b/geo/mapproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/06/26 07:52:24 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =	GIS WMTS/TMS tile caching server
 
@@ -6,6 +6,7 @@ GH_TAGNAME =	1.8.0
 GH_PROJECT =	mapproxy
 GH_ACCOUNT =	mapproxy
 DISTNAME =	${GH_PROJECT}-${GH_TAGNAME}
+REVISION =	0
 
 CATEGORIES =	geo www
 
diff --git a/geo/tilecache/Makefile b/geo/tilecache/Makefile
index c7fa9c33c7d..5b95cb29364 100644
--- a/geo/tilecache/Makefile
+++ b/geo/tilecache/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2015/03/26 12:14:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT =	tile caching frontend for WMS/TMS services
 
 MODPY_EGG_VERSION =	2.11
 DISTNAME =	tilecache-${MODPY_EGG_VERSION}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	geo graphics
 
diff --git a/graphics/gprof2dot/Makefile b/graphics/gprof2dot/Makefile
index 84fff07aa67..93350f64b3d 100644
--- a/graphics/gprof2dot/Makefile
+++ b/graphics/gprof2dot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2015/09/29 09:02:55 edd Exp $
+# $OpenBSD: Makefile,v 1.3 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		convert profilers output into a dot(1) graph
 
@@ -7,7 +7,7 @@ GH_PROJECT=		gprof2dot
 GH_COMMIT=		6fbb81559609c12e7c64ae5dce7d102a414a7514
 
 MODPY_EGG_VERSION=	2015.2.3
-REVISION =		0
+REVISION =		1
 DISTNAME=		${GH_PROJECT}-2015.02.03
 
 CATEGORIES=		graphics
@@ -20,10 +20,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES=		lang/python
 
 MODPY_SETUPTOOLS=	Yes
-BUILD_DEPENDS +=	devel/py-setuptools>=18.2v0
 
-
-RUN_DEPENDS=		math/graphviz \
-			devel/py-setuptools>=18.2v0
+RUN_DEPENDS=		math/graphviz
 
 .include <bsd.port.mk>
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index bab77d911bb..abb71afaf4b 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2015/06/05 14:26:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2015/09/29 10:52:12 sthen Exp $
 
 COMMENT=		Python Imaging Library (fork)
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION=	2.8.1
 DISTNAME=		Pillow-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		graphics
+REVISION=		0
 
 HOMEPAGE=		http://python-pillow.github.io/
 
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index b43306967be..c743eec52f1 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2015/07/01 08:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2015/09/29 10:52:13 sthen Exp $
 
 COMMENT=	Python charting and plotting API
 
 MODPY_EGG_VERSION =	1.4.2
-REVISION =		3
+REVISION =		4
 DISTNAME =		matplotlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		graphics devel math
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index e535b93c6b7..87fdc7a4af5 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2015/05/29 11:20:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2015/09/29 10:52:13 sthen Exp $
 
 COMMENT =		Python bindings for OpenGL
 MODPY_EGG_VERSION =	3.0.2
 DISTNAME =		PyOpenGL-${MODPY_EGG_VERSION}
 PKGNAME =		py-opengl-${MODPY_EGG_VERSION}
+REVISION =		0
 
 CATEGORIES =		graphics
 HOMEPAGE =		http://pyopengl.sourceforge.net/
diff --git a/graphics/pycha/Makefile b/graphics/pycha/Makefile
index 289a4e45344..a417783ee8b 100644
--- a/graphics/pycha/Makefile
+++ b/graphics/pycha/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2015/04/02 14:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2015/09/29 10:52:13 sthen Exp $
 
 COMMENT = 		Python charting module
 
 MODPY_EGG_VERSION =	0.3.0
 DISTNAME = 		pycha-${MODPY_EGG_VERSION}
-REVISION=		3
+REVISION=		4
 CATEGORIES = 		graphics
 
 HOMEPAGE = 		http://www.lorenzogil.com/projects/pycha/
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 21e7862c7d3..118f280a1ac 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.43 2015/01/15 02:55:22 daniel Exp $
+# $OpenBSD: Makefile,v 1.44 2015/09/29 10:52:13 sthen Exp $
 
 BROKEN-alpha =	numpy/linalg/umath_linalg.c.src:3231: internal compiler error: in extract_insn, at recog.c:2077
 
 COMMENT=		fast array and numeric programming library for Python
 
 MODPY_EGG_VERSION=	1.8.2
-REVISION=		1
+REVISION=		2
 DISTNAME=		numpy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}