Switch to MASTER_SITES_PYPI.

author: wiz <wiz@pkgsrc.org> 2016-06-08 17:43:20 +0000
committer: wiz <wiz@pkgsrc.org> 2016-06-08 17:43:20 +0000
commit: 66657f0945bd10aea95bf8000afc916d947cfbd8 (patch)
tree: b5b84bf5c7f997fcce4ec3a54792f163b6b658ca
parent: 2f71cec74f81aa2a3128422a53bff191d1531360 (diff)
download: pkgsrc-66657f0945bd10aea95bf8000afc916d947cfbd8.tar.gz
356 files changed, 716 insertions, 716 deletions
diff --git a/archivers/py-yuicompressor/Makefile b/archivers/py-yuicompressor/Makefile
index b26b1a9118c..469302016b4 100644
--- a/archivers/py-yuicompressor/Makefile
+++ b/archivers/py-yuicompressor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/05/03 02:46:46 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:20 wiz Exp $
 
 DISTNAME=	yuicompressor-2.4.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	archivers python
-MASTER_SITES=	https://pypi.python.org/packages/source/y/yuicompressor/
+MASTER_SITES=	${MASTER_SITE_PYPI:=y/yuicompressor/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/sprat/yuicompressor
diff --git a/audio/py-last/Makefile b/audio/py-last/Makefile
index 828bf91661b..984cb4bd239 100644
--- a/audio/py-last/Makefile
+++ b/audio/py-last/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:20 wiz Exp $
 
 DISTNAME=	pylast-0.5.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	audio python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pylast/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pylast/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/pylast/
diff --git a/audio/py-mpd/Makefile b/audio/py-mpd/Makefile
index 5d12b9d3f7d..49ed7a74c9d 100644
--- a/audio/py-mpd/Makefile
+++ b/audio/py-mpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:20 wiz Exp $
 
 DISTNAME=	python-mpd-0.3.0
 PKGNAME=	${PYPKGPREFIX}-mpd-0.3.0
 CATEGORIES=	audio
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-mpd/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-mpd/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/cad/py-simpy/Makefile b/cad/py-simpy/Makefile
index 92c98e7673b..515ca78bf7d 100644
--- a/cad/py-simpy/Makefile
+++ b/cad/py-simpy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2015/07/12 07:56:09 wen Exp $
+# $NetBSD: Makefile,v 1.20 2016/06/08 17:43:20 wiz Exp $
 
 DISTNAME=		simpy-3.0.8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		cad math
-MASTER_SITES=		http://pypi.python.org/packages/source/s/simpy/
+MASTER_SITES=		${MASTER_SITE_PYPI:=s/simpy/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://simpy.readthedocs.org/
diff --git a/comms/py-colorama/Makefile b/comms/py-colorama/Makefile
index d1e814b691d..4df1867c128 100644
--- a/comms/py-colorama/Makefile
+++ b/comms/py-colorama/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/12/05 14:52:52 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	colorama-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	comms python
-MASTER_SITES=	https://pypi.python.org/packages/source/c/colorama/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/colorama/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	https://pypi.python.org/pypi/colorama
diff --git a/comms/py-python-termstyle/Makefile b/comms/py-python-termstyle/Makefile
index 37fed74b37a..96300bee864 100644
--- a/comms/py-python-termstyle/Makefile
+++ b/comms/py-python-termstyle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	python-termstyle-0.1.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	comms
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-termstyle/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-termstyle/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://gfxmonk.net/dist/0install/python-termstyle.xml
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 4b978df9e8a..7d203932cee 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:31 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:20 wiz Exp $
 
 DISTNAME=		pyserial-2.7
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=		comms python
-MASTER_SITES=		http://pypi.python.org/packages/source/p/pyserial/
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/pyserial/}
 
 MAINTAINER=		tsarna@NetBSD.org
 HOMEPAGE=		http://pyserial.sourceforge.net/
diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile
index 06f7bf5a5e6..5cc5a77c1b1 100644
--- a/converters/py-cairosvg/Makefile
+++ b/converters/py-cairosvg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/06/26 16:09:59 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	CairoSVG-1.0.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	converters graphics python
-MASTER_SITES=	https://pypi.python.org/packages/source/C/CairoSVG/
+MASTER_SITES=	${MASTER_SITE_PYPI:=C/CairoSVG/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.cairosvg.org/
diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile
index b5dddc60814..7ba47c5e3ad 100644
--- a/converters/py-chardet/Makefile
+++ b/converters/py-chardet/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2016/02/05 12:40:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	chardet-2.3.0
 PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	converters python
-MASTER_SITES=	http://pypi.python.org/packages/source/c/chardet/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/chardet/}
 
 MAINTAINER=	bartosz.kuzma@gmail.com
 HOMEPAGE=	http://pypi.python.org/pypi/chardet
diff --git a/converters/py-simplejson/Makefile b/converters/py-simplejson/Makefile
index 201a7ff010c..1575afbd955 100644
--- a/converters/py-simplejson/Makefile
+++ b/converters/py-simplejson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2014/10/27 08:44:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	simplejson-3.6.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	converters
-MASTER_SITES=	https://pypi.python.org/packages/source/s/simplejson/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/simplejson/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://undefined.org/python/#simplejson
diff --git a/converters/py-zbase32/Makefile b/converters/py-zbase32/Makefile
index a2f98c8f231..248b0f22e91 100644
--- a/converters/py-zbase32/Makefile
+++ b/converters/py-zbase32/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:25:31 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	zbase32-1.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	converters
-MASTER_SITES=	http://pypi.python.org/packages/source/z/zbase32/
+MASTER_SITES=	${MASTER_SITE_PYPI:=z/zbase32/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/zbase32/
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index e872c4101fa..a1f1b700a14 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2015/12/05 21:25:31 adam Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	zfec-1.4.24
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	converters
-MASTER_SITES=	http://pypi.python.org/packages/source/z/zfec/
+MASTER_SITES=	${MASTER_SITE_PYPI:=z/zfec/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/zfec/
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 425205e3d08..9090b5a02d3 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2014/01/25 10:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	bsddb3-6.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	http://pypi.python.org/packages/source/b/bsddb3/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/bsddb3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/bsddb3/
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index aa3712c4594..35433242604 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	python-cdb-0.35
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
 CATEGORIES=	databases
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-cdb/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-cdb/}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://pilcrow.madison.wi.us/
diff --git a/databases/py-ckanclient/Makefile b/databases/py-ckanclient/Makefile
index c43c099ca5b..4647f7abf9d 100644
--- a/databases/py-ckanclient/Makefile
+++ b/databases/py-ckanclient/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	ckanclient-0.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
-MASTER_SITES=	http://pypi.python.org/packages/source/c/ckanclient/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/ckanclient/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ckan.org/
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index 69290276fcd..f4726a8cf69 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:22 wiz Exp $
 #
 
 DISTNAME=	CouchDB-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	databases python
-MASTER_SITES=	http://pypi.python.org/packages/source/C/CouchDB/
+MASTER_SITES=	${MASTER_SITE_PYPI:=C/CouchDB/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://code.google.com/p/couchdb-python/
diff --git a/databases/py-datapkg/Makefile b/databases/py-datapkg/Makefile
index 8b209deb0b8..e358ba3899a 100644
--- a/databases/py-datapkg/Makefile
+++ b/databases/py-datapkg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	datapkg-0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
-MASTER_SITES=	http://pypi.python.org/packages/source/d/datapkg/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/datapkg/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://okfn.org/projects/project-archive/datapkg/
diff --git a/databases/py-elixir/Makefile b/databases/py-elixir/Makefile
index d64d010865d..bb95971ef29 100644
--- a/databases/py-elixir/Makefile
+++ b/databases/py-elixir/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	Elixir-0.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	http://pypi.python.org/packages/source/E/Elixir/
+MASTER_SITES=	${MASTER_SITE_PYPI:=E/Elixir/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://elixir.ematia.de/trac/wiki
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 50563851b6d..1a9888d3ddd 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.66 2016/03/05 11:28:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.67 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	python-ldap-2.4.25
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 PKGREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-ldap/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-ldap/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python-ldap.org/
diff --git a/databases/py-mongo/Makefile b/databases/py-mongo/Makefile
index 372418a2d67..15638359a2e 100644
--- a/databases/py-mongo/Makefile
+++ b/databases/py-mongo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/08 22:13:36 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	pymongo-2.7.1
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/1}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pymongo/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pymongo/}
 
 MAINTAINER=	mishka@NetBSD.org
 HOMEPAGE=	http://github.com/mongodb/mongo-python-driver
diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index 015799b237c..dde0aa5de85 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.43 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	MySQL-python-1.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/MySQL-python/mysqldb/}
 CATEGORIES=	databases python
-MASTER_SITES=	http://pypi.python.org/packages/source/M/MySQL-python/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/MySQL-python/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/databases/py-orderedmultidict/Makefile b/databases/py-orderedmultidict/Makefile
index 6918de06f2d..0628088f3fc 100644
--- a/databases/py-orderedmultidict/Makefile
+++ b/databases/py-orderedmultidict/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2016/03/03 19:42:29 shattered Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	orderedmultidict-0.7.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/o/orderedmultidict/
+MASTER_SITES=	${MASTER_SITE_PYPI:=o/orderedmultidict/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/gruns/orderedmultidict
diff --git a/databases/py-pymysql/Makefile b/databases/py-pymysql/Makefile
index 1771067a3b2..186a8a82ef1 100644
--- a/databases/py-pymysql/Makefile
+++ b/databases/py-pymysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/04/13 23:12:40 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	PyMySQL-0.6.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/P/PyMySQL/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyMySQL/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/PyMySQL/PyMySQL/
diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile
index 9e79e71094f..6a1ee027619 100644
--- a/databases/py-python-rrdtool/Makefile
+++ b/databases/py-python-rrdtool/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:33 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	python-rrdtool-1.4.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-rrdtool/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-rrdtool/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pbanaszkiewicz/python-rrdtool
diff --git a/databases/py-python-sql/Makefile b/databases/py-python-sql/Makefile
index 62b35c2da73..83c10ca6256 100644
--- a/databases/py-python-sql/Makefile
+++ b/databases/py-python-sql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/06/26 16:13:51 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	python-sql-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-sql/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-sql/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/python-sql/
diff --git a/databases/py-redis-py/Makefile b/databases/py-redis-py/Makefile
index 1641351b3a5..2e5d692e179 100644
--- a/databases/py-redis-py/Makefile
+++ b/databases/py-redis-py/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	redis-2.10.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-/-py-/1}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/r/redis/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/redis/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/andymccurdy/redis-py/
diff --git a/databases/py-sqlalchemy-i18n/Makefile b/databases/py-sqlalchemy-i18n/Makefile
index 3c7c8382f98..a58686ae0e7 100644
--- a/databases/py-sqlalchemy-i18n/Makefile
+++ b/databases/py-sqlalchemy-i18n/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	SQLAlchemy-i18n-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/S/SQLAlchemy-i18n/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/SQLAlchemy-i18n/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/sqlalchemy-i18n
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 349455d5f12..fd366b3f778 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2015/12/05 21:25:33 adam Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	sqlalchemy-migrate-0.9.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/s/sqlalchemy-migrate/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/sqlalchemy-migrate/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/stackforge/sqlalchemy-migrate
diff --git a/databases/py-sqlalchemy-utils/Makefile b/databases/py-sqlalchemy-utils/Makefile
index c14499f5d74..1628c413022 100644
--- a/databases/py-sqlalchemy-utils/Makefile
+++ b/databases/py-sqlalchemy-utils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/04/01 02:24:00 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	SQLAlchemy-Utils-0.29.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/S/SQLAlchemy-Utils/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/SQLAlchemy-Utils/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/sqlalchemy-utils
diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile
index f686552a9e5..2f794203656 100644
--- a/databases/py-sqlparse/Makefile
+++ b/databases/py-sqlparse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/12/01 11:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:21 wiz Exp $
 
 DISTNAME=	sqlparse-0.1.14
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
-MASTER_SITES=	https://pypi.python.org/packages/source/s/sqlparse/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/sqlparse/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/sqlparse
diff --git a/databases/py-sqlsoup/Makefile b/databases/py-sqlsoup/Makefile
index 8070842f82f..8ac9345b797 100644
--- a/databases/py-sqlsoup/Makefile
+++ b/databases/py-sqlsoup/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/02/03 10:21:13 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:22 wiz Exp $
 
 DISTNAME=	sqlsoup-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	https://pypi.python.org/packages/source/s/sqlsoup/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/sqlsoup/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://bitbucket.org/zzzeek/sqlsoup
diff --git a/devel/lettuce/Makefile b/devel/lettuce/Makefile
index fd4bbff0585..1a867a1e179 100644
--- a/devel/lettuce/Makefile
+++ b/devel/lettuce/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:35 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	lettuce-0.2.18
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/l/lettuce/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/lettuce/}
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://lettuce.it/
diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile
index 5b4066e5dbc..e303e1c03e1 100644
--- a/devel/py-Pyro/Makefile
+++ b/devel/py-Pyro/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2014/12/13 09:05:30 obache Exp $
+# $NetBSD: Makefile,v 1.20 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=		Pyro4-4.22
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel
-MASTER_SITES=		http://pypi.python.org/packages/source/P/Pyro4/
+MASTER_SITES=		${MASTER_SITE_PYPI:=P/Pyro4/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pyro.sourceforge.net/
diff --git a/devel/py-argh/Makefile b/devel/py-argh/Makefile
index 5bf71200982..7a99e761441 100644
--- a/devel/py-argh/Makefile
+++ b/devel/py-argh/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/04/14 11:40:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:29 wiz Exp $
 
 DISTNAME=	argh-0.26.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/a/argh/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/argh/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://github.com/neithere/argh/
diff --git a/devel/py-astor/Makefile b/devel/py-astor/Makefile
index 382246b5ac5..e8e70cd5675 100644
--- a/devel/py-astor/Makefile
+++ b/devel/py-astor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/06/26 16:51:36 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	astor-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/a/astor/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/astor/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/pmaupin/astor
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index 84b5a98a2eb..5234a46a9cc 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	astroid-1.3.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/a/astroid/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/astroid/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://bitbucket.org/logilab/astroid
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index fbb0a181425..b8de0cdff9e 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2015/03/15 19:31:45 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	Babel-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 PKGREVISION=	1
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/B/Babel/
+MASTER_SITES=	${MASTER_SITE_PYPI:=B/Babel/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://babel.pocoo.org/
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index 1a11b8d4c16..6664d9679c5 100644
--- a/devel/py-blinker/Makefile
+++ b/devel/py-blinker/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2015/08/15 17:23:55 kleink Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	blinker-1.4
 PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/b/blinker/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/blinker/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/blinker/
diff --git a/devel/py-characteristic/Makefile b/devel/py-characteristic/Makefile
index 93a76dd30c1..59a5609e808 100644
--- a/devel/py-characteristic/Makefile
+++ b/devel/py-characteristic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/20 07:28:58 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	characteristic-14.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/c/characteristic/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/characteristic/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/characteristic
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index aceb97ce37c..969479fd6eb 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	Cheetah-2.4.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/C/Cheetah/
+MASTER_SITES=	${MASTER_SITE_PYPI:=C/Cheetah/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cheetahtemplate.org/
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 2555ed4502a..2c6c4fc7c72 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/02/04 10:08:33 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	configobj-5.0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/c/configobj/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/configobj/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://www.voidspace.org.uk/python/configobj.html
diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile
index e1c87e511b2..1817196fc2a 100644
--- a/devel/py-coverage/Makefile
+++ b/devel/py-coverage/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/11/07 21:43:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	coverage-4.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/c/coverage/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/coverage/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://nedbatchelder.com/code/coverage/
diff --git a/devel/py-cparser/Makefile b/devel/py-cparser/Makefile
index d7791d26fa7..2cef448c1b5 100644
--- a/devel/py-cparser/Makefile
+++ b/devel/py-cparser/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/06/14 16:27:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	pycparser-2.14
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
 CATEGORIES=	lang
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pycparser/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycparser/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/pycparser
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index 40fe8e9801d..b9f5e25b4fb 100644
--- a/devel/py-d2to1/Makefile
+++ b/devel/py-d2to1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/05 23:17:05 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 DISTNAME=	d2to1-0.2.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/d/d2to1/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/d2to1/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/d2to1
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index be84fe7e63d..f0daa891f48 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	python-daemon-1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-daemon/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-daemon/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://pypi.python.org/pypi/python-daemon/
diff --git a/devel/py-daemonize/Makefile b/devel/py-daemonize/Makefile
index 03e70d923df..ddc6be04e2b 100644
--- a/devel/py-daemonize/Makefile
+++ b/devel/py-daemonize/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	daemonize-2.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/d/daemonize/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/daemonize/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://github.com/thesharp/daemonize
diff --git a/devel/py-darcsver/Makefile b/devel/py-darcsver/Makefile
index 727c365aa4f..a5b8707864d 100644
--- a/devel/py-darcsver/Makefile
+++ b/devel/py-darcsver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	darcsver-1.7.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/d/darcsver/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/darcsver/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	https://pypi.python.org/pypi/darcsver/
diff --git a/devel/py-decorator/Makefile b/devel/py-decorator/Makefile
index c2c14607293..41d007f411e 100644
--- a/devel/py-decorator/Makefile
+++ b/devel/py-decorator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2016/02/14 11:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=		decorator-4.0.9
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/d/decorator/
+MASTER_SITES=		${MASTER_SITE_PYPI:=d/decorator/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pypi.python.org/pypi/decorator
diff --git a/devel/py-distorm3/Makefile b/devel/py-distorm3/Makefile
index a2bd3a8c0e6..9e48bc7b6e2 100644
--- a/devel/py-distorm3/Makefile
+++ b/devel/py-distorm3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:32 wiz Exp $
 
 DISTNAME=	distorm3-3.3.0
 PKGNAME=	${PYPKGPREFIX}-distorm3-3.3.0
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/d/distorm3/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/distorm3/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pettai@NetBSD.org
diff --git a/devel/py-distribute/Makefile b/devel/py-distribute/Makefile
index b1188a527fb..1fcad4a40dc 100644
--- a/devel/py-distribute/Makefile
+++ b/devel/py-distribute/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	distribute-0.6.49
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/d/distribute/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/distribute/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/distribute
diff --git a/devel/py-docopt/Makefile b/devel/py-docopt/Makefile
index 6fe0ad3cf65..412ec32ab59 100644
--- a/devel/py-docopt/Makefile
+++ b/devel/py-docopt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/08/31 21:30:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	docopt-0.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/d/docopt/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/docopt/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/docopt/
diff --git a/devel/py-doctor/Makefile b/devel/py-doctor/Makefile
index 431c1b7e373..ade1b5e13b6 100644
--- a/devel/py-doctor/Makefile
+++ b/devel/py-doctor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:36 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	pydoctor-0.5
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pydoctor/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydoctor/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/pydoctor/
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 18accf01972..b951567551f 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/03/15 20:13:23 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:29 wiz Exp $
 
 DISTNAME=	extras-0.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/e/extras/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/extras/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/testing-cabal/extras
diff --git a/devel/py-fann2/Makefile b/devel/py-fann2/Makefile
index 5976355d277..2f50d87e995 100644
--- a/devel/py-fann2/Makefile
+++ b/devel/py-fann2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/01 01:53:44 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	fann2-1.0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/f/fann2/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/fann2/}
 
 MAINTAINER=	pkgsrc@futurelinkcorporation.com
 HOMEPAGE=	https://github.com/FutureLinkCorporation/fann2
diff --git a/devel/py-filechunkio/Makefile b/devel/py-filechunkio/Makefile
index 08e9eaf69b4..982a9ff21c1 100644
--- a/devel/py-filechunkio/Makefile
+++ b/devel/py-filechunkio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/04/05 21:13:41 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	filechunkio-1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/f/filechunkio/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/filechunkio/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/fabian/filechunkio
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 458bc7bce63..046528b4399 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/01/03 00:05:47 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	flake8-2.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/f/flake8/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/flake8/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/flake8/
diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile
index d21383ca627..c23c3cfb5bc 100644
--- a/devel/py-flakes/Makefile
+++ b/devel/py-flakes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/08/23 07:50:41 wen Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	pyflakes-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyflakes/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyflakes/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	https://launchpad.net/pyflakes
diff --git a/devel/py-flexmock/Makefile b/devel/py-flexmock/Makefile
index 842c4cfbc14..d9d1859c4d7 100644
--- a/devel/py-flexmock/Makefile
+++ b/devel/py-flexmock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/14 13:53:44 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	flexmock-0.9.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/f/flexmock/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/flexmock/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://has207.github.com/flexmock
diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index 4cbc07d01c1..0268a854461 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/03/15 17:20:19 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	funcparserlib-0.3.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/f/funcparserlib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/funcparserlib/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/funcparserlib/
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index a1ebac2bee8..ec157c9ad45 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/12/05 21:25:37 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:32 wiz Exp $
 
 DISTNAME=	google-apputils-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/g/google-apputils/
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/google-apputils/}
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	https://github.com/google/google-apputils
diff --git a/devel/py-hglib/Makefile b/devel/py-hglib/Makefile
index d1dfc21e2a3..615dcce9505 100644
--- a/devel/py-hglib/Makefile
+++ b/devel/py-hglib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/06/14 21:49:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	python-hglib-1.6
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-hglib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-hglib/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://mercurial.selenic.com/wiki/PythonHglib
diff --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile
index e5d0e4d90f7..11b7a019d8f 100644
--- a/devel/py-hgtools/Makefile
+++ b/devel/py-hgtools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/04/12 14:16:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:25 wiz Exp $
 
 HGTVERS=	6.3
 DISTNAME=	hgtools-${HGTVERS}
 PKGNAME=	${PYPKGPREFIX}-hgtools-${HGTVERS}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/h/hgtools/
+MASTER_SITES=	${MASTER_SITE_PYPI:=h/hgtools/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	imil@NetBSD.org
diff --git a/devel/py-iowait/Makefile b/devel/py-iowait/Makefile
index 5d0fd08b8d8..35ae44d3a22 100644
--- a/devel/py-iowait/Makefile
+++ b/devel/py-iowait/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/05/13 12:32:29 imil Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	iowait-0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/i/iowait/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/iowait/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://launchpad.net/python-iowait
diff --git a/devel/py-ipaddr/Makefile b/devel/py-ipaddr/Makefile
index b688f85509c..92d0a6d28dd 100644
--- a/devel/py-ipaddr/Makefile
+++ b/devel/py-ipaddr/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2015/12/05 21:25:37 adam Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	ipaddr-2.1.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	https://googledrive.com/host/0B6wLlfdySbEUMkh1ZWhpZk1pZmc/
-MASTER_SITES+=	https://pypi.python.org/packages/source/i/ipaddr/
+MASTER_SITES+=	${MASTER_SITE_PYPI:=i/ipaddr/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ipaddr-py/
diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile
index 1ae504e262f..3b1172ef0b8 100644
--- a/devel/py-ipython/Makefile
+++ b/devel/py-ipython/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2016/03/30 08:23:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	ipython-3.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel lang
-MASTER_SITES=	https://pypi.python.org/packages/source/i/ipython/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/ipython/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ipython.org/
diff --git a/devel/py-jaraco_util/Makefile b/devel/py-jaraco_util/Makefile
index 94e45e6355c..7f7f54fbb7c 100644
--- a/devel/py-jaraco_util/Makefile
+++ b/devel/py-jaraco_util/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/12/23 18:52:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	jaraco.util-10.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/./_/}
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/j/jaraco.util/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/jaraco.util/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	imil@NetBSD.org
diff --git a/devel/py-jersey/Makefile b/devel/py-jersey/Makefile
index 3cc67f64201..f18a3a360eb 100644
--- a/devel/py-jersey/Makefile
+++ b/devel/py-jersey/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/12/05 21:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	jersey-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/j/jersey/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/jersey/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/jersey
diff --git a/devel/py-limits/Makefile b/devel/py-limits/Makefile
index 0276eba6226..fab4195787e 100644
--- a/devel/py-limits/Makefile
+++ b/devel/py-limits/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2015/06/30 22:44:17 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:29 wiz Exp $
 #
 
 DISTNAME=	limits-1.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/l/limits/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/limits/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://limits.readthedocs.org/
diff --git a/devel/py-linecache2/Makefile b/devel/py-linecache2/Makefile
index 33379544a70..1105a250686 100644
--- a/devel/py-linecache2/Makefile
+++ b/devel/py-linecache2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2016/01/09 22:38:27 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=		linecache2-1.0.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=		1
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/l/linecache2/
+MASTER_SITES=		${MASTER_SITE_PYPI:=l/linecache2/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pypi.python.org/pypi/linecache2
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index 8b10332a317..7b9617f8816 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/04/13 23:12:41 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	logan-0.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/l/logan/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/logan/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/dcramer/logan
diff --git a/devel/py-logilab-astng/Makefile b/devel/py-logilab-astng/Makefile
index 7a702c1e1a0..5655ae7a577 100644
--- a/devel/py-logilab-astng/Makefile
+++ b/devel/py-logilab-astng/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/12/05 21:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	logilab-astng-0.24.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/l/logilab-astng/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/logilab-astng/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://www.logilab.org/project/logilab-astng
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 5545dd1bd42..9754800f208 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/12/05 21:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	logilab-common-0.63.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/l/logilab-common/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/logilab-common/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://www.logilab.org/project/logilab-common
diff --git a/devel/py-lupa/Makefile b/devel/py-lupa/Makefile
index b52717fda7a..a4dfefb0474 100644
--- a/devel/py-lupa/Makefile
+++ b/devel/py-lupa/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/04/20 19:34:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 DISTNAME=	lupa-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/l/lupa/
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/lupa/}
 
 MAINTAINER=	alnsn@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/lupa
diff --git a/devel/py-macholib/Makefile b/devel/py-macholib/Makefile
index 72ea84efc78..3fe4f377d9a 100644
--- a/devel/py-macholib/Makefile
+++ b/devel/py-macholib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/08/07 01:40:00 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	macholib-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/m/macholib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/macholib/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/ronaldoussoren/macholib
diff --git a/devel/py-mako/Makefile b/devel/py-mako/Makefile
index 7771d51896e..843c026fab2 100644
--- a/devel/py-mako/Makefile
+++ b/devel/py-mako/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/07/15 18:03:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	Mako-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/M/Mako/ \
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/Mako/ \}
 		http://www.makotemplates.org/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/py-mccabe/Makefile b/devel/py-mccabe/Makefile
index 35960e92b1e..4ddf9f42e4e 100644
--- a/devel/py-mccabe/Makefile
+++ b/devel/py-mccabe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/08/23 11:15:03 wen Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	mccabe-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mccabe/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mccabe/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/mccabe/
diff --git a/devel/py-minimock/Makefile b/devel/py-minimock/Makefile
index f622681f984..a467f1df7a6 100644
--- a/devel/py-minimock/Makefile
+++ b/devel/py-minimock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/03/12 01:37:37 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	MiniMock-1.2.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/M/MiniMock/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/MiniMock/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/MiniMock
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index 8f095215377..91e1237563b 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2016/05/04 14:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	mock-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mock/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mock/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/mock
diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile
index 7eefb1c602f..aeee2b4b2f6 100644
--- a/devel/py-modulegraph/Makefile
+++ b/devel/py-modulegraph/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/06/30 22:46:58 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	modulegraph-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/m/modulegraph/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/modulegraph/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/ronaldoussoren/modulegraph
diff --git a/devel/py-more-itertools/Makefile b/devel/py-more-itertools/Makefile
index bc08ddad6af..84a971b9969 100644
--- a/devel/py-more-itertools/Makefile
+++ b/devel/py-more-itertools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:27 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	more-itertools-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/m/more-itertools/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/more-itertools/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://github.com/erikrose/more-itertools
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index a1c76c9029d..f1d21af42e3 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2015/08/22 14:34:49 bsiegert Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	msgpack-python-0.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python-/-/}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/m/msgpack-python/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/msgpack-python/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://msgpack.org/
diff --git a/devel/py-multiprocessing/Makefile b/devel/py-multiprocessing/Makefile
index ec8343261b6..5a1793eba29 100644
--- a/devel/py-multiprocessing/Makefile
+++ b/devel/py-multiprocessing/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:25 wiz Exp $
 
 DISTNAME=	multiprocessing-2.6.2.1
 PKGNAME=	${PYPKGPREFIX}-multiprocessing-2.6.2.1
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/m/multiprocessing/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/multiprocessing/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/multiprocessing/
diff --git a/devel/py-nose-exclude/Makefile b/devel/py-nose-exclude/Makefile
index 240e8538a63..0699e41d78b 100644
--- a/devel/py-nose-exclude/Makefile
+++ b/devel/py-nose-exclude/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/02 11:00:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	nose-exclude-0.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/n/nose-exclude/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/nose-exclude/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/nose-exclude
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index 414e6ae6b2f..988f8f093d4 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2015/09/30 13:58:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	nose-1.3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/n/nose/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/nose/}
 EXTRACT_USING=	bsdtar
 
 MAINTAINER=	kamel.derouiche@gmail.com
diff --git a/devel/py-pep8/Makefile b/devel/py-pep8/Makefile
index dc612728321..4c03841a1dc 100644
--- a/devel/py-pep8/Makefile
+++ b/devel/py-pep8/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/08/23 11:26:38 wen Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:26 wiz Exp $
 #
 
 DISTNAME=	pep8-1.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pep8/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pep8/}
 
 MAINTAINER=	wenheping@gmail.com
 HOMEPAGE=	http://github.com/jcrocholl/pep8
diff --git a/devel/py-pexpect/Makefile b/devel/py-pexpect/Makefile
index fdd39c57aa4..e30e444b144 100644
--- a/devel/py-pexpect/Makefile
+++ b/devel/py-pexpect/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2014/01/17 14:50:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	pexpect-3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pexpect/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pexpect/}
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://pexpect.sourceforge.net/
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 6d13fff4533..91a9d4950d1 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/10/01 23:11:41 rodent Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	pip-7.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pip/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pip/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pip-installer.org/
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index cac0674c2c5..37504dfc093 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/03/31 08:18:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	pretend-1.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pretend/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pretend/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/pretend/
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 0f897d8e263..f046339c00d 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/07/01 09:34:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	py-1.4.30
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/p/py/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/py/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/py/
diff --git a/devel/py-py2app/Makefile b/devel/py-py2app/Makefile
index af303c42e72..ebca6399d56 100644
--- a/devel/py-py2app/Makefile
+++ b/devel/py-py2app/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/08/07 01:58:35 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	py2app-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/p/py2app/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/py2app/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/ronaldoussoren/py2app
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index aaec078156f..110f561b861 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2013/01/20 03:35:46 mspo Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:26 wiz Exp $
 #
 
 VERS=		0.8.1-4.04
 PKGNAME=	${PYPKGPREFIX}-pyev-${VERS}
 DISTNAME=	pyev-${VERS}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyev/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyev/}
 USE_LANGUAGES+=	c
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://pypi.python.org/packages/source/p/pyev/
+HOMEPAGE=	${MASTER_SITE_PYPI:=p/pyev/}
 COMMENT=	Python interface to libev
 LICENSE=	modified-bsd
 PYDISTUTILSPKG=	yes
diff --git a/devel/py-pylint/Makefile b/devel/py-pylint/Makefile
index fd7a818f118..3dd3724187e 100644
--- a/devel/py-pylint/Makefile
+++ b/devel/py-pylint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/12/05 21:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	pylint-1.4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pylint/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pylint/}
 
 MAINTAINER=	helgoman@users.sourceforge.net
 HOMEPAGE=	http://www.logilab.org/project/pylint
diff --git a/devel/py-pyobjc-core/Makefile b/devel/py-pyobjc-core/Makefile
index e3ed34f7c76..eb8ee57cca0 100644
--- a/devel/py-pyobjc-core/Makefile
+++ b/devel/py-pyobjc-core/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:48 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-core-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-core/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-core/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Accounts/Makefile b/devel/py-pyobjc-framework-Accounts/Makefile
index d37140d21d0..149eafe7a70 100644
--- a/devel/py-pyobjc-framework-Accounts/Makefile
+++ b/devel/py-pyobjc-framework-Accounts/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:42:24 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Accounts-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Accounts/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Accounts/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-AddressBook/Makefile b/devel/py-pyobjc-framework-AddressBook/Makefile
index 12fd6a34abb..5b294eeb460 100644
--- a/devel/py-pyobjc-framework-AddressBook/Makefile
+++ b/devel/py-pyobjc-framework-AddressBook/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-AddressBook-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-AddressBook/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-AddressBook/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-AppleScriptKit/Makefile b/devel/py-pyobjc-framework-AppleScriptKit/Makefile
index f1bd5736cdc..5b043e0c6e5 100644
--- a/devel/py-pyobjc-framework-AppleScriptKit/Makefile
+++ b/devel/py-pyobjc-framework-AppleScriptKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-AppleScriptKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-AppleScriptKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-AppleScriptKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-AppleScriptObjC/Makefile b/devel/py-pyobjc-framework-AppleScriptObjC/Makefile
index 396c556ec2a..068d05223e2 100644
--- a/devel/py-pyobjc-framework-AppleScriptObjC/Makefile
+++ b/devel/py-pyobjc-framework-AppleScriptObjC/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-AppleScriptObjC-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-AppleScriptObjC/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-AppleScriptObjC/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Automator/Makefile b/devel/py-pyobjc-framework-Automator/Makefile
index 779e0dc58af..150271fe2cb 100644
--- a/devel/py-pyobjc-framework-Automator/Makefile
+++ b/devel/py-pyobjc-framework-Automator/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:29 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Automator-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Automator/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Automator/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CFNetwork/Makefile b/devel/py-pyobjc-framework-CFNetwork/Makefile
index 6c7df5bcc7a..5e84c6cc3a1 100644
--- a/devel/py-pyobjc-framework-CFNetwork/Makefile
+++ b/devel/py-pyobjc-framework-CFNetwork/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CFNetwork-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CFNetwork/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CFNetwork/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CalendarStore/Makefile b/devel/py-pyobjc-framework-CalendarStore/Makefile
index 639e85bb4da..6bccd1efbf2 100644
--- a/devel/py-pyobjc-framework-CalendarStore/Makefile
+++ b/devel/py-pyobjc-framework-CalendarStore/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CalendarStore-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CalendarStore/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CalendarStore/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Cocoa/Makefile b/devel/py-pyobjc-framework-Cocoa/Makefile
index a355d961ad1..bb0b575bf68 100644
--- a/devel/py-pyobjc-framework-Cocoa/Makefile
+++ b/devel/py-pyobjc-framework-Cocoa/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:42:24 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Cocoa-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Cocoa/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Cocoa/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Collaboration/Makefile b/devel/py-pyobjc-framework-Collaboration/Makefile
index f1cd5a8550a..ce9da9481db 100644
--- a/devel/py-pyobjc-framework-Collaboration/Makefile
+++ b/devel/py-pyobjc-framework-Collaboration/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Collaboration-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Collaboration/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Collaboration/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CoreData/Makefile b/devel/py-pyobjc-framework-CoreData/Makefile
index 16aae7f1030..bf43fa9e6b8 100644
--- a/devel/py-pyobjc-framework-CoreData/Makefile
+++ b/devel/py-pyobjc-framework-CoreData/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CoreData-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CoreData/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CoreData/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CoreLocation/Makefile b/devel/py-pyobjc-framework-CoreLocation/Makefile
index 8677ffc2c07..6e43cff0f64 100644
--- a/devel/py-pyobjc-framework-CoreLocation/Makefile
+++ b/devel/py-pyobjc-framework-CoreLocation/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CoreLocation-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CoreLocation/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CoreLocation/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CoreText/Makefile b/devel/py-pyobjc-framework-CoreText/Makefile
index ab23e61f14e..027968705fa 100644
--- a/devel/py-pyobjc-framework-CoreText/Makefile
+++ b/devel/py-pyobjc-framework-CoreText/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CoreText-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CoreText/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CoreText/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-CoreWLAN/Makefile b/devel/py-pyobjc-framework-CoreWLAN/Makefile
index 3c7504fb3f5..20687e7b4a2 100644
--- a/devel/py-pyobjc-framework-CoreWLAN/Makefile
+++ b/devel/py-pyobjc-framework-CoreWLAN/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-CoreWLAN-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-CoreWLAN/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-CoreWLAN/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-DictionaryServices/Makefile b/devel/py-pyobjc-framework-DictionaryServices/Makefile
index 26d3dcc148c..c49a8287cd4 100644
--- a/devel/py-pyobjc-framework-DictionaryServices/Makefile
+++ b/devel/py-pyobjc-framework-DictionaryServices/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-DictionaryServices-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-DictionaryServices/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-DictionaryServices/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-DiskArbitration/Makefile b/devel/py-pyobjc-framework-DiskArbitration/Makefile
index c1cd10b3ede..6da8fac0388 100644
--- a/devel/py-pyobjc-framework-DiskArbitration/Makefile
+++ b/devel/py-pyobjc-framework-DiskArbitration/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-DiskArbitration-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-DiskArbitration/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-DiskArbitration/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-EventKit/Makefile b/devel/py-pyobjc-framework-EventKit/Makefile
index 084a03f6ede..2189bd61964 100644
--- a/devel/py-pyobjc-framework-EventKit/Makefile
+++ b/devel/py-pyobjc-framework-EventKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-EventKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-EventKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-EventKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-ExceptionHandling/Makefile b/devel/py-pyobjc-framework-ExceptionHandling/Makefile
index ae0f97fa8a5..3b48ef00f8b 100644
--- a/devel/py-pyobjc-framework-ExceptionHandling/Makefile
+++ b/devel/py-pyobjc-framework-ExceptionHandling/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:30 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-ExceptionHandling-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-ExceptionHandling/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-ExceptionHandling/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-FSEvents/Makefile b/devel/py-pyobjc-framework-FSEvents/Makefile
index f45eab864c5..136ada28f01 100644
--- a/devel/py-pyobjc-framework-FSEvents/Makefile
+++ b/devel/py-pyobjc-framework-FSEvents/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-FSEvents-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-FSEvents/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-FSEvents/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-InputMethodKit/Makefile b/devel/py-pyobjc-framework-InputMethodKit/Makefile
index af9aef8a20d..d6b206c75a2 100644
--- a/devel/py-pyobjc-framework-InputMethodKit/Makefile
+++ b/devel/py-pyobjc-framework-InputMethodKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-InputMethodKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-InputMethodKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-InputMethodKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-InstallerPlugins/Makefile b/devel/py-pyobjc-framework-InstallerPlugins/Makefile
index b8fba70618f..9f7a6642281 100644
--- a/devel/py-pyobjc-framework-InstallerPlugins/Makefile
+++ b/devel/py-pyobjc-framework-InstallerPlugins/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-InstallerPlugins-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-InstallerPlugins/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-InstallerPlugins/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-InstantMessage/Makefile b/devel/py-pyobjc-framework-InstantMessage/Makefile
index 7f592d05c55..af371d3cd7b 100644
--- a/devel/py-pyobjc-framework-InstantMessage/Makefile
+++ b/devel/py-pyobjc-framework-InstantMessage/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-InstantMessage-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-InstantMessage/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-InstantMessage/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-LatentSemanticMapping/Makefile b/devel/py-pyobjc-framework-LatentSemanticMapping/Makefile
index b51039e1964..ee1abf86537 100644
--- a/devel/py-pyobjc-framework-LatentSemanticMapping/Makefile
+++ b/devel/py-pyobjc-framework-LatentSemanticMapping/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-LatentSemanticMapping-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-LatentSemanticMapping/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-LatentSemanticMapping/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-LaunchServices/Makefile b/devel/py-pyobjc-framework-LaunchServices/Makefile
index e16304d4e39..d79c994573a 100644
--- a/devel/py-pyobjc-framework-LaunchServices/Makefile
+++ b/devel/py-pyobjc-framework-LaunchServices/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-LaunchServices-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-LaunchServices/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-LaunchServices/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-OpenDirectory/Makefile b/devel/py-pyobjc-framework-OpenDirectory/Makefile
index a4f847811bd..d48d5d8acaa 100644
--- a/devel/py-pyobjc-framework-OpenDirectory/Makefile
+++ b/devel/py-pyobjc-framework-OpenDirectory/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-OpenDirectory-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-OpenDirectory/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-OpenDirectory/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-PreferencePanes/Makefile b/devel/py-pyobjc-framework-PreferencePanes/Makefile
index 3631f52c343..e67232a49d9 100644
--- a/devel/py-pyobjc-framework-PreferencePanes/Makefile
+++ b/devel/py-pyobjc-framework-PreferencePanes/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-PreferencePanes-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-PreferencePanes/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-PreferencePanes/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-PubSub/Makefile b/devel/py-pyobjc-framework-PubSub/Makefile
index ca7acb5ab8a..bcc5ebef371 100644
--- a/devel/py-pyobjc-framework-PubSub/Makefile
+++ b/devel/py-pyobjc-framework-PubSub/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-PubSub-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-PubSub/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-PubSub/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-QTKit/Makefile b/devel/py-pyobjc-framework-QTKit/Makefile
index fbe6ab2456a..3c8c35d9f14 100644
--- a/devel/py-pyobjc-framework-QTKit/Makefile
+++ b/devel/py-pyobjc-framework-QTKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-QTKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-QTKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-QTKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Quartz/Makefile b/devel/py-pyobjc-framework-Quartz/Makefile
index 844743cdff3..46b37c2a39b 100644
--- a/devel/py-pyobjc-framework-Quartz/Makefile
+++ b/devel/py-pyobjc-framework-Quartz/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:42:24 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Quartz-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Quartz/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Quartz/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-ScreenSaver/Makefile b/devel/py-pyobjc-framework-ScreenSaver/Makefile
index 668e02330bb..6f1f9c3d448 100644
--- a/devel/py-pyobjc-framework-ScreenSaver/Makefile
+++ b/devel/py-pyobjc-framework-ScreenSaver/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:50 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-ScreenSaver-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-ScreenSaver/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-ScreenSaver/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-ScriptingBridge/Makefile b/devel/py-pyobjc-framework-ScriptingBridge/Makefile
index 7f35cd491f5..b732fa4ac3d 100644
--- a/devel/py-pyobjc-framework-ScriptingBridge/Makefile
+++ b/devel/py-pyobjc-framework-ScriptingBridge/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:31 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-ScriptingBridge-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-ScriptingBridge/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-ScriptingBridge/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-SearchKit/Makefile b/devel/py-pyobjc-framework-SearchKit/Makefile
index 76ee6a80098..2290f80f084 100644
--- a/devel/py-pyobjc-framework-SearchKit/Makefile
+++ b/devel/py-pyobjc-framework-SearchKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-SearchKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-SearchKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-SearchKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-ServiceManagement/Makefile b/devel/py-pyobjc-framework-ServiceManagement/Makefile
index 991584a9cb2..f5dc6b077b4 100644
--- a/devel/py-pyobjc-framework-ServiceManagement/Makefile
+++ b/devel/py-pyobjc-framework-ServiceManagement/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-ServiceManagement-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-ServiceManagement/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-ServiceManagement/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-Social/Makefile b/devel/py-pyobjc-framework-Social/Makefile
index ade7fd23144..1acd4b506df 100644
--- a/devel/py-pyobjc-framework-Social/Makefile
+++ b/devel/py-pyobjc-framework-Social/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-Social-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-Social/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-Social/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-StoreKit/Makefile b/devel/py-pyobjc-framework-StoreKit/Makefile
index c4f325a3e83..aad2a7c3b87 100644
--- a/devel/py-pyobjc-framework-StoreKit/Makefile
+++ b/devel/py-pyobjc-framework-StoreKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-StoreKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-StoreKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-StoreKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-SyncServices/Makefile b/devel/py-pyobjc-framework-SyncServices/Makefile
index 682340059aa..a497c4dfe7a 100644
--- a/devel/py-pyobjc-framework-SyncServices/Makefile
+++ b/devel/py-pyobjc-framework-SyncServices/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-SyncServices-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-SyncServices/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-SyncServices/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-SystemConfiguration/Makefile b/devel/py-pyobjc-framework-SystemConfiguration/Makefile
index 9e998bcd502..5d578625223 100644
--- a/devel/py-pyobjc-framework-SystemConfiguration/Makefile
+++ b/devel/py-pyobjc-framework-SystemConfiguration/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-SystemConfiguration-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-SystemConfiguration/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-SystemConfiguration/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyobjc-framework-WebKit/Makefile b/devel/py-pyobjc-framework-WebKit/Makefile
index 5eb46cea5cb..144812f16f8 100644
--- a/devel/py-pyobjc-framework-WebKit/Makefile
+++ b/devel/py-pyobjc-framework-WebKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/04/25 10:40:51 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:32 wiz Exp $
 
 .include "../../devel/py-pyobjc/Makefile.common"
 
 DISTNAME=	pyobjc-framework-WebKit-${PYOBJC_VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyobjc-framework-WebKit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyobjc-framework-WebKit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyobjc/
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index e409a3be0da..896c01cfcc3 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/12/05 21:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	pyutil-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyutil/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyutil/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/pyutil
diff --git a/devel/py-rednose/Makefile b/devel/py-rednose/Makefile
index 98abac64731..3b228aa219e 100644
--- a/devel/py-rednose/Makefile
+++ b/devel/py-rednose/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/06/30 22:51:56 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:29 wiz Exp $
 
 DISTNAME=	rednose-0.4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/r/rednose/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/rednose/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://gfxmonk.net/dist/0install/rednose.xml
diff --git a/devel/py-repoze.lru/Makefile b/devel/py-repoze.lru/Makefile
index 5f33575728b..f99b8eff011 100644
--- a/devel/py-repoze.lru/Makefile
+++ b/devel/py-repoze.lru/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/07/15 18:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=	repoze.lru-0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/r/repoze.lru/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/repoze.lru/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.repoze.org/
diff --git a/devel/py-rope/Makefile b/devel/py-rope/Makefile
index a48266e4a85..ea74940bce4 100644
--- a/devel/py-rope/Makefile
+++ b/devel/py-rope/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:26 wiz Exp $
 
 VERS=		0.9.3
 DISTNAME=	rope-${VERS}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/r/rope/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/rope/}
 
 MAINTAINER=	helgoman@users.sourceforge.net
 HOMEPAGE=	http://rope.sourceforge.net/
diff --git a/devel/py-rply/Makefile b/devel/py-rply/Makefile
index 9e0380b71a5..2ea67d2f657 100644
--- a/devel/py-rply/Makefile
+++ b/devel/py-rply/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/01 02:45:52 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:28 wiz Exp $
 
 DISTNAME=	rply-0.7.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/r/rply/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/rply/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/alex/rply/
diff --git a/devel/py-serpent/Makefile b/devel/py-serpent/Makefile
index c5674828c8a..ee674e6670f 100644
--- a/devel/py-serpent/Makefile
+++ b/devel/py-serpent/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	serpent-1.4
 PKGNAME=	${PYPKGPREFIX}-serpent-1.4
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/s/serpent/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/serpent/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/serpent
diff --git a/devel/py-setuptools_trial/Makefile b/devel/py-setuptools_trial/Makefile
index 6e3ab1f465a..2e3422e8f86 100644
--- a/devel/py-setuptools_trial/Makefile
+++ b/devel/py-setuptools_trial/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/04/13 18:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	setuptools_trial-0.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/s/setuptools_trial/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/setuptools_trial/}
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/setuptools_trial/
diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile
index b50e8741994..eccc7f5276e 100644
--- a/devel/py-singledispatch/Makefile
+++ b/devel/py-singledispatch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/13 23:12:41 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:24 wiz Exp $
 
 DISTNAME=	singledispatch-3.4.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/s/singledispatch/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/singledispatch/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/singledispatch
diff --git a/devel/py-speaklater/Makefile b/devel/py-speaklater/Makefile
index 40b3bbd5988..8538e9230cb 100644
--- a/devel/py-speaklater/Makefile
+++ b/devel/py-speaklater/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2013/04/01 17:35:59 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	speaklater-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/s/speaklater/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/speaklater/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://github.com/mitsuhiko/speaklater
diff --git a/devel/py-stompclient/Makefile b/devel/py-stompclient/Makefile
index fc73e29305b..c441d5705c6 100644
--- a/devel/py-stompclient/Makefile
+++ b/devel/py-stompclient/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	stompclient-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/s/stompclient/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/stompclient/}
 
 MAINTAINER=	imil@NetBSD.org
-HOMEPAGE=	http://pypi.python.org/packages/source/s/stompclient/
+HOMEPAGE=	${MASTER_SITE_PYPI:=s/stompclient/}
 COMMENT=	Lightweight and extensible STOMP messaging client
 LICENSE=	apache-2.0
 
diff --git a/devel/py-subprocess32/Makefile b/devel/py-subprocess32/Makefile
index fb04c8af3ba..a32b60560bb 100644
--- a/devel/py-subprocess32/Makefile
+++ b/devel/py-subprocess32/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/12/08 14:12:02 nonaka Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:32 wiz Exp $
 
 DISTNAME=	subprocess32-3.2.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/s/subprocess32/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/subprocess32/}
 
 MAINTAINER=	nonakap@gmail.com
 HOMEPAGE=	http://pypi.python.org/pypi/subprocess32
diff --git a/devel/py-tabular/Makefile b/devel/py-tabular/Makefile
index 6133398a34d..0547be9aeb6 100644
--- a/devel/py-tabular/Makefile
+++ b/devel/py-tabular/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	tabular-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/t/tabular/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/tabular/}
 
 MAINTAINER=	dholland@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/tabular
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index c6e4d5f1246..7eab9b5fa57 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2015/03/15 19:11:21 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:26 wiz Exp $
 
 DISTNAME=	testtools-1.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/t/testtools/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/testtools/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/testing-cabal/testtools
diff --git a/devel/py-traceback2/Makefile b/devel/py-traceback2/Makefile
index 036c84661e5..9c3fc6513d6 100644
--- a/devel/py-traceback2/Makefile
+++ b/devel/py-traceback2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/09 13:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=		traceback2-1.4.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/t/traceback2/
+MASTER_SITES=		${MASTER_SITE_PYPI:=t/traceback2/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pypi.python.org/pypi/traceback2
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 0ab1143fb2e..cb5e94ed253 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/01/09 15:28:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=		unittest2-1.1.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/u/unittest2/
+MASTER_SITES=		${MASTER_SITE_PYPI:=u/unittest2/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pypi.python.org/pypi/unittest2
diff --git a/devel/py-unittest2py3k/Makefile b/devel/py-unittest2py3k/Makefile
index 77f6fb5374a..390345d9a34 100644
--- a/devel/py-unittest2py3k/Makefile
+++ b/devel/py-unittest2py3k/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/04/13 23:12:41 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:23 wiz Exp $
 
 DISTNAME=		unittest2py3k-0.5.1
 # to match python-2.x name
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py3k//}
 PKGREVISION=		1
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/u/unittest2py3k/
+MASTER_SITES=		${MASTER_SITE_PYPI:=u/unittest2py3k/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pypi.python.org/pypi/unittest2py3k
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index 6433ecaa769..d08947dee9a 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2015/11/12 16:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	urwid-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	https://pypi.python.org/packages/source/u/urwid/
+MASTER_SITES=	${MASTER_SITE_PYPI:=u/urwid/}
 
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://urwid.org/
diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index ed553797015..549871446a6 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2015/12/05 21:25:40 adam Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=		ZConfig-2.6.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=		devel python
-MASTER_SITES=		http://pypi.python.org/packages/source/Z/ZConfig/
+MASTER_SITES=		${MASTER_SITE_PYPI:=Z/ZConfig/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.zope.org/Members/fdrake/zconfig/
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index e7a716cddef..acfd52275a4 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2015/12/05 21:25:40 adam Exp $
+# $NetBSD: Makefile,v 1.49 2016/06/08 17:43:27 wiz Exp $
 
 DISTNAME=	roundup-1.4.19
 PKGREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/r/roundup/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/roundup/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://roundup.sourceforge.net/
diff --git a/finance/py-python-bitcoinlib/Makefile b/finance/py-python-bitcoinlib/Makefile
index 2b4854f609b..3c93e2d5e83 100644
--- a/finance/py-python-bitcoinlib/Makefile
+++ b/finance/py-python-bitcoinlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:32 wiz Exp $
 
 DISTNAME=	python-bitcoinlib-0.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	finance net python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-bitcoinlib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-bitcoinlib/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/petertodd/python-bitcoinlib
diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile
index 4f99fca7147..8c734fc0b25 100644
--- a/finance/py-stripe/Makefile
+++ b/finance/py-stripe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/04/01 03:13:10 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:32 wiz Exp $
 
 DISTNAME=	stripe-1.22.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	finance python
-MASTER_SITES=	https://pypi.python.org/packages/source/s/stripe/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/stripe/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://stripe.com/
diff --git a/fonts/py-TTFQuery/Makefile b/fonts/py-TTFQuery/Makefile
index 280722d5a49..c1080dc3ddd 100644
--- a/fonts/py-TTFQuery/Makefile
+++ b/fonts/py-TTFQuery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2015/12/05 21:25:42 adam Exp $
+# $NetBSD: Makefile,v 1.17 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=		TTFQuery-1.0.5
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		fonts python
-MASTER_SITES=		http://pypi.python.org/packages/source/T/TTFQuery/
+MASTER_SITES=		${MASTER_SITE_PYPI:=T/TTFQuery/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://ttfquery.sourceforge.net/
diff --git a/games/py-easyAI/Makefile b/games/py-easyAI/Makefile
index ff8079239ee..603869c7dc6 100644
--- a/games/py-easyAI/Makefile
+++ b/games/py-easyAI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 21:25:43 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	easyAI-0.0.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	games
-MASTER_SITES=	https://pypi.python.org/packages/source/e/easyAI/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/easyAI/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/easyAI
diff --git a/games/py-ranking/Makefile b/games/py-ranking/Makefile
index 06dcd680072..71d1246debe 100644
--- a/games/py-ranking/Makefile
+++ b/games/py-ranking/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	ranking-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	games python
-MASTER_SITES=	http://pypi.python.org/packages/source/r/ranking/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/ranking/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/ranking/
diff --git a/games/py-trueskill/Makefile b/games/py-trueskill/Makefile
index ab5829606ca..e5cd836f358 100644
--- a/games/py-trueskill/Makefile
+++ b/games/py-trueskill/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/09/07 20:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	trueskill-0.4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	games devel
-MASTER_SITES=	http://pypi.python.org/packages/source/t/trueskill/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/trueskill/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://trueskill.org/
diff --git a/geography/py-geojson/Makefile b/geography/py-geojson/Makefile
index e520cc00f19..a26c22c7727 100644
--- a/geography/py-geojson/Makefile
+++ b/geography/py-geojson/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2016/02/10 13:02:31 kleink Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	geojson-1.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	geography python
-MASTER_SITES=	http://pypi.python.org/packages/source/g/geojson/
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/geojson/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://github.com/frewsxcv/python-geojson/
diff --git a/geography/py-obspy/Makefile b/geography/py-obspy/Makefile
index f939b49da50..ceeff209d7d 100644
--- a/geography/py-obspy/Makefile
+++ b/geography/py-obspy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 21:25:44 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	obspy-0.10.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	geography python
-MASTER_SITES=	http://pypi.python.org/packages/source/o/obspy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=o/obspy/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	wen@NetBSD.org
diff --git a/geography/py-pycountry/Makefile b/geography/py-pycountry/Makefile
index f966ed70663..58d53343806 100644
--- a/geography/py-pycountry/Makefile
+++ b/geography/py-pycountry/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2014/12/06 15:18:29 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	pycountry-1.10
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	geography python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pycountry/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycountry/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kamel.derouiche@gmail.com
-HOMEPAGE=	https://pypi.python.org/packages/source/p/pycountry/
+HOMEPAGE=	${MASTER_SITE_PYPI:=p/pycountry/}
 COMMENT=	ISO country, subdivision, language, currency and script
 LICENSE=	gnu-lgpl-v2.1
 
diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile
index 76d2995ec88..643d6157399 100644
--- a/graphics/py-aafigure/Makefile
+++ b/graphics/py-aafigure/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2015/12/05 21:25:45 adam Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	aafigure-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	graphics converters python
-MASTER_SITES=	http://pypi.python.org/packages/source/a/aafigure/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/aafigure/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://launchpad.net/aafigure
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 9a3ceb7847a..d547d155d9d 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/03/15 17:30:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	actdiag-0.5.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	http://pypi.python.org/packages/source/a/actdiag/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/actdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blockdiag.com/actdiag/build/html/
diff --git a/graphics/py-altgraph/Makefile b/graphics/py-altgraph/Makefile
index 9db19f1e610..908fc7c5452 100644
--- a/graphics/py-altgraph/Makefile
+++ b/graphics/py-altgraph/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/08/07 01:37:17 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	altgraph-0.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics net python
-MASTER_SITES=	http://pypi.python.org/packages/source/a/altgraph/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/altgraph/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://packages.python.org/altgraph
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 04611af5ae0..18bf8eb6ee8 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2015/04/14 11:25:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	blockdiag-1.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	http://pypi.python.org/packages/source/b/blockdiag/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/blockdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blockdiag.com/
diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile
index db7a89d160c..564e3c1f88d 100644
--- a/graphics/py-cairocffi/Makefile
+++ b/graphics/py-cairocffi/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:18 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	cairocffi-0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	graphics python
-MASTER_SITES=	https://pypi.python.org/packages/source/c/cairocffi/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cairocffi/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/SimonSapin/cairocffi
diff --git a/graphics/py-fits/Makefile b/graphics/py-fits/Makefile
index 5b50ae59348..a5602a0da23 100644
--- a/graphics/py-fits/Makefile
+++ b/graphics/py-fits/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/03/21 21:23:30 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	pyfits-3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	graphics
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pyfits/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyfits/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://www.stsci.edu/resources/software_hardware/pyfits
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 86bfe088154..c542a089f1b 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/11/19 07:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:33 wiz Exp $
 
 DISTNAME=	pygraphviz-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	graphics
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pygraphviz/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygraphviz/}
 
 MAINTAINER=	helgoman@users.sourceforge.net
 HOMEPAGE=	http://networkx.lanl.gov/pygraphviz/index.html
diff --git a/graphics/py-imagesize/Makefile b/graphics/py-imagesize/Makefile
index 13d707a9bb5..ef416e61da8 100644
--- a/graphics/py-imagesize/Makefile
+++ b/graphics/py-imagesize/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/04/23 17:46:30 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	imagesize-0.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
-#MASTER_SITES=	http://pypi.python.org/packages/source/i/imagesize/
+#MASTER_SITES=	${MASTER_SITE_PYPI:=i/imagesize/}
 MASTER_SITES=	http://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index a5661d44a33..7fa3b47223d 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2015/03/15 17:47:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:34 wiz Exp $
 #
 
 DISTNAME=	nwdiag-1.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	http://pypi.python.org/packages/source/n/nwdiag/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/nwdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blockdiag.com/nwdiag/build/html/
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index d4260c061b6..5cbd733141f 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/05/21 05:35:24 richard Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	pycha-0.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pycha/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycha/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/lgs/pycha/
diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile
index 938799da2c3..bb9be4c993d 100644
--- a/graphics/py-pygal/Makefile
+++ b/graphics/py-pygal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/04/01 03:55:34 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	pygal-1.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pygal/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygal/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://pygal.org/
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index a71fb99a5b3..26fbc9d4d53 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/04/14 11:40:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	qrcode-5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	https://pypi.python.org/packages/source/q/qrcode/
+MASTER_SITES=	${MASTER_SITE_PYPI:=q/qrcode/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	${MASTER_SITE_GITHUB:=lincolnloop/python-qrcode}
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index 1ea5e8158d5..b55fa0e0b12 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2015/03/15 19:31:45 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	seqdiag-0.9.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	http://pypi.python.org/packages/source/s/seqdiag/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/seqdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blockdiag.com/seqdiag/build/html/
diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile
index 94fa7314e59..9b9ccefd950 100644
--- a/lang/py-hy/Makefile
+++ b/lang/py-hy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/11/09 19:31:56 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	hy-0.10.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	lang python
-MASTER_SITES=	https://pypi.python.org/packages/source/h/hy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=h/hy/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://hylang.org/
diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index c56a04cadbd..464e8f17533 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:48 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:34 wiz Exp $
 
 VERSION=	2.0.8
 DISTNAME=	pyspf-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-spf-${VERSION}
 CATEGORIES=	mail python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pyspf/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyspf/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/pyspf
diff --git a/mail/py-validate-email-address/Makefile b/mail/py-validate-email-address/Makefile
index 32d721850c4..2ed263a540a 100644
--- a/mail/py-validate-email-address/Makefile
+++ b/mail/py-validate-email-address/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	validate-email-address-1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	mail python
-MASTER_SITES=	https://pypi.python.org/packages/source/v/validate-email-address/
+MASTER_SITES=	${MASTER_SITE_PYPI:=v/validate-email-address/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/heropunch/validate-email-address
diff --git a/math/py-almost/Makefile b/math/py-almost/Makefile
index 4204c83cddc..c0a73f2e91a 100644
--- a/math/py-almost/Makefile
+++ b/math/py-almost/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/07/22 10:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	almost-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math devel
-MASTER_SITES=	https://pypi.python.org/packages/source/a/almost/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/almost/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/almost/
diff --git a/math/py-ephem/Makefile b/math/py-ephem/Makefile
index 489f4c620d8..fe1bdcd237f 100644
--- a/math/py-ephem/Makefile
+++ b/math/py-ephem/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/12/05 21:25:49 adam Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	pyephem-3.7.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyephem/ephem/}
 CATEGORIES=	geography math
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyephem/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyephem/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rhodesmill.org/brandon/projects/pyephem.html
diff --git a/math/py-ephem3/Makefile b/math/py-ephem3/Makefile
index 4cf86cab7fb..98ed0541e9c 100644
--- a/math/py-ephem3/Makefile
+++ b/math/py-ephem3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:34 wiz Exp $
 
 DISTNAME=	ephem-3.7.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyephem/ephem/}
 CATEGORIES=	geography math
-MASTER_SITES=	http://pypi.python.org/packages/source/e/ephem/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/ephem/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/ephem/
diff --git a/math/py-fftw/Makefile b/math/py-fftw/Makefile
index 39b1927a90d..2abf5c9879b 100644
--- a/math/py-fftw/Makefile
+++ b/math/py-fftw/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/12/25 20:06:47 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	PyFFTW3-0.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//S/FFTW/fftw/S/3//}
 PKGREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	http://pypi.python.org/packages/source/P/PyFFTW3/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyFFTW3/}
 
 MAINTAINER=	jihbed.research@gmail.com
 HOMEPAGE=	https://pypi.python.org/pypi/PyFFTW3
diff --git a/math/py-fpconst/Makefile b/math/py-fpconst/Makefile
index 30455776cd6..0ca3796d97d 100644
--- a/math/py-fpconst/Makefile
+++ b/math/py-fpconst/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/12/05 21:25:49 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	fpconst-0.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
-MASTER_SITES=	http://pypi.python.org/packages/source/f/fpconst/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/fpconst/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/fpconst
diff --git a/math/py-infinity/Makefile b/math/py-infinity/Makefile
index 4890401ead4..6484b109b3d 100644
--- a/math/py-infinity/Makefile
+++ b/math/py-infinity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/14 13:57:58 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	infinity-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel math python
-MASTER_SITES=	https://pypi.python.org/packages/source/i/infinity/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/infinity/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/infinity
diff --git a/math/py-intervals/Makefile b/math/py-intervals/Makefile
index 887b3c96b30..d14208f833e 100644
--- a/math/py-intervals/Makefile
+++ b/math/py-intervals/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/07/05 19:33:17 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	intervals-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
-MASTER_SITES=	https://pypi.python.org/packages/source/i/intervals/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/intervals/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/intervals
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index 54254644fb9..6a23ba0e59b 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/07/22 10:11:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	mpmath-0.19
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mpmath/ \
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mpmath/ \}
 		http://mpmath.org/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/math/py-munkres/Makefile b/math/py-munkres/Makefile
index 9953405b86e..97bbefe0ae5 100644
--- a/math/py-munkres/Makefile
+++ b/math/py-munkres/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/01/20 20:26:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	munkres-1.0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
-MASTER_SITES=	http://pypi.python.org/packages/source/m/munkres/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/munkres/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/munkres/
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index ec3731af8b2..a2968a5ccb2 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2015/12/05 21:25:49 adam Exp $
+# $NetBSD: Makefile,v 1.18 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	networkx-1.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
-MASTER_SITES=	http://pypi.python.org/packages/source/n/networkx/ \
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/networkx/ \}
 		http://networkx.lanl.gov/download/networkx/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 42cd12955b7..186266ec17d 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/12/28 14:35:02 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	pandas-0.17.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math graphics python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pandas/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pandas/}
 
 MAINTAINER=	bad@NetBSD.org
 HOMEPAGE=	http://pandas.pydata.org/
diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile
index fec640470de..fbcfe4d020b 100644
--- a/math/py-roman/Makefile
+++ b/math/py-roman/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/03/15 17:15:02 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	roman-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
-MASTER_SITES=	http://pypi.python.org/packages/source/r/roman/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/roman/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index e0557efd804..becb15912c9 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2015/04/14 11:40:31 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2016/06/08 17:43:35 wiz Exp $
 
 DISTNAME=	rpy2-2.5.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
 PKGREVISION=	2
 CATEGORIES=	math python
-MASTER_SITES=	https://pypi.python.org/packages/source/r/rpy2/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/rpy2/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rpy.sourceforge.net/
diff --git a/math/py-simpleeval/Makefile b/math/py-simpleeval/Makefile
index f9cea4e9a88..8dbdf5425ce 100644
--- a/math/py-simpleeval/Makefile
+++ b/math/py-simpleeval/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 21:25:49 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	simpleeval-0.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
-MASTER_SITES=	http://pypi.python.org/packages/source/s/simpleeval/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/simpleeval/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://github.com/danthedeckie/simpleeval
diff --git a/misc/py-stdnum/Makefile b/misc/py-stdnum/Makefile
index 4030a6db37d..8cdb6cfc507 100644
--- a/misc/py-stdnum/Makefile
+++ b/misc/py-stdnum/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:50 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	python-stdnum-0.9
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=	misc
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-stdnum/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-stdnum/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://arthurdejong.org/python-stdnum
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile
index 2a33e6ecd28..3cba4222040 100644
--- a/net/Radicale/Makefile
+++ b/net/Radicale/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2016/01/12 00:17:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.17 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	Radicale-1.1.1
 CATEGORIES=	net time www
-MASTER_SITES=	http://pypi.python.org/packages/source/R/Radicale/
+MASTER_SITES=	${MASTER_SITE_PYPI:=R/Radicale/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://radicale.org/
diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile
index b2aa97a9b7e..b09e71675b4 100644
--- a/net/py-IP/Makefile
+++ b/net/py-IP/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2014/07/28 02:38:24 wen Exp $
+# $NetBSD: Makefile,v 1.21 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	IPy-0.81
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/IPy/IP/}
 CATEGORIES=	net python
-MASTER_SITES=	http://pypi.python.org/packages/source/I/IPy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=I/IPy/}
 
 MAINTAINER=	wenheping@gmail.com
 HOMEPAGE=	https://github.com/haypo/python-ipy/
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
index 5be744042bd..d9645e8ee43 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/11/09 20:18:33 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	amqp-1.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/a/amqp/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/amqp/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://amqp.readthedocs.org/
diff --git a/net/py-apache-libcloud/Makefile b/net/py-apache-libcloud/Makefile
index db5cb53bbf5..025e94fadd3 100644
--- a/net/py-apache-libcloud/Makefile
+++ b/net/py-apache-libcloud/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/02/23 10:46:31 imil Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	apache-libcloud-0.17.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/a/apache-libcloud/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/apache-libcloud/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://libcloud.apache.org/
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 5cb8c75e0f1..744c3065bfa 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 21:25:53 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	beanstalkc-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/b/beanstalkc/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/beanstalkc/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/earl/beanstalkc
diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index 5be85faf5b5..12357b3d860 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2015/04/05 21:38:32 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.24 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	boto-2.37.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python www
-MASTER_SITES=	https://pypi.python.org/packages/source/b/boto/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/boto/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/boto/boto/
diff --git a/net/py-caldav/Makefile b/net/py-caldav/Makefile
index 021538e4cdb..1dec01cf6ae 100644
--- a/net/py-caldav/Makefile
+++ b/net/py-caldav/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:53 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	caldav-0.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/c/caldav/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/caldav/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/cyrilrbt/caldav
diff --git a/net/py-celery/Makefile b/net/py-celery/Makefile
index f9ec28b6e86..9304062f914 100644
--- a/net/py-celery/Makefile
+++ b/net/py-celery/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/11/09 20:47:58 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:37 wiz Exp $
 #
 
 DISTNAME=	celery-3.1.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/c/celery/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/celery/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.celeryproject.org/
diff --git a/net/py-eventlib/Makefile b/net/py-eventlib/Makefile
index 5693b1b65cd..688abeeceea 100644
--- a/net/py-eventlib/Makefile
+++ b/net/py-eventlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:53 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	eventlib-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/e/eventlib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/eventlib/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://travis-ci.org/Yipit/eventlib/
diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile
index 1d6a61b06b9..0ef41225678 100644
--- a/net/py-foolscap/Makefile
+++ b/net/py-foolscap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2016/04/13 18:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	foolscap-0.11.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	http://pypi.python.org/packages/source/f/foolscap/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/foolscap/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
 #MAINTAINER+=	gdt@NetBSD.org
diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile
index 94857479aac..4ed5b5ac256 100644
--- a/net/py-irclib/Makefile
+++ b/net/py-irclib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2015/03/26 15:57:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:36 wiz Exp $
 #
 
 PYIRCVERS=	11.1.1
 DISTNAME=	irc-${PYIRCVERS}
 PKGNAME=	${PYPKGPREFIX}-irclib-${PYIRCVERS}
 CATEGORIES=	net python
-MASTER_SITES=	http://pypi.python.org/packages/source/i/irc/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/irc/}
 EXTRACT_SUFX=	.zip
 EXTRACT_OPTS_ZIP=-aa -q -o
 
diff --git a/net/py-junos-eznc/Makefile b/net/py-junos-eznc/Makefile
index 97879491215..46b0c40c457 100644
--- a/net/py-junos-eznc/Makefile
+++ b/net/py-junos-eznc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2016/02/17 12:21:41 he Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	junos-eznc-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/j/junos-eznc/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/junos-eznc/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/junos-eznc/
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 8a531481d13..205b958a773 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2014/11/09 20:40:01 rodent Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	kombu-3.0.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/k/kombu/
+MASTER_SITES=	${MASTER_SITE_PYPI:=k/kombu/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://kombu.readthedocs.org/
diff --git a/net/py-ncclient/Makefile b/net/py-ncclient/Makefile
index 173b23a8c56..754803aa8b0 100644
--- a/net/py-ncclient/Makefile
+++ b/net/py-ncclient/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/02/17 12:20:57 he Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	ncclient-0.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/n/ncclient/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/ncclient/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/ncclient
diff --git a/net/py-ptt/Makefile b/net/py-ptt/Makefile
index 22ea02341d1..16410d46a7d 100644
--- a/net/py-ptt/Makefile
+++ b/net/py-ptt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/18 02:25:37 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:36 wiz Exp $
 #
 
 PTTVERS=	1.9.0
@@ -6,7 +6,7 @@ DISTNAME=	twitter-${PTTVERS}
 PKGNAME=	${PYPKGPREFIX}-ptt-${PTTVERS}
 PKGREVISION=	1
 CATEGORIES=	net python
-MASTER_SITES=	http://pypi.python.org/packages/source/t/twitter/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/twitter/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://mike.verdone.ca/twitter/
diff --git a/net/py-socketpool/Makefile b/net/py-socketpool/Makefile
index a2ac2ea8f44..bf574c52df5 100644
--- a/net/py-socketpool/Makefile
+++ b/net/py-socketpool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:25:54 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	socketpool-0.5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/s/socketpool/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/socketpool/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/benoitc/socketpool
diff --git a/net/py-softlayer/Makefile b/net/py-softlayer/Makefile
index 1ed08b5d60d..1fe2dc14700 100644
--- a/net/py-softlayer/Makefile
+++ b/net/py-softlayer/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2015/02/07 22:06:52 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	SoftLayer-3.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/SoftLayer/softlayer/}
 PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/S/SoftLayer/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/SoftLayer/}
 
 MAINTAINER=	imil@NetBSD.org
-HOMEPAGE=	https://pypi.python.org/packages/source/S/SoftLayer/
+HOMEPAGE=	${MASTER_SITE_PYPI:=S/SoftLayer/}
 COMMENT=	SoftLayer API bindings for Python
 LICENSE=	mit
 
diff --git a/net/py-softlayer_messaging/Makefile b/net/py-softlayer_messaging/Makefile
index 8bf1b0996da..f18553ba9c3 100644
--- a/net/py-softlayer_messaging/Makefile
+++ b/net/py-softlayer_messaging/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/08 23:09:53 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	softlayer_messaging-1.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/s/softlayer_messaging/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/softlayer_messaging/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://sldn.softlayer.com/reference/messagequeueapi
diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile
index 3c5c5101a54..6d1e1296cce 100644
--- a/net/py-suds/Makefile
+++ b/net/py-suds/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/12/05 21:25:54 adam Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	suds-0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	http://pypi.python.org/packages/source/s/suds/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/suds/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://fedorahosted.org/suds/
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index 5de3a2b3d85..0e8db591546 100644
--- a/net/py-tweepy/Makefile
+++ b/net/py-tweepy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 21:25:54 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	tweepy-2.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/t/tweepy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/tweepy/}
 
 MAINTAINER=	riz@NetBSD.org
 HOMEPAGE=	http://www.tweepy.org/
diff --git a/net/py-twython/Makefile b/net/py-twython/Makefile
index d70a17c4939..a6892b8148f 100644
--- a/net/py-twython/Makefile
+++ b/net/py-twython/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/05/08 15:36:57 imil Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:37 wiz Exp $
 
 DISTNAME=	twython-3.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://pypi.python.org/packages/source/t/twython/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/twython/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	https://github.com/ryanmcgrath/twython
diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile
index 78eef3ddba7..1e900348815 100644
--- a/net/py-zmq/Makefile
+++ b/net/py-zmq/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2014/11/15 02:09:46 obache Exp $
+# $NetBSD: Makefile,v 1.17 2016/06/08 17:43:36 wiz Exp $
 
 DISTNAME=	pyzmq-14.4.1
 PKGNAME=        ${DISTNAME:S/py/${PYPKGPREFIX}-/1}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pyzmq/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyzmq/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/zeromq/pyzmq/
diff --git a/parallel/py-billiard/Makefile b/parallel/py-billiard/Makefile
index 85d24b16e50..b0cebf5e944 100644
--- a/parallel/py-billiard/Makefile
+++ b/parallel/py-billiard/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/07/16 23:15:12 rodent Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	billiard-3.3.0.18
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	parallel
-MASTER_SITES=	https://pypi.python.org/packages/source/b/billiard/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/billiard/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/celery/billiard
diff --git a/print/py-pisa/Makefile b/print/py-pisa/Makefile
index d4ea79bb579..37fb408924a 100644
--- a/print/py-pisa/Makefile
+++ b/print/py-pisa/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/12/05 21:25:56 adam Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	pisa-3.0.33
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc print www python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pisa/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pisa/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.htmltopdf.org/
diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 53ac2590e77..aee08ae6756 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2016/04/20 16:05:57 leot Exp $
+# $NetBSD: Makefile,v 1.39 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	pyOpenSSL-16.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	security python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyOpenSSL/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyOpenSSL/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pyca/pyopenssl/
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index 25a3b02ff92..9d078304758 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 13:48:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	bcrypt-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	python security
-MASTER_SITES=	https://pypi.python.org/packages/source/b/bcrypt/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/bcrypt/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/pyca/bcrypt/
diff --git a/security/py-cryptopp/Makefile b/security/py-cryptopp/Makefile
index c7a5689046e..4e7ecb1473c 100644
--- a/security/py-cryptopp/Makefile
+++ b/security/py-cryptopp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2015/12/05 21:25:56 adam Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:38 wiz Exp $
 
 VERSION=	0.6.0
 VERSION_EXCESSIVE=	1206569328141510525648634803928199668821045408958
 DISTNAME=	pycryptopp-${VERSION}.${VERSION_EXCESSIVE}
 PKGNAME=	${PYPKGPREFIX}-cryptopp-${VERSION}
 CATEGORIES=	security python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pycryptopp/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycryptopp/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tahoe-lafs.org/trac/pycryptopp
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index 9f0dfc17d19..52987254daa 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/04/03 08:40:28 kleink Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	itsdangerous-0.24
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
-MASTER_SITES=	http://pypi.python.org/packages/source/i/itsdangerous/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/itsdangerous/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/itsdangerous/
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 7321d93eae2..d5ef0a3b63f 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2016/05/21 05:38:40 richard Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	keyring-5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://pypi.python.org/packages/source/k/keyring/
+MASTER_SITES=	${MASTER_SITE_PYPI:=k/keyring/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc.gnome@gmail.com
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 34a23bd2cd8..80a8877baca 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2016/03/05 11:29:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=		M2Crypto-0.22.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
 PKGREVISION=		1
 CATEGORIES=		security python
-MASTER_SITES=		http://pypi.python.org/packages/source/M/M2Crypto/
+MASTER_SITES=		${MASTER_SITE_PYPI:=M/M2Crypto/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://chandlerproject.org/bin/view/Projects/MeTooCrypto
diff --git a/security/py-oauth/Makefile b/security/py-oauth/Makefile
index 72c8fe13898..c31d294d596 100644
--- a/security/py-oauth/Makefile
+++ b/security/py-oauth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	oauth-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security www
-MASTER_SITES=	http://pypi.python.org/packages/source/o/oauth/
+MASTER_SITES=	${MASTER_SITE_PYPI:=o/oauth/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/oauth/
diff --git a/security/py-oauth2/Makefile b/security/py-oauth2/Makefile
index 1519f3054db..35383330cd8 100644
--- a/security/py-oauth2/Makefile
+++ b/security/py-oauth2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:57 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	oauth2-1.5.211
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security www
-MASTER_SITES=	http://pypi.python.org/packages/source/o/oauth/
+MASTER_SITES=	${MASTER_SITE_PYPI:=o/oauth/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/oauth2/
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 4b6687dba05..762286bc855 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2016/05/18 12:43:00 he Exp $
+# $NetBSD: Makefile,v 1.27 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=		paramiko-1.15.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		security
-MASTER_SITES=		http://pypi.python.org/packages/source/p/paramiko/
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/paramiko/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://github.com/paramiko/paramiko/
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index f165a58da80..ef15f0645ff 100644
--- a/security/py-passlib/Makefile
+++ b/security/py-passlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/08/14 18:46:33 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	passlib-1.6.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/passlib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/passlib/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/ecollins/passlib
diff --git a/security/py-py-bcrypt/Makefile b/security/py-py-bcrypt/Makefile
index dbc648c4240..5162f404048 100644
--- a/security/py-py-bcrypt/Makefile
+++ b/security/py-py-bcrypt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/27 13:52:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	py-bcrypt-0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security
-MASTER_SITES=	https://pypi.python.org/packages/source/p/py-bcrypt/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/py-bcrypt/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://code.google.com/p/py-bcrypt
diff --git a/security/py-pydeep/Makefile b/security/py-pydeep/Makefile
index 260f23b5ac2..48ebb79e9ce 100644
--- a/security/py-pydeep/Makefile
+++ b/security/py-pydeep/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/02 00:00:15 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	pydeep-0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pydeep/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydeep/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.github.com/kbandla/pydeep
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index 4cfc9bacbcb..7117d1f229d 100644
--- a/security/py-stix/Makefile
+++ b/security/py-stix/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:57 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:38 wiz Exp $
 
 DISTNAME=	stix-1.1.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security
-MASTER_SITES=	https://pypi.python.org/packages/source/s/stix/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/stix/}
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	https://github.com/STIXProject/python-stix
diff --git a/sysutils/cuisine/Makefile b/sysutils/cuisine/Makefile
index 8dde51a879d..9df71e41e7c 100644
--- a/sysutils/cuisine/Makefile
+++ b/sysutils/cuisine/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:58 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:39 wiz Exp $
 
 VERSION=		0.7.11
 DISTNAME=		cuisine-${VERSION}
 #PKGNAME=		cuisine-0.7.11
 CATEGORIES=		sysutils
-MASTER_SITES=		https://pypi.python.org/packages/source/c/cuisine/
+MASTER_SITES=		${MASTER_SITE_PYPI:=c/cuisine/}
 
 MAINTAINER=		imil@NetBSD.org
 HOMEPAGE=		https://github.com/sebastien/cuisine
diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile
index 6489e43cbf5..b4eed2a7f1a 100644
--- a/sysutils/fabric/Makefile
+++ b/sysutils/fabric/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2015/12/05 21:25:58 adam Exp $
+# $NetBSD: Makefile,v 1.42 2016/06/08 17:43:39 wiz Exp $
 
 VERSION=		1.10.2
 DISTNAME=		Fabric-${VERSION}
 PKGNAME=		${DISTNAME:S/F/f/}
 CATEGORIES=		sysutils net
-MASTER_SITES=		http://pypi.python.org/packages/source/F/Fabric/
+MASTER_SITES=		${MASTER_SITE_PYPI:=F/Fabric/}
 
 MAINTAINER=		gls@NetBSD.org
 HOMEPAGE=		http://fabfile.org/
diff --git a/sysutils/manifold/Makefile b/sysutils/manifold/Makefile
index a53f9dca46f..9d9bf91929f 100644
--- a/sysutils/manifold/Makefile
+++ b/sysutils/manifold/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:59 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:39 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/^M/m/}
 DISTNAME=	Manifold-0.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://pypi.python.org/packages/source/M/Manifold/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/Manifold/}
 
 MAINTAINER=	filip@joyent.com
 HOMEPAGE=	http://code.google.com/p/manifold/
diff --git a/sysutils/py-attic/Makefile b/sysutils/py-attic/Makefile
index 30c95852f8c..1b282917f53 100644
--- a/sysutils/py-attic/Makefile
+++ b/sysutils/py-attic/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/07/28 23:54:29 riz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	Attic-0.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/A/a/}
 PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	https://pypi.python.org/packages/source/A/Attic/
+MASTER_SITES=	${MASTER_SITE_PYPI:=A/Attic/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://attic-backup.org/
diff --git a/sysutils/py-kazoo/Makefile b/sysutils/py-kazoo/Makefile
index c561297c435..2005493e6fb 100644
--- a/sysutils/py-kazoo/Makefile
+++ b/sysutils/py-kazoo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/01 11:43:57 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	kazoo-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python sysutils
-MASTER_SITES=	https://pypi.python.org/packages/source/k/kazoo/
+MASTER_SITES=	${MASTER_SITE_PYPI:=k/kazoo/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	rodent@NetBSD.org
diff --git a/sysutils/py-magic/Makefile b/sysutils/py-magic/Makefile
index 394bc170c63..31f3dc09d47 100644
--- a/sysutils/py-magic/Makefile
+++ b/sysutils/py-magic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	python-magic-0.4.6
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/1}
 CATEGORIES=	python sysutils
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-magic/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-magic/}
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://github.com/ahupp/python-magic
diff --git a/sysutils/py-structlog/Makefile b/sysutils/py-structlog/Makefile
index 44ad67304c5..8000904c029 100644
--- a/sysutils/py-structlog/Makefile
+++ b/sysutils/py-structlog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/04/02 22:23:31 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	structlog-15.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python sysutils
-MASTER_SITES=	https://pypi.python.org/packages/source/s/structlog/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/structlog/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.structlog.org/
diff --git a/textproc/py-Tempita/Makefile b/textproc/py-Tempita/Makefile
index a93c1bafa7f..687c94e7c5b 100644
--- a/textproc/py-Tempita/Makefile
+++ b/textproc/py-Tempita/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=		Tempita-0.5.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc python
-MASTER_SITES=		http://pypi.python.org/packages/source/T/Tempita/
+MASTER_SITES=		${MASTER_SITE_PYPI:=T/Tempita/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pythonpaste.org/tempita/
diff --git a/textproc/py-Unidecode/Makefile b/textproc/py-Unidecode/Makefile
index 73a7110e1d9..232aac67700 100644
--- a/textproc/py-Unidecode/Makefile
+++ b/textproc/py-Unidecode/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/25 06:56:47 asau Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:40 wiz Exp $
 #
 
 DISTNAME=	Unidecode-0.04.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/U/Unidecode/
+MASTER_SITES=	${MASTER_SITE_PYPI:=U/Unidecode/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/Unidecode/
diff --git a/textproc/py-Whoosh/Makefile b/textproc/py-Whoosh/Makefile
index 371a26a73a7..61805d1ec3b 100644
--- a/textproc/py-Whoosh/Makefile
+++ b/textproc/py-Whoosh/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:40 wiz Exp $
 #
 
 DISTNAME=	Whoosh-2.5.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc devel
-MASTER_SITES=	http://pypi.python.org/packages/source/W/Whoosh/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/Whoosh/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://whoosh.ca/
diff --git a/textproc/py-acora/Makefile b/textproc/py-acora/Makefile
index 8a1c4359f5d..9b35ddc4714 100644
--- a/textproc/py-acora/Makefile
+++ b/textproc/py-acora/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/02/13 00:50:13 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	acora-1.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/a/acora/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/acora/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/acora
diff --git a/textproc/py-anyjson/Makefile b/textproc/py-anyjson/Makefile
index 6dff96a71f1..e5d17bfb95b 100644
--- a/textproc/py-anyjson/Makefile
+++ b/textproc/py-anyjson/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/07/02 11:15:55 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:41 wiz Exp $
 #
 
 DISTNAME=	anyjson-0.3.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/a/anyjson/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/anyjson/}
 
 MAINTAINER=	pkgsrc-users@netbsd.org
 HOMEPAGE=	http://bitbucket.org/runeh/anyjson/
diff --git a/textproc/py-biplist/Makefile b/textproc/py-biplist/Makefile
index 02ac4ed3eab..6a3e223e8ac 100644
--- a/textproc/py-biplist/Makefile
+++ b/textproc/py-biplist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/03 22:25:15 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	biplist-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/b/biplist/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/biplist/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/wooster/biplist
diff --git a/textproc/py-cjson/Makefile b/textproc/py-cjson/Makefile
index da352ee2846..de925a82891 100644
--- a/textproc/py-cjson/Makefile
+++ b/textproc/py-cjson/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/12/05 21:26:01 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:41 wiz Exp $
 #
 
 DISTNAME=	python-cjson-1.0.5
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/1}
 CATEGORIES=	python textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-cjson/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-cjson/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://ag-projects.com/
diff --git a/textproc/py-color/Makefile b/textproc/py-color/Makefile
index 4bd2eb704d0..e0ac50675dd 100644
--- a/textproc/py-color/Makefile
+++ b/textproc/py-color/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/04/13 23:12:43 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	color-0.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/c/color/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/color/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/sahchandler/color
diff --git a/textproc/py-colour/Makefile b/textproc/py-colour/Makefile
index 8d66423e0b0..728dae52c5a 100644
--- a/textproc/py-colour/Makefile
+++ b/textproc/py-colour/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/04/05 23:20:58 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	colour-0.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/c/colour/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/colour/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/vaab/colour
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 9f6c5736c91..22d868c3af9 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:40 wiz Exp $
 
 VERS=		1.0.5
 DISTNAME=	python-creole-${VERS}
 PKGNAME=	${PYPKGPREFIX}-creole-${VERS}
 CATEGORIES=	textproc www python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/python-creole/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-creole/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/python-creole/
diff --git a/textproc/py-cssselect/Makefile b/textproc/py-cssselect/Makefile
index 1c3e37e4974..ea4f0ebdf3e 100644
--- a/textproc/py-cssselect/Makefile
+++ b/textproc/py-cssselect/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/04/11 17:58:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	cssselect-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/c/cssselect/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cssselect/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://packages.python.org/cssselect/
diff --git a/textproc/py-cssutils/Makefile b/textproc/py-cssutils/Makefile
index aa5b40cf69f..39037608eba 100644
--- a/textproc/py-cssutils/Makefile
+++ b/textproc/py-cssutils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/04/11 18:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	cssutils-1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/c/cssutils/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cssutils/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	rhialto@falu.nl
diff --git a/textproc/py-defusedxml/Makefile b/textproc/py-defusedxml/Makefile
index 97fc1f1fd40..7c48cdcdd1e 100644
--- a/textproc/py-defusedxml/Makefile
+++ b/textproc/py-defusedxml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 23:34:08 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	defusedxml-0.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/d/defusedxml/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/defusedxml/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/tiran/defusedxml
diff --git a/textproc/py-ejson/Makefile b/textproc/py-ejson/Makefile
index 799e5abaa0e..be850a98d95 100644
--- a/textproc/py-ejson/Makefile
+++ b/textproc/py-ejson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/02/17 00:20:28 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	ejson-0.1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/e/ejson/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/ejson/}
 DIST_SUBDIR=	${PKGBASE:S/${PYPKGPREFIX}/py/1}
 
 MAINTAINER=	rodent@NetBSD.org
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 97de5b769be..a24b38650b3 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2015/11/25 12:53:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	pyenchant-1.6.6
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pyenchant/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyenchant/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/pyenchant/
diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile
index f599f9b2d8a..eb96be724e8 100644
--- a/textproc/py-ftfy/Makefile
+++ b/textproc/py-ftfy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/02 22:36:59 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	ftfy-3.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/f/ftfy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/ftfy/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/LuminosoInsight/python-ftfy
diff --git a/textproc/py-generateDS/Makefile b/textproc/py-generateDS/Makefile
index 0082d3d2ff9..a43c01e19e2 100644
--- a/textproc/py-generateDS/Makefile
+++ b/textproc/py-generateDS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:42 wiz Exp $
 #
 
 DISTNAME=	generateDS-2.14a
@@ -6,7 +6,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 EGG_NAME=	generateDS-${PKGVERSION_NOREV}0
 CATEGORIES=	textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/g/generateDS/
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/generateDS/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.davekuhlman.org/generateDS.html
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 25fc81188d2..79d8aab786e 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2016/04/17 10:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=		html2text-2016.4.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc python
-MASTER_SITES=		http://pypi.python.org/packages/source/h/html2text/
+MASTER_SITES=		${MASTER_SITE_PYPI:=h/html2text/}
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		https://pypi.python.org/pypi/html2text/
diff --git a/textproc/py-jinja2/Makefile b/textproc/py-jinja2/Makefile
index a9cbf0d5483..d20ed9ac7b8 100644
--- a/textproc/py-jinja2/Makefile
+++ b/textproc/py-jinja2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2014/08/13 20:07:56 gls Exp $
+# $NetBSD: Makefile,v 1.18 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	Jinja2-2.7.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/J/Jinja2/
+MASTER_SITES=	${MASTER_SITE_PYPI:=J/Jinja2/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jinja.pocoo.org/
diff --git a/textproc/py-jsonlib/Makefile b/textproc/py-jsonlib/Makefile
index 8bfd1edd411..871161ec4a3 100644
--- a/textproc/py-jsonlib/Makefile
+++ b/textproc/py-jsonlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	jsonlib-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/j/jsonlib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/jsonlib/}
 
 MAINTAINER=	wenheping@gmail.com
 HOMEPAGE=	https://launchpad.net/jsonlib
diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile
index a86a8258ead..fab8bde3537 100644
--- a/textproc/py-jsonschema/Makefile
+++ b/textproc/py-jsonschema/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/12/13 10:37:26 markd Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	jsonschema-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	https://pypi.python.org/packages/source/j/jsonschema/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/jsonschema/}
 
 MAINTAINER=	bsiegert@NetBSD.org
 HOMEPAGE=	https://github.com/Julian/jsonschema
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 83474f5922a..44bfc2270b2 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/09/28 03:05:47 obache Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	markdown2-2.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/m/markdown2/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/markdown2/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/py-markupsafe/Makefile b/textproc/py-markupsafe/Makefile
index 4f6356dbc8d..17fefb0c7ed 100644
--- a/textproc/py-markupsafe/Makefile
+++ b/textproc/py-markupsafe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/05/14 08:45:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	MarkupSafe-0.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/M/MarkupSafe/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/MarkupSafe/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://www.pocoo.org/projects/markupsafe/
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 5f604c24ca6..121567cfe7a 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2015/12/11 19:23:57 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
 
 DISTNAME=	numpydoc-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	math python
-MASTER_SITES=	http://pypi.python.org/packages/source/n/numpydoc/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/numpydoc/}
 
 MAINTAINER=	jihbed.research@gmail.com
 HOMEPAGE=	https://pypi.python.org/pypi/numpydoc
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index ead5b3092f7..45657a016f2 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/10/25 22:19:45 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	openpyxl-2.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/o/openpyxl/
+MASTER_SITES=	${MASTER_SITE_PYPI:=o/openpyxl/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://openpyxl.readthedocs.org/
diff --git a/textproc/py-phonenumbers/Makefile b/textproc/py-phonenumbers/Makefile
index 335ce78c590..3361e2374b9 100644
--- a/textproc/py-phonenumbers/Makefile
+++ b/textproc/py-phonenumbers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/03/31 01:14:55 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	phonenumbers-7.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	comms textproc python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/phonenumbers/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/phonenumbers/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/daviddrysdale/python-phonenumbers
diff --git a/textproc/py-prettytable/Makefile b/textproc/py-prettytable/Makefile
index 61a9131dfb5..51b19fd61eb 100644
--- a/textproc/py-prettytable/Makefile
+++ b/textproc/py-prettytable/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2014/04/17 21:11:31 imil Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:40 wiz Exp $
 #
 
 DISTNAME=	prettytable-0.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://pypi.python.org/packages/source/P/PrettyTable/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PrettyTable/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/prettytable/
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index f9f26ba5e1d..1b01c637713 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2016/01/17 16:03:13 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	Pygments-2.0.2
 PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/P/Pygments/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pygments/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pygments.org/
diff --git a/textproc/py-pyquery/Makefile b/textproc/py-pyquery/Makefile
index a7956c179a8..4baafa09f32 100644
--- a/textproc/py-pyquery/Makefile
+++ b/textproc/py-pyquery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/07 17:09:09 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	pyquery-1.2.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/p/pyquery/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyquery/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	rodent@NetBSD.org
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index 9b7dcce697a..af093457467 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/19 22:03:29 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	rdflib-4.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/r/rdflib/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/rdflib/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	${MASTER_SITE_GITHUB:=RDFLib/rdflib/}
diff --git a/textproc/py-relatorio/Makefile b/textproc/py-relatorio/Makefile
index 9c9961f7d76..4697fbd2317 100644
--- a/textproc/py-relatorio/Makefile
+++ b/textproc/py-relatorio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/12/05 21:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	relatorio-0.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/r/relatorio/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/relatorio/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://relatorio.tryton.org/
diff --git a/textproc/py-sphinx-theme-cloud/Makefile b/textproc/py-sphinx-theme-cloud/Makefile
index abeca7c6865..dc2704003ab 100644
--- a/textproc/py-sphinx-theme-cloud/Makefile
+++ b/textproc/py-sphinx-theme-cloud/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2016/01/17 11:53:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	cloud_sptheme-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-sphinx-theme-cloud-${VERSION}
 VERSION=	1.7.1
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/c/cloud_sptheme/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cloud_sptheme/}
 
 MAINTAINER=	darcy@NetBSD.org
 HOMEPAGE=	http://packages.python.org/cloud_sptheme/
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 3d34ba06c08..8aaa4423da3 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2016/04/23 17:48:55 adam Exp $
+# $NetBSD: Makefile,v 1.31 2016/06/08 17:43:40 wiz Exp $
 
 DISTNAME=	Sphinx-1.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/S/Sphinx/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/Sphinx/}
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://sphinx.pocoo.org/
diff --git a/textproc/py-textile/Makefile b/textproc/py-textile/Makefile
index d284872d278..42c690f6f42 100644
--- a/textproc/py-textile/Makefile
+++ b/textproc/py-textile/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2012/10/25 06:56:52 asau Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:41 wiz Exp $
 #
 
 DISTNAME=		textile-2.1.5
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc python
-MASTER_SITES=		http://pypi.python.org/packages/source/t/textile/
+MASTER_SITES=		${MASTER_SITE_PYPI:=t/textile/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://github.com/chrisdrackett/python-textile/
diff --git a/textproc/py-tinycss/Makefile b/textproc/py-tinycss/Makefile
index 8eff36ab989..9c597f21cb4 100644
--- a/textproc/py-tinycss/Makefile
+++ b/textproc/py-tinycss/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/05/16 01:34:43 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	tinycss-0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/t/tinycss/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/tinycss/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://packages.python.org/tinycss/
diff --git a/textproc/py-validators/Makefile b/textproc/py-validators/Makefile
index db1488eacf0..91cadb96a05 100644
--- a/textproc/py-validators/Makefile
+++ b/textproc/py-validators/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/10/05 22:22:49 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	validators-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python textproc
-MASTER_SITES=	https://pypi.python.org/packages/source/v/validators/
+MASTER_SITES=	${MASTER_SITE_PYPI:=v/validators/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/validators
diff --git a/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile
index 75cc396c21e..c7b6c2f98ea 100644
--- a/textproc/py-xlrd/Makefile
+++ b/textproc/py-xlrd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/03/15 21:10:07 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	xlrd-0.9.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/x/xlrd/
+MASTER_SITES=	${MASTER_SITE_PYPI:=x/xlrd/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.lexicon.net/sjmachin/xlrd.htm
diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile
index 508cd762762..75d573d0871 100644
--- a/textproc/py-xlwt/Makefile
+++ b/textproc/py-xlwt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:41 wiz Exp $
 
 DISTNAME=	xlwt-0.7.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/x/xlwt/
+MASTER_SITES=	${MASTER_SITE_PYPI:=x/xlwt/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python-excel.org/
diff --git a/time/py-arrow/Makefile b/time/py-arrow/Makefile
index 4124584ce61..afb32239494 100644
--- a/time/py-arrow/Makefile
+++ b/time/py-arrow/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/06/14 14:12:57 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	arrow-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python time
-MASTER_SITES=	https://pypi.python.org/packages/source/a/arrow/
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/arrow/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://crsmithdev.com/arrow/
diff --git a/time/py-dateutil/Makefile b/time/py-dateutil/Makefile
index 18e4322e605..0783878ee1e 100644
--- a/time/py-dateutil/Makefile
+++ b/time/py-dateutil/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2015/01/11 21:05:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:42 wiz Exp $
 
 DISTNAME=	python-dateutil-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
 CATEGORIES=	time python
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-dateutil/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-dateutil/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://dateutil.readhedocs.org/
diff --git a/time/py-icalendar/Makefile b/time/py-icalendar/Makefile
index 9dccb222432..b01a58151bf 100644
--- a/time/py-icalendar/Makefile
+++ b/time/py-icalendar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2014/08/31 21:35:11 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	icalendar-3.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	time python
-MASTER_SITES=	http://pypi.python.org/packages/source/i/icalendar/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/icalendar/}
 
 MAINTAINER=	mj@turner.org.za
 HOMEPAGE=	http://icalendar.readthedocs.org/en/latest/
diff --git a/time/py-isodate/Makefile b/time/py-isodate/Makefile
index 9595a65302f..5a949903adb 100644
--- a/time/py-isodate/Makefile
+++ b/time/py-isodate/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/19 21:27:58 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	isodate-0.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python time
-MASTER_SITES=	https://pypi.python.org/packages/source/i/isodate/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/isodate/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	http://cheeseshop.python.org/pypi/isodate
diff --git a/time/py-jdcal/Makefile b/time/py-jdcal/Makefile
index 86b56b10b87..ce506d6d060 100644
--- a/time/py-jdcal/Makefile
+++ b/time/py-jdcal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/10/25 22:31:15 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	jdcal-1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	time
-MASTER_SITES=	https://pypi.python.org/packages/source/j/jdcal/
+MASTER_SITES=	${MASTER_SITE_PYPI:=j/jdcal/}
 
 MAINTAINER=	cheusov@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/jdcal
diff --git a/time/py-pytz/Makefile b/time/py-pytz/Makefile
index 5ee741fd2f4..546e2f461ee 100644
--- a/time/py-pytz/Makefile
+++ b/time/py-pytz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2014/12/01 11:27:09 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	pytz-2014.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	time python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pytz/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pytz/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
diff --git a/time/py-tzlocal/Makefile b/time/py-tzlocal/Makefile
index db5708f5c1d..b7d7fcf521b 100644
--- a/time/py-tzlocal/Makefile
+++ b/time/py-tzlocal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/02/04 11:41:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	tzlocal-1.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	time python
-MASTER_SITES=	http://pypi.python.org/packages/source/t/tzlocal/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/tzlocal/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/py-FormEncode/Makefile b/www/py-FormEncode/Makefile
index 528eb566755..0c885c18168 100644
--- a/www/py-FormEncode/Makefile
+++ b/www/py-FormEncode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/07/15 18:30:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	FormEncode-1.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	https://pypi.python.org/packages/source/F/FormEncode/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/FormEncode/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/py-PasteDeploy/Makefile b/www/py-PasteDeploy/Makefile
index ccb632420ce..8368a27e698 100644
--- a/www/py-PasteDeploy/Makefile
+++ b/www/py-PasteDeploy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/07/16 11:38:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	PasteDeploy-1.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/P/PasteDeploy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PasteDeploy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pythonpaste.org/
diff --git a/www/py-PasteScript/Makefile b/www/py-PasteScript/Makefile
index 682aa401881..a1c4bd675b6 100644
--- a/www/py-PasteScript/Makefile
+++ b/www/py-PasteScript/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/07/16 11:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	PasteScript-2.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/P/PasteScript/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PasteScript/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pythonpaste.org/script/
diff --git a/www/py-Routes/Makefile b/www/py-Routes/Makefile
index 79ae71cd9f6..f49aa33160f 100644
--- a/www/py-Routes/Makefile
+++ b/www/py-Routes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/08/06 08:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	Routes-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	https://pypi.python.org/packages/source/R/Routes/
+MASTER_SITES=	${MASTER_SITE_PYPI:=R/Routes/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/Routes
diff --git a/www/py-URLObject/Makefile b/www/py-URLObject/Makefile
index 6c1d8c8dfec..6a16029d98a 100644
--- a/www/py-URLObject/Makefile
+++ b/www/py-URLObject/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/07/15 18:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	URLObject-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	https://pypi.python.org/packages/source/U/URLObject/
+MASTER_SITES=	${MASTER_SITE_PYPI:=U/URLObject/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://github.com/zacharyvoase/urlobject
diff --git a/www/py-WebOb/Makefile b/www/py-WebOb/Makefile
index b101c1cea0c..9a9332a2e7e 100644
--- a/www/py-WebOb/Makefile
+++ b/www/py-WebOb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/08/20 13:23:51 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	WebOb-1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/W/WebOb/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WebOb/}
 
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	https://pypi.python.org/pypi/WebOb
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index dcc31b015e3..a99fed6deb6 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/01/19 18:51:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	bleach-1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/b/bleach/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/bleach/}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/bleach
diff --git a/www/py-bottle/Makefile b/www/py-bottle/Makefile
index 515f48a5b5c..6b84e96861c 100644
--- a/www/py-bottle/Makefile
+++ b/www/py-bottle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/09/06 14:47:27 wen Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:44 wiz Exp $
 #
 
 DISTNAME=	bottle-0.12.7
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/b/bottle/
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/bottle/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bottlepy.org/docs/stable/
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 004db2ab6ae..8de8ea6498e 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2015/08/01 08:17:43 adam Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	CherryPy-3.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/C/CherryPy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=C/CherryPy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cherrypy.org/
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index f30003a9821..4dd864acfb2 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:26:05 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	django-appmedia-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-appmedia/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-appmedia/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/django-appmedia
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index aaf266997ab..7d35a1dc2de 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2016/03/06 14:18:52 adam Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	django-classy-tags-0.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-classy-tags/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-classy-tags/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://github.com/ojii/django-classy-tags/
diff --git a/www/py-django-cmsplugin_gallery/Makefile b/www/py-django-cmsplugin_gallery/Makefile
index 940446207c4..22b05c14f8e 100644
--- a/www/py-django-cmsplugin_gallery/Makefile
+++ b/www/py-django-cmsplugin_gallery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/05 21:26:05 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	cmsplugin_gallery-0.5.5
 PKGNAME=	${PYPKGPREFIX}-django-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/c/cmsplugin_gallery/
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cmsplugin_gallery/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://github.com/centralniak/cmsplugin_gallery
diff --git a/www/py-django-easy-thumbnails/Makefile b/www/py-django-easy-thumbnails/Makefile
index 636ef79c606..a4ced6d9fc8 100644
--- a/www/py-django-easy-thumbnails/Makefile
+++ b/www/py-django-easy-thumbnails/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2016/04/20 17:58:36 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	easy-thumbnails-2.3
 PKGNAME=	${PYPKGPREFIX}-django-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/e/easy-thumbnails/
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/easy-thumbnails/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/SmileyChris/easy-thumbnails/
diff --git a/www/py-django-inline-ordering/Makefile b/www/py-django-inline-ordering/Makefile
index ddd730c9d4d..414e0cdf0e6 100644
--- a/www/py-django-inline-ordering/Makefile
+++ b/www/py-django-inline-ordering/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:44 wiz Exp $
 
 DISTNAME=	django-inline-ordering-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-inline-ordering/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-inline-ordering/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/centralniak/django-inline-ordering
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index 0c18b9df4fb..5ae3b541fff 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2016/03/14 19:04:52 adam Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	django-mptt-0.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-mptt/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-mptt/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://github.com/django-mptt/django-mptt
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 69d88becae9..6bde7274492 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:26:05 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	django-photologue-2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-photologue/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-photologue/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/py-django-polymorphic/Makefile b/www/py-django-polymorphic/Makefile
index 2cc22b5b158..0b9add92a07 100644
--- a/www/py-django-polymorphic/Makefile
+++ b/www/py-django-polymorphic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/04/20 20:01:14 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	django_polymorphic-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django_polymorphic/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django_polymorphic/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/chrisglass/django_polymorphic/
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index 394c577f28e..973fd164ad3 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2016/04/20 17:33:57 adam Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	django-reversion-1.10.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-reversion/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-reversion/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/etianen/django-reversion/
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index e26caaf2883..60b8c1b328b 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/03/06 14:24:18 adam Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	django-sekizai-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-sekizai/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-sekizai/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/ojii/django-sekizai
diff --git a/www/py-django-south/Makefile b/www/py-django-south/Makefile
index 5253728e351..e03b321e1d9 100644
--- a/www/py-django-south/Makefile
+++ b/www/py-django-south/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	South-1.0.1
 PKGNAME=	${PYPKGPREFIX}-django-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/S/South/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/South/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://south.aeracode.org/
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index 96747830770..58496ef8d7e 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/04/13 23:12:43 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	django-tastypie-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/d/django-tastypie/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-tastypie/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/toastdriven/django-tastypie/
diff --git a/www/py-django-treebeard/Makefile b/www/py-django-treebeard/Makefile
index 000269a6c1b..7b99f384516 100644
--- a/www/py-django-treebeard/Makefile
+++ b/www/py-django-treebeard/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2016/04/20 20:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	django-treebeard-4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/django-treebeard/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-treebeard/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://tabo.pe/projects/django-treebeard/
diff --git a/www/py-djangocms-file/Makefile b/www/py-djangocms-file/Makefile
index 266d4e62ca8..c45f34148f2 100644
--- a/www/py-djangocms-file/Makefile
+++ b/www/py-djangocms-file/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:28:53 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	djangocms-file-1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-file/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-file/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-file/
diff --git a/www/py-djangocms-flash/Makefile b/www/py-djangocms-flash/Makefile
index 51ccf830e74..8a03efb75fd 100644
--- a/www/py-djangocms-flash/Makefile
+++ b/www/py-djangocms-flash/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:30:24 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	djangocms-flash-0.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-flash/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-flash/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-flash/
diff --git a/www/py-djangocms-googlemap/Makefile b/www/py-djangocms-googlemap/Makefile
index 7eac40b5d82..a3a2b829b12 100644
--- a/www/py-djangocms-googlemap/Makefile
+++ b/www/py-djangocms-googlemap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:31:58 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-googlemap-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-googlemap/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-googlemap/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-googlemap/
diff --git a/www/py-djangocms-inherit/Makefile b/www/py-djangocms-inherit/Makefile
index 5ecac623bb5..fa8e4e3f084 100644
--- a/www/py-djangocms-inherit/Makefile
+++ b/www/py-djangocms-inherit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:33:23 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-inherit-0.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-inherit/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-inherit/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-inherit/
diff --git a/www/py-djangocms-picture/Makefile b/www/py-djangocms-picture/Makefile
index 3841a7588d8..429d385a4bb 100644
--- a/www/py-djangocms-picture/Makefile
+++ b/www/py-djangocms-picture/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2016/03/25 21:04:04 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-picture-0.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-picture/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-picture/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-picture/
diff --git a/www/py-djangocms-style/Makefile b/www/py-djangocms-style/Makefile
index ad5577370cf..a36ec16230a 100644
--- a/www/py-djangocms-style/Makefile
+++ b/www/py-djangocms-style/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2016/03/25 21:04:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-style-1.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-style/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-style/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-style/
diff --git a/www/py-djangocms-teaser/Makefile b/www/py-djangocms-teaser/Makefile
index cec140f1107..5b3e066b759 100644
--- a/www/py-djangocms-teaser/Makefile
+++ b/www/py-djangocms-teaser/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:37:43 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-teaser-0.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-teaser/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-teaser/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-teaser/
diff --git a/www/py-djangocms-video/Makefile b/www/py-djangocms-video/Makefile
index e45d27d7271..bcd89910975 100644
--- a/www/py-djangocms-video/Makefile
+++ b/www/py-djangocms-video/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/06 14:41:04 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	djangocms-video-1.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangocms-video/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangocms-video/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	https://github.com/divio/djangocms-video/
diff --git a/www/py-djangorestframework/Makefile b/www/py-djangorestframework/Makefile
index e8a968c390a..f70fadafc50 100644
--- a/www/py-djangorestframework/Makefile
+++ b/www/py-djangorestframework/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:26:05 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	djangorestframework-0.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/d/djangorestframework/
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/djangorestframework/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://django-rest-framework.org/
diff --git a/www/py-flask-assets/Makefile b/www/py-flask-assets/Makefile
index 1bb20d70fee..04792a51837 100644
--- a/www/py-flask-assets/Makefile
+++ b/www/py-flask-assets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/08/25 16:01:46 kleink Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Flask-Assets-0.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Assets/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Assets/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://github.com/miracle2k/flask-assets
diff --git a/www/py-flask-babel/Makefile b/www/py-flask-babel/Makefile
index 690c6cfba45..e40e8af9b9d 100644
--- a/www/py-flask-babel/Makefile
+++ b/www/py-flask-babel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-Babel-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-Babel/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Babel/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/mitsuhiko/flask-babel
diff --git a/www/py-flask-babelex/Makefile b/www/py-flask-babelex/Makefile
index 0c56d508a05..8ce69a49c34 100644
--- a/www/py-flask-babelex/Makefile
+++ b/www/py-flask-babelex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2016/02/10 10:20:10 kleink Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Flask-BabelEx-0.9.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-BabelEx/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-BabelEx/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://github.com/mrjoes/flask-babelex/
diff --git a/www/py-flask-bootstrap/Makefile b/www/py-flask-bootstrap/Makefile
index 15295ee7a31..5d7b3a8f6f9 100644
--- a/www/py-flask-bootstrap/Makefile
+++ b/www/py-flask-bootstrap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/04/02 22:53:02 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-Bootstrap-3.3.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-Bootstrap/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Bootstrap/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/mbr/flask-bootstrap
diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile
index 15bcb8241d5..6489df6636f 100644
--- a/www/py-flask-cache/Makefile
+++ b/www/py-flask-cache/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	Flask-Cache-0.13.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Cache/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Cache/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://packages.python.org/Flask-Cache/
diff --git a/www/py-flask-debugtoolbar/Makefile b/www/py-flask-debugtoolbar/Makefile
index 50755aaf80a..af39cc0e002 100644
--- a/www/py-flask-debugtoolbar/Makefile
+++ b/www/py-flask-debugtoolbar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/04/02 22:44:35 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-DebugToolbar-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-DebugToolbar/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-DebugToolbar/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://flask-debugtoolbar.rtfd.org/
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index 1a2d5f2bcd3..e02f986bc8d 100644
--- a/www/py-flask-flatpages/Makefile
+++ b/www/py-flask-flatpages/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/03/02 13:37:17 kleink Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Flask-FlatPages-0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-FlatPages/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-FlatPages/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://github.com/SimonSapin/Flask-FlatPages
diff --git a/www/py-flask-frozen/Makefile b/www/py-flask-frozen/Makefile
index ef185d0188a..d20fecc63e5 100644
--- a/www/py-flask-frozen/Makefile
+++ b/www/py-flask-frozen/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/01/08 17:45:31 kleink Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Frozen-Flask-0.12
 PKGNAME=	${PYPKGPREFIX}-flask-frozen-0.12
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Frozen-Flask/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Frozen-Flask/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/Frozen-Flask/
diff --git a/www/py-flask-limiter/Makefile b/www/py-flask-limiter/Makefile
index dc926ec1029..86cc2a36aa3 100644
--- a/www/py-flask-limiter/Makefile
+++ b/www/py-flask-limiter/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2015/04/05 23:23:13 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:49 wiz Exp $
 #
 
 DISTNAME=	Flask-Limiter-0.7.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-Limiter/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Limiter/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://flask-limiter.readthedocs.org/
diff --git a/www/py-flask-mail/Makefile b/www/py-flask-mail/Makefile
index 010afb2d1a8..b949de0ed58 100644
--- a/www/py-flask-mail/Makefile
+++ b/www/py-flask-mail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Flask-Mail-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Mail/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Mail/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/Flask-Mail/
diff --git a/www/py-flask-principal/Makefile b/www/py-flask-principal/Makefile
index 3c507621de5..995aad06e0b 100644
--- a/www/py-flask-principal/Makefile
+++ b/www/py-flask-principal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Flask-Principal-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Principal/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Principal/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/Flask-Principal/
diff --git a/www/py-flask-rest/Makefile b/www/py-flask-rest/Makefile
index 2000e29a81b..e04a4d9c9a3 100644
--- a/www/py-flask-rest/Makefile
+++ b/www/py-flask-rest/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Flask-REST-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-REST/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-REST/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://github.com/ametaireau/flask-rest/
diff --git a/www/py-flask-script/Makefile b/www/py-flask-script/Makefile
index 2faeff37d94..f1d324048c7 100644
--- a/www/py-flask-script/Makefile
+++ b/www/py-flask-script/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/12/31 13:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Flask-Script-2.0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Script/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Script/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://flask-script.readthedocs.org/en/latest/
diff --git a/www/py-flask-security/Makefile b/www/py-flask-security/Makefile
index b092006b84e..3c48f5adb7f 100644
--- a/www/py-flask-security/Makefile
+++ b/www/py-flask-security/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/01/08 17:52:33 kleink Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-Security-1.7.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Security/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Security/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://pythonhosted.org/Flask-Security/
diff --git a/www/py-flask-sqlalchemy/Makefile b/www/py-flask-sqlalchemy/Makefile
index 8982728d19d..66bc2f0ac29 100644
--- a/www/py-flask-sqlalchemy/Makefile
+++ b/www/py-flask-sqlalchemy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/10/26 18:48:55 kleink Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Flask-SQLAlchemy-2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-SQLAlchemy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-SQLAlchemy/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://github.com/mitsuhiko/flask-sqlalchemy
diff --git a/www/py-flask-sslify/Makefile b/www/py-flask-sslify/Makefile
index 51e574fde06..a16844f5684 100644
--- a/www/py-flask-sslify/Makefile
+++ b/www/py-flask-sslify/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-SSLify-0.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python security www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-SSLify/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-SSLify/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kennethreitz/flask-sslify
diff --git a/www/py-flask-testing/Makefile b/www/py-flask-testing/Makefile
index 330c6658cac..d0a3871994f 100644
--- a/www/py-flask-testing/Makefile
+++ b/www/py-flask-testing/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2016/05/21 05:40:20 richard Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-Testing-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-Testing/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Testing/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/jarus/flask-testing
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index 4b2528d27e9..43175d8d3e5 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2016/06/01 21:10:39 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:45 wiz Exp $
 
 DISTNAME=	Flask-Uploads-0.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 PKGREVISION=	1
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Uploads/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Uploads/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	https://pythonhosted.org/Flask-Uploads/
diff --git a/www/py-flask-user/Makefile b/www/py-flask-user/Makefile
index 210f876eca6..40f3373df36 100644
--- a/www/py-flask-user/Makefile
+++ b/www/py-flask-user/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2015/04/19 00:50:42 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Flask-User-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	3
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-User/
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-User/}
 DIST_SUBDIR=	${PKGBASE:tl:S/${PYPKGPREFIX}/py/1}
 
 MAINTAINER=	rodent@NetBSD.org
diff --git a/www/py-furl/Makefile b/www/py-furl/Makefile
index 24ee3ffe67a..f30562fbf13 100644
--- a/www/py-furl/Makefile
+++ b/www/py-furl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/03/03 19:42:30 shattered Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	furl-0.4.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/f/furl/
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/furl/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/gruns/furl
diff --git a/www/py-google-api-python-client-py3/Makefile b/www/py-google-api-python-client-py3/Makefile
index c34724bf19a..ffdc74fc9b6 100644
--- a/www/py-google-api-python-client-py3/Makefile
+++ b/www/py-google-api-python-client-py3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/04/13 23:12:43 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	google-api-python-client-py3-1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-py3//}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/g/google-api-python-client-py3/
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/google-api-python-client-py3/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/google-api-python-client/
diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile
index 45eedff0209..a420b6f65fa 100644
--- a/www/py-gunicorn/Makefile
+++ b/www/py-gunicorn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/08/28 15:18:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	gunicorn-19.3.0
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	https://pypi.python.org/packages/source/g/gunicorn/
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/gunicorn/}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 
 MAINTAINER=	gls@NetBSD.org
diff --git a/www/py-http-parser/Makefile b/www/py-http-parser/Makefile
index 95a6397be10..232aa5f4d0b 100644
--- a/www/py-http-parser/Makefile
+++ b/www/py-http-parser/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	http-parser-0.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	https://pypi.python.org/packages/source/h/http-parser/
+MASTER_SITES=	${MASTER_SITE_PYPI:=h/http-parser/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://github.com/benoitc/http-parser
diff --git a/www/py-idna/Makefile b/www/py-idna/Makefile
index 1e7c9ffc320..8dfe0fadf4a 100644
--- a/www/py-idna/Makefile
+++ b/www/py-idna/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/04/08 15:23:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	idna-2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	https://pypi.python.org/packages/source/i/idna/
+MASTER_SITES=	${MASTER_SITE_PYPI:=i/idna/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/idna
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index 13fb8c9ccb7..0f6eb239756 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/12/05 21:26:06 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	mechanize-0.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mechanize/ \
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mechanize/ \}
 		http://wwwsearch.sourceforge.net/mechanize/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/py-mezzanine/Makefile b/www/py-mezzanine/Makefile
index eed3abd1fa8..74e091d40b7 100644
--- a/www/py-mezzanine/Makefile
+++ b/www/py-mezzanine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2016/03/20 22:11:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Mezzanine-1.2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/M/Mezzanine/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/Mezzanine/}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://mezzanine.jupo.org/
diff --git a/www/py-mod_wsgi-metrics/Makefile b/www/py-mod_wsgi-metrics/Makefile
index 5908aac3a56..6a8bfb5d935 100644
--- a/www/py-mod_wsgi-metrics/Makefile
+++ b/www/py-mod_wsgi-metrics/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/01/25 12:00:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	mod_wsgi-metrics-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mod_wsgi-metrics/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mod_wsgi-metrics/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://code.google.com/p/modwsgi/
diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile
index 6e4135719a8..4a727b91c73 100644
--- a/www/py-mod_wsgi/Makefile
+++ b/www/py-mod_wsgi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/06/10 10:37:06 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	mod_wsgi-4.4.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/m/mod_wsgi/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mod_wsgi/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://code.google.com/p/modwsgi/
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index a3642fae345..eca165079d0 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/07/16 11:36:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	Paste-2.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/P/Paste/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/Paste/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pythonpaste.org/
diff --git a/www/py-pendrell/Makefile b/www/py-pendrell/Makefile
index 30d0016c643..930c87f5ef3 100644
--- a/www/py-pendrell/Makefile
+++ b/www/py-pendrell/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:26:06 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	pendrell-0.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel www python
-MASTER_SITES=	http://pypi.python.org/packages/source/p/pendrell/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pendrell/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pendrell.olix0r.net/
diff --git a/www/py-python-digest/Makefile b/www/py-python-digest/Makefile
index 63d01f9b31e..ee404c2546a 100644
--- a/www/py-python-digest/Makefile
+++ b/www/py-python-digest/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/12/05 21:26:06 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	python-digest-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-digest/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-digest/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/akoha/python-digest/
diff --git a/www/py-python-mimeparse/Makefile b/www/py-python-mimeparse/Makefile
index 2be7e5539c0..5c9f9185b0d 100644
--- a/www/py-python-mimeparse/Makefile
+++ b/www/py-python-mimeparse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	python-mimeparse-0.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python-mimeparse/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-mimeparse/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/dbtsai/python-mimeparse
diff --git a/www/py-python3-digest/Makefile b/www/py-python3-digest/Makefile
index 8ea93aaf7aa..4d33d05501b 100644
--- a/www/py-python3-digest/Makefile
+++ b/www/py-python3-digest/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2015/12/10 02:57:34 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	python3-digest-1.8b4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python3/python/}
 PKGREVISION=	1
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/p/python3-digest/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python3-digest/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/akoha/python-digest/
diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile
index 56f007384ea..263c23d2eb8 100644
--- a/www/py-recaptcha/Makefile
+++ b/www/py-recaptcha/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/12/16 06:03:39 darcy Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	recaptcha-client-1.0.6
 PKGNAME=	${PYPKGPREFIX}-recaptcha-1.0.6
 CATEGORIES=	www devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/r/recaptcha-client/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/recaptcha-client/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cheeseshop.python.org/pypi/recaptcha-client
diff --git a/www/py-sparqlwrapper/Makefile b/www/py-sparqlwrapper/Makefile
index b012d3863d1..c89a4f8ad67 100644
--- a/www/py-sparqlwrapper/Makefile
+++ b/www/py-sparqlwrapper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/04/19 22:20:48 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:49 wiz Exp $
 
 DISTNAME=	SPARQLWrapper-1.6.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/S/SPARQLWrapper/
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/SPARQLWrapper/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rdflib.github.io/sparqlwrapper/
diff --git a/www/py-static/Makefile b/www/py-static/Makefile
index 09038f3948b..2103bd42db8 100644
--- a/www/py-static/Makefile
+++ b/www/py-static/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/08/20 13:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	static-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	https://pypi.python.org/packages/source/s/static/
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/static/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/static
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index b7545200ac0..aabec56291f 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2015/12/23 12:43:50 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	tornado-4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/t/tornado/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/tornado/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://www.tornadoweb.org/
diff --git a/www/py-twill/Makefile b/www/py-twill/Makefile
index 1f7a01a81e1..4e254183029 100644
--- a/www/py-twill/Makefile
+++ b/www/py-twill/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:26:06 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	twill-1.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/t/twill/
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/twill/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://twill.idyll.org/
diff --git a/www/py-uliweb/Makefile b/www/py-uliweb/Makefile
index 1e20c2e60c2..9859fc1dac5 100644
--- a/www/py-uliweb/Makefile
+++ b/www/py-uliweb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2016/03/04 13:54:25 wen Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	Uliweb-0.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/U/u/}
 CATEGORIES=	www
-MASTER_SITES=	http://pypi.python.org/packages/source/U/Uliweb/
+MASTER_SITES=	${MASTER_SITE_PYPI:=U/Uliweb/}
 
 MAINTAINER=	wen@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/Uliweb/
diff --git a/www/py-uwsgitop/Makefile b/www/py-uwsgitop/Makefile
index 9a82dcf442a..96f65453eb8 100644
--- a/www/py-uwsgitop/Makefile
+++ b/www/py-uwsgitop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/05/03 19:07:55 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	uwsgitop-0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/u/uwsgitop/
+MASTER_SITES=	${MASTER_SITE_PYPI:=u/uwsgitop/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://projects.unbit.it/uwsgi/wiki/StatsServer
diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile
index 4bbc5451b8f..17d762bca8e 100644
--- a/www/py-waitress/Makefile
+++ b/www/py-waitress/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/07/15 18:23:55 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
 
 DISTNAME=	waitress-0.8.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	https://pypi.python.org/packages/source/w/waitress/
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/waitress/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/Pylons/waitress
diff --git a/www/py-webassets/Makefile b/www/py-webassets/Makefile
index 7a747e84a5e..699383d68d3 100644
--- a/www/py-webassets/Makefile
+++ b/www/py-webassets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/08/31 09:31:34 kleink Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	webassets-0.11.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/w/webassets/
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/webassets/}
 
 MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://elsdoerfer.name/docs/webassets/
diff --git a/www/py-wtforms-alchemy/Makefile b/www/py-wtforms-alchemy/Makefile
index 041df606a2e..bd5b0fec585 100644
--- a/www/py-wtforms-alchemy/Makefile
+++ b/www/py-wtforms-alchemy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/04/14 11:25:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	WTForms-Alchemy-0.13.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	databases python www
-MASTER_SITES=	https://pypi.python.org/packages/source/W/WTForms-Alchemy/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WTForms-Alchemy/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/wtforms-alchemy
diff --git a/www/py-wtforms-components/Makefile b/www/py-wtforms-components/Makefile
index 4226b7745ac..bed366f4ae0 100644
--- a/www/py-wtforms-components/Makefile
+++ b/www/py-wtforms-components/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/04/02 23:10:28 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	WTForms-Components-0.9.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/W/WTForms-Components/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WTForms-Components/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/wtforms-components
diff --git a/www/py-wtforms-recaptcha/Makefile b/www/py-wtforms-recaptcha/Makefile
index d6214a20f10..eeed63b5c63 100644
--- a/www/py-wtforms-recaptcha/Makefile
+++ b/www/py-wtforms-recaptcha/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:47 wiz Exp $
 
 DISTNAME=	wtforms-recaptcha-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/w/wtforms-recaptcha/
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/wtforms-recaptcha/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://bitbucket.org/excieve/wtforms-recaptcha
diff --git a/www/py-wtforms-test/Makefile b/www/py-wtforms-test/Makefile
index 6e9d61b6430..ded62990be6 100644
--- a/www/py-wtforms-test/Makefile
+++ b/www/py-wtforms-test/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:48 wiz Exp $
 
 DISTNAME=	WTForms-Test-0.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	python www
-MASTER_SITES=	https://pypi.python.org/packages/source/W/WTForms-Test/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WTForms-Test/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/kvesteri/wtforms-test
diff --git a/www/py-wtforms/Makefile b/www/py-wtforms/Makefile
index 728baaa7d4d..e6072b728ca 100644
--- a/www/py-wtforms/Makefile
+++ b/www/py-wtforms/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2016/01/08 16:56:23 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:46 wiz Exp $
 
 DISTNAME=	WTForms-2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
-MASTER_SITES=	http://pypi.python.org/packages/source/W/WTForms/
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/WTForms/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kleink@NetBSD.org
author	wiz <wiz@pkgsrc.org>	2016-06-08 17:43:20 +0000
committer	wiz <wiz@pkgsrc.org>	2016-06-08 17:43:20 +0000
commit	66657f0945bd10aea95bf8000afc916d947cfbd8 (patch)
tree	b5b84bf5c7f997fcce4ec3a54792f163b6b658ca
parent	2f71cec74f81aa2a3128422a53bff191d1531360 (diff)
download	pkgsrc-66657f0945bd10aea95bf8000afc916d947cfbd8.tar.gz