Attachment 181404 Details for Bug 217044 – USES=wheel, remove py33 slaves, add slave ports for setuptools dependencies, update setuptools to 34.3.3

[patch] USES=wheel, remove py33 slaves, add slave ports for setuptools dependencies, update setuptools to 34.3.3

set.diff (text/plain), 157.75 KB, created by Antoine Brodin on 2017-04-02 17:33:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2017-04-02 17:33:07 UTC

Size: 157.75 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 437570)
>+++ MOVED	(working copy)
>@@ -9199,3 +9199,11 @@
> x11-toolkits/gal2||2017-04-02|Obsolete and not depend on anymore
> x11-toolkits/gal2-reference||2017-04-02|Obsolete and not depend on anymore
> x11-toolkits/vte290|x11-toolkits/vte3|2017-04-02|Obsolete and not depend on anymore
>+devel/py-appdirs|devel/py27-appdirs|2017-0X-XX|Renamed
>+devel/py-pyparsing|devel/py27-pyparsing|2017-0X-XX|Renamed
>+devel/py-six|devel/py27-six|2017-0X-XX|Renamed
>+devel/py3-six|devel/py35-six|2017-0X-XX|Renamed
>+databases/py33-gdbm|databases/py35-gdbm|2017-0X-XX|Old python release without ensurepip
>+databases/py33-sqlite3|databases/py35-sqlite3|2017-0X-XX|Old python release without ensurepip
>+devel/py33-setuptools|devel/py35-setuptools|2017-0X-XX|Old python release without ensurepip
>+x11-toolkits/py33-tkinter|x11-toolkits/py35-tkinter|2017-0X-XX|Old python release without ensurepip
>Index: Mk/Scripts/stage-wheel.py
>===================================================================
>--- Mk/Scripts/stage-wheel.py	(nonexistent)
>+++ Mk/Scripts/stage-wheel.py	(working copy)
>@@ -0,0 +1,53 @@
>+# $FreeBSD$
>+# Stages a python wheel using pip bundled in python
>+# Contains a few lines from python's ensurepip bootstrap function,
>+# licensed under the PSFL
>+
>+import argparse
>+import ensurepip
>+import os
>+import pkgutil
>+import shutil
>+import sys
>+import tempfile
>+
>+parser = argparse.ArgumentParser()
>+parser.add_argument("--prefix", required=True)
>+parser.add_argument("--stagedir", required=True)
>+parser.add_argument("wheel", nargs="+")
>+args = parser.parse_args()
>+
>+ensurepip._disable_pip_configuration_settings()
>+os.environ["ENSUREPIP_OPTIONS"] = "altinstall"
>+tmpdir = tempfile.mkdtemp()
>+error = 0
>+try:
>+    # Put python bundled wheels into a temporary directory and construct the
>+    # additional paths that need added to sys.path
>+    additional_paths = []
>+    for project, version in ensurepip._PROJECTS:
>+        wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
>+        whl = pkgutil.get_data(
>+            "ensurepip",
>+            "_bundled/{}".format(wheel_name),
>+        )
>+        with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
>+            fp.write(whl)
>+        additional_paths.append(os.path.join(tmpdir, wheel_name))
>+    additional_paths.append("/usr/local/lib/python2.7/site-packages")
>+
>+    # Construct the arguments to be passed to the pip command
>+    pip_args = ["install"]
>+    pip_args += ["--ignore-installed"]
>+    pip_args += ["--no-cache-dir", "--no-compile", "--no-deps", "--no-index"]
>+    pip_args += ["--prefix", args.prefix]
>+    pip_args += ["--root", args.stagedir]
>+    pip_args += args.wheel
>+
>+    sys.path = additional_paths + sys.path
>+    import pip
>+    error = pip.main(pip_args)
>+finally:
>+    shutil.rmtree(tmpdir, ignore_errors=True)
>+    if error:
>+        sys.exit(error)
>Index: Mk/Uses/python.mk
>===================================================================
>--- Mk/Uses/python.mk	(revision 437570)
>+++ Mk/Uses/python.mk	(working copy)
>@@ -228,7 +228,7 @@
> # What Python version and what Python interpreters are currently supported?
> # When adding a version, please keep the comment in
> # Mk/bsd.default-versions.mk in sync.
>-_PYTHON_VERSIONS=		2.7 3.6 3.5 3.4 3.3	# preferred first
>+_PYTHON_VERSIONS=		2.7 3.6 3.5 3.4	# preferred first
> _PYTHON_PORTBRANCH=		2.7		# ${_PYTHON_VERSIONS:[1]}
> _PYTHON_BASECMD=		${LOCALBASE}/bin/python
> _PYTHON_RELPORTDIR=		lang/python
>Index: Mk/Uses/wheel.mk
>===================================================================
>--- Mk/Uses/wheel.mk	(nonexistent)
>+++ Mk/Uses/wheel.mk	(working copy)
>@@ -0,0 +1,46 @@
>+# $FreeBSD$
>+#
>+# Handle installation of pure python wheel(s) with pip bundled in python
>+#
>+# Feature:	wheel
>+# Usage:	USES=	python[:args] wheel[:args]
>+# Valid args:	noautoplist	Don't generate the plist automatically
>+#
>+# MAINTAINER:	python@FreeBSD.org
>+
>+.if !defined(_INCLUDE_USES_WHEEL_MK)
>+
>+_INCLUDE_USES_WHEEL_MK=	yes
>+
>+.if ${wheel_ARGS:Nnoautoplist}
>+IGNORE=		Incorrect 'USES+=wheel:${wheel_ARGS}'
>+.endif
>+
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+# TODO: figure out how to download wheels without cryptic url
>+EXTRACT_SUFX=	-py2.py3-none-any.whl
>+DIST_SUBDIR=	python
>+EXTRACT_ONLY=	#
>+
>+NO_ARCH=	yes
>+NO_BUILD=	yes
>+
>+_USES_POST+=	wheel
>+.endif
>+
>+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_WHEEL_POST_MK)
>+_INCLUDE_USES_WHEEL_POST_MK=yes
>+
>+do-install:
>+	${PYTHON_CMD} ${SCRIPTSDIR}/stage-wheel.py --prefix ${PREFIX} --stagedir ${STAGEDIR} ${_DISTFILES:S,^,${_DISTDIR}/,}
>+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>+	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>+
>+.if ! ${wheel_ARGS:Mnoautoplist}
>+_USES_install+=	820:wheel-autoplist
>+wheel-autoplist:
>+	${FIND} -s ${STAGEDIR} ! -type d | ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>+.endif
>+
>+.endif
>+
>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 437570)
>+++ Mk/bsd.default-versions.mk	(working copy)
>@@ -75,7 +75,7 @@
> PGSQL_DEFAULT?=		9.3
> # Possible values: 5.6, 7.0, 7.1
> PHP_DEFAULT?=		5.6
>-# Possible values: 2.7, 3.3, 3.4, 3.5, 3.6
>+# Possible values: 2.7, 3.4, 3.5, 3.6
> PYTHON_DEFAULT?=	2.7
> # Possible values: 2.7
> PYTHON2_DEFAULT?=	2.7
>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 437570)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,19 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+2017XXXX:
>+  AFFECTS: users of devel/py-appdirs, devel/py-pyparsing, devel/py-six, devel/py3-six
>+  AUTHOR: antoine@FreeBSD.org
>+
>+  Some python modules have been moved to prepare setuptools update.
>+  Ports users need to rename them so that portupgrade and portmaster do not
>+  get confused.
>+
>+    pkg set -o devel/py-appdirs:devel/py27-appdirs
>+    pkg set -o devel/py-pyparsing:devel/py27-pyparsing
>+    pkg set -o devel/py-six:devel/py27-six
>+    pkg set -o devel/py3-six:devel/py35-six
>+
> 20170401:
>   AFFECTS: net/samba44, net/samba45, net/samba46 and devel/p5-Parse-Pidl*
>   AUTHOR: timur@FreeBSD.org
>Index: audio/beets/Makefile
>===================================================================
>--- audio/beets/Makefile	(revision 437570)
>+++ audio/beets/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> 		${PYTHON_PKGNAMEPREFIX}enum34>=1.0.4:devel/py-enum34 \
> 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: audio/puddletag/Makefile
>===================================================================
>--- audio/puddletag/Makefile	(revision 437570)
>+++ audio/puddletag/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 		${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2 \
> 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen \
> 		${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/${PYTHON_PKGNAMEPREFIX}pyparsing
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	keithgg
>Index: audio/py-discogs-client/Makefile
>===================================================================
>--- audio/py-discogs-client/Makefile	(revision 437570)
>+++ audio/py-discogs-client/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: audio/py-gmusicapi/Makefile
>===================================================================
>--- audio/py-gmusicapi/Makefile	(revision 437570)
>+++ audio/py-gmusicapi/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/${PYTHON_PKGNAMEPREFIX}appdirs \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil \
> 		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \
> 		${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future \
>Index: audio/py-pylast/Makefile
>===================================================================
>--- audio/py-pylast/Makefile	(revision 437570)
>+++ audio/py-pylast/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 437570)
>+++ databases/Makefile	(working copy)
>@@ -806,8 +806,6 @@
>     SUBDIR += py3-bsddb3
>     SUBDIR += py3-mysqlclient
>     SUBDIR += py3-psycopg2
>-    SUBDIR += py33-gdbm
>-    SUBDIR += py33-sqlite3
>     SUBDIR += py34-gdbm
>     SUBDIR += py34-sqlite3
>     SUBDIR += py35-gdbm
>Index: databases/py-python-swiftclient/Makefile
>===================================================================
>--- databases/py-python-swiftclient/Makefile	(revision 437570)
>+++ databases/py-python-swiftclient/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests
> 
> USES=		python:2
>Index: databases/py-sqlalchemy-migrate/Makefile
>===================================================================
>--- databases/py-sqlalchemy-migrate/Makefile	(revision 437570)
>+++ databases/py-sqlalchemy-migrate/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \
> 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
> 		${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr
> 
> USES=		python
>Index: databases/py33-gdbm/Makefile
>===================================================================
>--- databases/py33-gdbm/Makefile	(revision 437570)
>+++ databases/py33-gdbm/Makefile	(nonexistent)
>@@ -1,7 +0,0 @@
>-# $FreeBSD$
>-
>-MASTERDIR=	${.CURDIR}/../py-gdbm
>-
>-PYTHON_VERSION=	python3.3
>-
>-.include "${MASTERDIR}/Makefile"
>Index: databases/py33-sqlite3/Makefile
>===================================================================
>--- databases/py33-sqlite3/Makefile	(revision 437570)
>+++ databases/py33-sqlite3/Makefile	(nonexistent)
>@@ -1,7 +0,0 @@
>-# $FreeBSD$
>-
>-MASTERDIR=	${.CURDIR}/../py-sqlite3
>-
>-PYTHON_VERSION=	python3.3
>-
>-.include "${MASTERDIR}/Makefile"
>Index: deskutils/py-bugwarrior/Makefile
>===================================================================
>--- deskutils/py-bugwarrior/Makefile	(revision 437570)
>+++ deskutils/py-bugwarrior/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \
> 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
> 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \
>Index: deskutils/py-taskw/Makefile
>===================================================================
>--- deskutils/py-taskw/Makefile	(revision 437570)
>+++ deskutils/py-taskw/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose
>Index: deskutils/spice-gtk/Makefile
>===================================================================
>--- deskutils/spice-gtk/Makefile	(revision 437570)
>+++ deskutils/spice-gtk/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> CPE_VENDOR=	redhat
> 
> BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/${PYTHON_PKGNAMEPREFIX}pyparsing
> RUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
> 
> .if defined(SPICE_SLAVE)
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 437570)
>+++ devel/Makefile	(working copy)
>@@ -4114,7 +4114,6 @@
>     SUBDIR += py-anyjson
>     SUBDIR += py-apache_conf_parser
>     SUBDIR += py-apipkg
>-    SUBDIR += py-appdirs
>     SUBDIR += py-application
>     SUBDIR += py-apptools
>     SUBDIR += py-apscheduler
>@@ -4567,7 +4566,6 @@
>     SUBDIR += py-pympler
>     SUBDIR += py-pymtbl
>     SUBDIR += py-pyopencl
>-    SUBDIR += py-pyparsing
>     SUBDIR += py-pypugjs
>     SUBDIR += py-pyqi
>     SUBDIR += py-pyrfc3339
>@@ -4698,7 +4696,6 @@
>     SUBDIR += py-simpy
>     SUBDIR += py-singledispatch
>     SUBDIR += py-sip
>-    SUBDIR += py-six
>     SUBDIR += py-smmap
>     SUBDIR += py-sortedcontainers
>     SUBDIR += py-sourcemap
>@@ -4904,7 +4901,11 @@
>     SUBDIR += py-zope.testing
>     SUBDIR += py-zope.traversing
>     SUBDIR += py-zope.viewlet
>+    SUBDIR += py27-appdirs
>+    SUBDIR += py27-packaging
>+    SUBDIR += py27-pyparsing
>     SUBDIR += py27-setuptools
>+    SUBDIR += py27-six
>     SUBDIR += py3-Jinja2
>     SUBDIR += py3-babel
>     SUBDIR += py3-click
>@@ -4940,7 +4941,6 @@
>     SUBDIR += py3-rubymarshal
>     SUBDIR += py3-setproctitle
>     SUBDIR += py3-simplejson
>-    SUBDIR += py3-six
>     SUBDIR += py3-tabulate
>     SUBDIR += py3-threema-msgapi
>     SUBDIR += py3-vcversioner
>@@ -4947,10 +4947,21 @@
>     SUBDIR += py3-wcwidth
>     SUBDIR += py3-xdg
>     SUBDIR += py3-yaml
>-    SUBDIR += py33-setuptools
>+    SUBDIR += py34-appdirs
>+    SUBDIR += py34-packaging
>+    SUBDIR += py34-pyparsing
>     SUBDIR += py34-setuptools
>+    SUBDIR += py34-six
>+    SUBDIR += py35-appdirs
>+    SUBDIR += py35-packaging
>+    SUBDIR += py35-pyparsing
>     SUBDIR += py35-setuptools
>+    SUBDIR += py35-six
>+    SUBDIR += py36-appdirs
>+    SUBDIR += py36-packaging
>+    SUBDIR += py36-pyparsing
>     SUBDIR += py36-setuptools
>+    SUBDIR += py36-six
>     SUBDIR += py_static_check
>     SUBDIR += pybugz
>     SUBDIR += pychecker
>Index: devel/bpython/Makefile
>===================================================================
>--- devel/bpython/Makefile	(revision 437570)
>+++ devel/bpython/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> OPTIONS_DEFINE=	EXAMPLES NLS
> OPTIONS_SUB=	yes
>Index: devel/euca2ools/Makefile
>===================================================================
>--- devel/euca2ools/Makefile	(revision 437570)
>+++ devel/euca2ools/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python:2.7
> USE_GITHUB=	yes
>Index: devel/py-Automat/Makefile
>===================================================================
>--- devel/py-Automat/Makefile	(revision 437570)
>+++ devel/py-Automat/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \
> 		${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>Index: devel/py-appdirs/Makefile
>===================================================================
>--- devel/py-appdirs/Makefile	(revision 437570)
>+++ devel/py-appdirs/Makefile	(nonexistent)
>@@ -1,22 +0,0 @@
>-# Created by: Thomas Zander <riggs@FreeBSD.org>
>-# $FreeBSD$
>-
>-PORTNAME=	appdirs
>-PORTVERSION=	1.4.3
>-CATEGORIES=	devel python
>-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-
>-MAINTAINER=	python@FreeBSD.org
>-COMMENT=	Python module for determining platform-specific dirs
>-
>-LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	ActiveState
>-
>-NO_ARCH=	yes
>-USES=		python
>-USE_PYTHON=	autoplist distutils
>-
>-.include <bsd.port.mk>
>Index: devel/py-appdirs/distinfo
>===================================================================
>--- devel/py-appdirs/distinfo	(revision 437570)
>+++ devel/py-appdirs/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1488984395
>-SHA256 (ActiveState-appdirs-1.4.3_GH0.tar.gz) = 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b
>-SIZE (ActiveState-appdirs-1.4.3_GH0.tar.gz) = 9641
>Index: devel/py-appdirs/pkg-descr
>===================================================================
>--- devel/py-appdirs/pkg-descr	(revision 437570)
>+++ devel/py-appdirs/pkg-descr	(nonexistent)
>@@ -1,19 +0,0 @@
>-appdirs is small Python module for determining appropriate platform-specific
>-dirs, e.g. a "user data dir". Those are typically platform-specific, for
>-instance, if running on Mac OS X, you should use:
>-
>-~/Library/Application Support/<AppName>
>-
>-On Linux (and other Unices) the dir, according to the XDG spec, is:
>-
>-~/.local/share/<AppName>
>-
>-appdirs will help the application to choose an appropriate:
>-- user data dir (user_data_dir)
>-- user config dir (user_config_dir)
>-- user cache dir (user_cache_dir)
>-- site data dir (site_data_dir)
>-- site config dir (site_config_dir)
>-- user log dir (user_log_dir)
>-
>-WWW: https://github.com/ActiveState/appdirs
>Index: devel/py-apscheduler/Makefile
>===================================================================
>--- devel/py-apscheduler/Makefile	(revision 437570)
>+++ devel/py-apscheduler/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog
>Index: devel/py-astroid/Makefile
>===================================================================
>--- devel/py-astroid/Makefile	(revision 437570)
>+++ devel/py-astroid/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
> 		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>0:devel/py-lazy-object-proxy \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-automaton/Makefile
>===================================================================
>--- devel/py-automaton/Makefile	(revision 437570)
>+++ devel/py-automaton/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
> 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable
> 
>Index: devel/py-bandit/Makefile
>===================================================================
>--- devel/py-bandit/Makefile	(revision 437570)
>+++ devel/py-bandit/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore
> 
> MAKE_ENV+=	PBR_VERSION=${PORTVERSION}
>Index: devel/py-bcdoc/Makefile
>===================================================================
>--- devel/py-bcdoc/Makefile	(revision 437570)
>+++ devel/py-bcdoc/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: devel/py-biplist/Makefile
>===================================================================
>--- devel/py-biplist/Makefile	(revision 437570)
>+++ devel/py-biplist/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
> 		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS:=	${RUN_DEPENDS}
> 
> USES=		python
>Index: devel/py-cliff/Makefile
>===================================================================
>--- devel/py-cliff/Makefile	(revision 437570)
>+++ devel/py-cliff/Makefile	(working copy)
>@@ -16,10 +16,10 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2 \
> 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
> 		${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/${PYTHON_PKGNAMEPREFIX}pyparsing
> 
> NO_ARCH=	yes
> 
>Index: devel/py-configobj/Makefile
>===================================================================
>--- devel/py-configobj/Makefile	(revision 437570)
>+++ devel/py-configobj/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-construct/Makefile
>===================================================================
>--- devel/py-construct/Makefile	(revision 437570)
>+++ devel/py-construct/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python
>Index: devel/py-cursive/Makefile
>===================================================================
>--- devel/py-cursive/Makefile	(revision 437570)
>+++ devel/py-cursive/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> COMMENT=	Cursive implements OpenStack-specific validation of digital signatures
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-cycler/Makefile
>===================================================================
>--- devel/py-cycler/Makefile	(revision 437570)
>+++ devel/py-cycler/Makefile	(working copy)
>@@ -12,8 +12,8 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-dateutil/Makefile
>===================================================================
>--- devel/py-dateutil/Makefile	(revision 437570)
>+++ devel/py-dateutil/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python dos2unix
> USE_GITHUB=	yes
>Index: devel/py-debtcollector/Makefile
>===================================================================
>--- devel/py-debtcollector/Makefile	(revision 437570)
>+++ devel/py-debtcollector/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
> 		${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs
> 
>Index: devel/py-delfick_error/Makefile
>===================================================================
>--- devel/py-delfick_error/Makefile	(revision 437570)
>+++ devel/py-delfick_error/Makefile	(working copy)
>@@ -10,7 +10,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
> 		${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
>Index: devel/py-diazo/Makefile
>===================================================================
>--- devel/py-diazo/Makefile	(revision 437570)
>+++ devel/py-diazo/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
> 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \
> 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \
> 		${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob
> 
>Index: devel/py-doit/Makefile
>===================================================================
>--- devel/py-doit/Makefile	(revision 437570)
>+++ devel/py-doit/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
>Index: devel/py-efilter/Makefile
>===================================================================
>--- devel/py-efilter/Makefile	(revision 437570)
>+++ devel/py-efilter/Makefile	(working copy)
>@@ -14,9 +14,9 @@
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}six
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz
> 
> NO_ARCH=	yes
>Index: devel/py-fasteners/Makefile
>===================================================================
>--- devel/py-fasteners/Makefile	(revision 437570)
>+++ devel/py-fasteners/Makefile	(working copy)
>@@ -10,7 +10,7 @@
> MAINTAINER=	alexander.nusov@nfvexpress.com
> COMMENT=	Python package that provides useful locks
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic
> 
> NO_ARCH=	yes
>Index: devel/py-freenas.dispatcher/Makefile
>===================================================================
>--- devel/py-freenas.dispatcher/Makefile	(revision 437570)
>+++ devel/py-freenas.dispatcher/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \
> 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
> 
> USES=		python
>Index: devel/py-freenas.utils/Makefile
>===================================================================
>--- devel/py-freenas.utils/Makefile	(revision 437570)
>+++ devel/py-freenas.utils/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-freezegun/Makefile
>===================================================================
>--- devel/py-freezegun/Makefile	(revision 437570)
>+++ devel/py-freezegun/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
>Index: devel/py-futurist/Makefile
>===================================================================
>--- devel/py-futurist/Makefile	(revision 437570)
>+++ devel/py-futurist/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \
> 		${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2 \
> 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable
>Index: devel/py-glance-store/Makefile
>===================================================================
>--- devel/py-glance-store/Makefile	(revision 437570)
>+++ devel/py-glance-store/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
>Index: devel/py-grab/Makefile
>===================================================================
>--- devel/py-grab/Makefile	(revision 437570)
>+++ devel/py-grab/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
> 		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \
> 		${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent \
> 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml
> 
>Index: devel/py-http-prompt/Makefile
>===================================================================
>--- devel/py-http-prompt/Makefile	(revision 437570)
>+++ devel/py-http-prompt/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious \
> 		${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie
> 
> NO_ARCH=	yes
>Index: devel/py-jaraco.classes/Makefile
>===================================================================
>--- devel/py-jaraco.classes/Makefile	(revision 437570)
>+++ devel/py-jaraco.classes/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/${PYTHON_PKGNAMEPREFIX}six
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
> 
> USES=		python
>Index: devel/py-jaraco.itertools/Makefile
>===================================================================
>--- devel/py-jaraco.itertools/Makefile	(revision 437570)
>+++ devel/py-jaraco.itertools/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \
> 		${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
>Index: devel/py-jaraco.logging/Makefile
>===================================================================
>--- devel/py-jaraco.logging/Makefile	(revision 437570)
>+++ devel/py-jaraco.logging/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
> 
>Index: devel/py-jaraco.util/Makefile
>===================================================================
>--- devel/py-jaraco.util/Makefile	(revision 437570)
>+++ devel/py-jaraco.util/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \
> 		${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools
>Index: devel/py-jenkins-job-builder/Makefile
>===================================================================
>--- devel/py-jenkins-job-builder/Makefile	(revision 437570)
>+++ devel/py-jenkins-job-builder/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>0:devel/py-pbr
> RUN_DEPENDS=	${PKGNAMEPREFIX}yaml>0:devel/py-yaml \
> 		${PKGNAMEPREFIX}pbr>0:devel/py-pbr \
>-		${PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \
> 		${PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins
> 
>Index: devel/py-jira/Makefile
>===================================================================
>--- devel/py-jira/Makefile	(revision 437570)
>+++ devel/py-jira/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \
> 		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
> TEST_DEPENDS:=	${RUN_DEPENDS} \
> 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
>Index: devel/py-keystoneauth1/Makefile
>===================================================================
>--- devel/py-keystoneauth1/Makefile	(revision 437570)
>+++ devel/py-keystoneauth1/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
> 		${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore
> 
> NO_ARCH=	yes
>Index: devel/py-keystonemiddleware/Makefile
>===================================================================
>--- devel/py-keystonemiddleware/Makefile	(revision 437570)
>+++ devel/py-keystonemiddleware/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf \
>Index: devel/py-manuel/Makefile
>===================================================================
>--- devel/py-manuel/Makefile	(revision 437570)
>+++ devel/py-manuel/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE.rst
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>Index: devel/py-mock/Makefile
>===================================================================
>--- devel/py-mock/Makefile	(revision 437570)
>+++ devel/py-mock/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
> 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}six
> TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox
> 
> USES=		python
>Index: devel/py-nose2/Makefile
>===================================================================
>--- devel/py-nose2/Makefile	(revision 437570)
>+++ devel/py-nose2/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/license.txt
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cov-core>=1.12:devel/py-cov-core \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USE_PYTHON=	autoplist distutils
>Index: devel/py-noseofyeti/Makefile
>===================================================================
>--- devel/py-noseofyeti/Makefile	(revision 437570)
>+++ devel/py-noseofyeti/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	truckman@FreeBSD.org
> COMMENT=	Nose plugin providing BDD dsl for Python
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
> 		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
> 		${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl
>Index: devel/py-openstacksdk/Makefile
>===================================================================
>--- devel/py-openstacksdk/Makefile	(revision 437570)
>+++ devel/py-openstacksdk/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
> 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \
> 		${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config
>Index: devel/py-option_merge/Makefile
>===================================================================
>--- devel/py-option_merge/Makefile	(revision 437570)
>+++ devel/py-option_merge/Makefile	(working copy)
>@@ -9,7 +9,7 @@
> COMMENT=	Code to deeply merge multiple python dictionaries
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error	\
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
> 		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
> 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
>Index: devel/py-os-brick/Makefile
>===================================================================
>--- devel/py-os-brick/Makefile	(revision 437570)
>+++ devel/py-os-brick/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win \
> 		${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
>Index: devel/py-os-client-config/Makefile
>===================================================================
>--- devel/py-os-client-config/Makefile	(revision 437570)
>+++ devel/py-os-client-config/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \
>+		${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/${PYTHON_PKGNAMEPREFIX}appdirs \
> 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \
> 		${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions
> 
>Index: devel/py-os-vif/Makefile
>===================================================================
>--- devel/py-os-vif/Makefile	(revision 437570)
>+++ devel/py-os-vif/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \
> 		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-osc-lib/Makefile
>===================================================================
>--- devel/py-osc-lib/Makefile	(revision 437570)
>+++ devel/py-osc-lib/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
> 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
> 		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \
>Index: devel/py-oslo.cache/Makefile
>===================================================================
>--- devel/py-oslo.cache/Makefile	(revision 437570)
>+++ devel/py-oslo.cache/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-oslo.concurrency/Makefile
>===================================================================
>--- devel/py-oslo.concurrency/Makefile	(revision 437570)
>+++ devel/py-oslo.concurrency/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-oslo.config/Makefile
>===================================================================
>--- devel/py-oslo.config/Makefile	(revision 437570)
>+++ devel/py-oslo.config/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986 \
> 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore
> 
> NO_ARCH=	yes
>Index: devel/py-oslo.db/Makefile
>===================================================================
>--- devel/py-oslo.db/Makefile	(revision 437570)
>+++ devel/py-oslo.db/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
>Index: devel/py-oslo.i18n/Makefile
>===================================================================
>--- devel/py-oslo.i18n/Makefile	(revision 437570)
>+++ devel/py-oslo.i18n/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: devel/py-oslo.log/Makefile
>===================================================================
>--- devel/py-oslo.log/Makefile	(revision 437570)
>+++ devel/py-oslo.log/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
>Index: devel/py-oslo.messaging/Makefile
>===================================================================
>--- devel/py-oslo.messaging/Makefile	(revision 437570)
>+++ devel/py-oslo.messaging/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
> 		${PYTHON_PKGNAMEPREFIX}pika-pool>=0.1.3:devel/py-pika-pool \
> 		${PYTHON_PKGNAMEPREFIX}pika>=0.10.0:devel/py-pika \
>Index: devel/py-oslo.middleware/Makefile
>===================================================================
>--- devel/py-oslo.middleware/Makefile	(revision 437570)
>+++ devel/py-oslo.middleware/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.0:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
>Index: devel/py-oslo.policy/Makefile
>===================================================================
>--- devel/py-oslo.policy/Makefile	(revision 437570)
>+++ devel/py-oslo.policy/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-oslo.reports/Makefile
>===================================================================
>--- devel/py-oslo.reports/Makefile	(revision 437570)
>+++ devel/py-oslo.reports/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2
>Index: devel/py-oslo.rootwrap/Makefile
>===================================================================
>--- devel/py-oslo.rootwrap/Makefile	(revision 437570)
>+++ devel/py-oslo.rootwrap/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: devel/py-oslo.serialization/Makefile
>===================================================================
>--- devel/py-oslo.serialization/Makefile	(revision 437570)
>+++ devel/py-oslo.serialization/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: devel/py-oslo.service/Makefile
>===================================================================
>--- devel/py-oslo.service/Makefile	(revision 437570)
>+++ devel/py-oslo.service/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-oslo.utils/Makefile
>===================================================================
>--- devel/py-oslo.utils/Makefile	(revision 437570)
>+++ devel/py-oslo.utils/Makefile	(working copy)
>@@ -20,8 +20,8 @@
> 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing
> 
> NO_ARCH=	yes
> 
>Index: devel/py-oslo.versionedobjects/Makefile
>===================================================================
>--- devel/py-oslo.versionedobjects/Makefile	(revision 437570)
>+++ devel/py-oslo.versionedobjects/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
> 		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.18.0:devel/py-oslo.config \
> 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: devel/py-oslo.vmware/Makefile
>===================================================================
>--- devel/py-oslo.vmware/Makefile	(revision 437570)
>+++ devel/py-oslo.vmware/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3 \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
>Index: devel/py-osprofiler/Makefile
>===================================================================
>--- devel/py-osprofiler/Makefile	(revision 437570)
>+++ devel/py-osprofiler/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> COMMENT=	OpenStack Profiler Library
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \
> 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
>Index: devel/py-pathlib2/Makefile
>===================================================================
>--- devel/py-pathlib2/Makefile	(revision 437570)
>+++ devel/py-pathlib2/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE.rst
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: devel/py-prompt_toolkit/Makefile
>===================================================================
>--- devel/py-prompt_toolkit/Makefile	(revision 437570)
>+++ devel/py-prompt_toolkit/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth
> 
> NO_ARCH=	yes
>Index: devel/py-protobuf/Makefile
>===================================================================
>--- devel/py-protobuf/Makefile	(revision 437570)
>+++ devel/py-protobuf/Makefile	(working copy)
>@@ -12,9 +12,9 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		protoc:devel/protobuf
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> DO_MAKE_TEST=	${PYTHON_CMD} ${PYDISTUTILS_SETUP}
> NO_ARCH=	yes
>Index: devel/py-pycadf/Makefile
>===================================================================
>--- devel/py-pycadf/Makefile	(revision 437570)
>+++ devel/py-pycadf/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> COMMENT=	CADF Library
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
> 		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
>Index: devel/py-pygit2/Makefile
>===================================================================
>--- devel/py-pygit2/Makefile	(revision 437570)
>+++ devel/py-pygit2/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi
> LIB_DEPENDS=	libgit2.so:devel/libgit2
> RUN_DEPENDS:=	${BUILD_DEPENDS} \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-pymarc/Makefile
>===================================================================
>--- devel/py-pymarc/Makefile	(revision 437570)
>+++ devel/py-pymarc/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python
>Index: devel/py-pyparsing/Makefile
>===================================================================
>--- devel/py-pyparsing/Makefile	(revision 437570)
>+++ devel/py-pyparsing/Makefile	(nonexistent)
>@@ -1,20 +0,0 @@
>-# Created by: Hye-Shik Chang
>-# $FreeBSD$
>-
>-PORTNAME=	pyparsing
>-PORTVERSION=	2.2.0
>-CATEGORIES=	devel python
>-MASTER_SITES=	CHEESESHOP
>-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-
>-MAINTAINER=	sunpoet@FreeBSD.org
>-COMMENT=	General parsing module for Python
>-
>-LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
>-NO_ARCH=	yes
>-USE_PYTHON=	autoplist concurrent distutils
>-USES=		python
>-
>-.include <bsd.port.mk>
>Index: devel/py-pyparsing/distinfo
>===================================================================
>--- devel/py-pyparsing/distinfo	(revision 437570)
>+++ devel/py-pyparsing/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1488809761
>-SHA256 (pyparsing-2.2.0.tar.gz) = 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04
>-SIZE (pyparsing-2.2.0.tar.gz) = 1232522
>Index: devel/py-pyparsing/pkg-descr
>===================================================================
>--- devel/py-pyparsing/pkg-descr	(revision 437570)
>+++ devel/py-pyparsing/pkg-descr	(nonexistent)
>@@ -1,7 +0,0 @@
>-Pyparsing is a general parsing module for Python. Grammars are implemented
>-directly in the client code using parsing objects, instead of externally, as
>-with lex/yacc-type tools. Includes simple examples for parsing SQL, CORBA IDL,
>-and 4-function math.
>-
>-WWW: https://pypi.python.org/pypi/pyparsing
>-WWW: http://pyparsing.wikispaces.com/
>Index: devel/py-pystorm/Makefile
>===================================================================
>--- devel/py-pystorm/Makefile	(revision 437570)
>+++ devel/py-pystorm/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> USES=		python
> USE_PYTHON=	autoplist distutils
> 
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python
> 
>Index: devel/py-pytest-localserver/Makefile
>===================================================================
>--- devel/py-pytest-localserver/Makefile	(revision 437570)
>+++ devel/py-pytest-localserver/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
> 
> USES=		python
>Index: devel/py-python-jenkins/Makefile
>===================================================================
>--- devel/py-python-jenkins/Makefile	(revision 437570)
>+++ devel/py-python-jenkins/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict
> 
> USES=		python
>Index: devel/py-pytools/Makefile
>===================================================================
>--- devel/py-pytools/Makefile	(revision 437570)
>+++ devel/py-pytools/Makefile	(working copy)
>@@ -12,10 +12,10 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}appdirs \
> 		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \
> 		${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USE_PYTHON=	autoplist distutils
>Index: devel/py-pyvalid/Makefile
>===================================================================
>--- devel/py-pyvalid/Makefile	(revision 437570)
>+++ devel/py-pyvalid/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-rebulk/Makefile
>===================================================================
>--- devel/py-rebulk/Makefile	(revision 437570)
>+++ devel/py-rebulk/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
> 
> USES=		python
>Index: devel/py-retrying/Makefile
>===================================================================
>--- devel/py-retrying/Makefile	(revision 437570)
>+++ devel/py-retrying/Makefile	(working copy)
>@@ -10,7 +10,7 @@
> MAINTAINER=	alexander.nusov@nfvexpress.com
> COMMENT=	General-purpose retrying library, written in Python
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: devel/py-rply/Makefile
>===================================================================
>--- devel/py-rply/Makefile	(revision 437570)
>+++ devel/py-rply/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/${PYTHON_PKGNAMEPREFIX}appdirs
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: devel/py-selection/Makefile
>===================================================================
>--- devel/py-selection/Makefile	(revision 437570)
>+++ devel/py-selection/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
> 		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib
> 
>Index: devel/py-selectors34/Makefile
>===================================================================
>--- devel/py-selectors34/Makefile	(revision 437570)
>+++ devel/py-selectors34/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	PSFL
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7-3.3
>Index: devel/py-singledispatch/Makefile
>===================================================================
>--- devel/py-singledispatch/Makefile	(revision 437570)
>+++ devel/py-singledispatch/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python:-3.3
> USE_PYTHON=	distutils concurrent autoplist
>Index: devel/py-six/Makefile
>===================================================================
>--- devel/py-six/Makefile	(revision 437570)
>+++ devel/py-six/Makefile	(nonexistent)
>@@ -1,26 +0,0 @@
>-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
>-# $FreeBSD$
>-
>-PORTNAME=	six
>-PORTVERSION=	1.10.0
>-CATEGORIES=	devel python
>-MASTER_SITES=	CHEESESHOP
>-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-
>-MAINTAINER=	python@FreeBSD.org
>-COMMENT=	Python 2 and 3 compatibility utilities
>-
>-LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
>-TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
>-
>-USES?=		python
>-USE_PYTHON=	autoplist concurrent distutils
>-
>-NO_ARCH=	yes
>-
>-do-test:
>-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
>-
>-.include <bsd.port.mk>
>Index: devel/py-six/distinfo
>===================================================================
>--- devel/py-six/distinfo	(revision 437570)
>+++ devel/py-six/distinfo	(nonexistent)
>@@ -1,2 +0,0 @@
>-SHA256 (six-1.10.0.tar.gz) = 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a
>-SIZE (six-1.10.0.tar.gz) = 29630
>Index: devel/py-six/pkg-descr
>===================================================================
>--- devel/py-six/pkg-descr	(revision 437570)
>+++ devel/py-six/pkg-descr	(nonexistent)
>@@ -1,6 +0,0 @@
>-Six is a Python 2 and 3 compatibility library. It provides utility
>-functions for smoothing over the differences between the Python versions
>-with the goal of writing Python code that is compatible on both Python
>-versions. See the documentation for more information on what is provided.
>-
>-WWW: https://pypi.python.org/pypi/six
>Index: devel/py-stackexchange/Makefile
>===================================================================
>--- devel/py-stackexchange/Makefile	(revision 437570)
>+++ devel/py-stackexchange/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-stevedore/Makefile
>===================================================================
>--- devel/py-stevedore/Makefile	(revision 437570)
>+++ devel/py-stevedore/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr # <2.0
> RUN_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr \
>-		${PKGNAMEPREFIX}six>=1.9.0:devel/py-six
>+		${PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-streamparse/Makefile
>===================================================================
>--- devel/py-streamparse/Makefile	(revision 437570)
>+++ devel/py-streamparse/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> USE_PYTHON=	autoplist distutils
> 
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson
>Index: devel/py-structlog/Makefile
>===================================================================
>--- devel/py-structlog/Makefile	(revision 437570)
>+++ devel/py-structlog/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \
>-			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
>+			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-sure/Makefile
>===================================================================
>--- devel/py-sure/Makefile	(revision 437570)
>+++ devel/py-sure/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	GPLv3
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
> 
> USES=		python:2.7
>Index: devel/py-taskflow/Makefile
>===================================================================
>--- devel/py-taskflow/Makefile	(revision 437570)
>+++ devel/py-taskflow/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
> 		${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
>Index: devel/py-tooz/Makefile
>===================================================================
>--- devel/py-tooz/Makefile	(revision 437570)
>+++ devel/py-tooz/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 		${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous \
> 		${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
> 		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \
>Index: devel/py-traceback2/Makefile
>===================================================================
>--- devel/py-traceback2/Makefile	(revision 437570)
>+++ devel/py-traceback2/Makefile	(working copy)
>@@ -11,8 +11,8 @@
> COMMENT=	New features in traceback backported to Python 2
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-pbr
> 
> LICENSE=	PSFL
>Index: devel/py-traitlets/Makefile
>===================================================================
>--- devel/py-traitlets/Makefile	(revision 437570)
>+++ devel/py-traitlets/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \
> 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
> 
> USES=		python
>Index: devel/py-twilio/Makefile
>===================================================================
>--- devel/py-twilio/Makefile	(revision 437570)
>+++ devel/py-twilio/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
> 
> USES=		python
>Index: devel/py-txaio/Makefile
>===================================================================
>--- devel/py-txaio/Makefile	(revision 437570)
>+++ devel/py-txaio/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
> 
>Index: devel/py-unittest2/Makefile
>===================================================================
>--- devel/py-unittest2/Makefile	(revision 437570)
>+++ devel/py-unittest2/Makefile	(working copy)
>@@ -12,10 +12,10 @@
> LICENSE=	BSD3CLAUSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2
> 
> USES=		python
>Index: devel/py-vcrpy/Makefile
>===================================================================
>--- devel/py-vcrpy/Makefile	(revision 437570)
>+++ devel/py-vcrpy/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver
> 
>Index: devel/py-warlock/Makefile
>===================================================================
>--- devel/py-warlock/Makefile	(revision 437570)
>+++ devel/py-warlock/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: devel/py-weblib/Makefile
>===================================================================
>--- devel/py-weblib/Makefile	(revision 437570)
>+++ devel/py-weblib/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
> 		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
> 
>Index: devel/py-wsme/Makefile
>===================================================================
>--- devel/py-wsme/Makefile	(revision 437570)
>+++ devel/py-wsme/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> COMMENT=	Simplify the writing of REST APIs
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
> 		${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
>Index: devel/py-yandex-money-sdk/Makefile
>===================================================================
>--- devel/py-yandex-money-sdk/Makefile	(revision 437570)
>+++ devel/py-yandex-money-sdk/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python
>Index: devel/py-z3c.form/Makefile
>===================================================================
>--- devel/py-z3c.form/Makefile	(revision 437570)
>+++ devel/py-z3c.form/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	ZPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
> 		${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
> 		${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \
>Index: devel/py27-appdirs/Makefile
>===================================================================
>--- devel/py27-appdirs/Makefile	(nonexistent)
>+++ devel/py27-appdirs/Makefile	(working copy)
>@@ -0,0 +1,18 @@
>+# Created by: Thomas Zander <riggs@FreeBSD.org>
>+# $FreeBSD$
>+
>+PORTNAME=	appdirs
>+PORTVERSION=	1.4.3
>+PORTREVISION=	1
>+CATEGORIES=	devel python
>+MASTER_SITES=	https://pypi.python.org/packages/56/eb/810e700ed1349edde4cbdc1b2a21e28cdf115f9faf263f6bbf8447c1abf3/
>+
>+MAINTAINER=	python@FreeBSD.org
>+COMMENT=	Python module for determining platform-specific dirs
>+
>+LICENSE=	MIT
>+
>+USES?=		python:2.7
>+USES+=		wheel
>+
>+.include <bsd.port.mk>
>Index: devel/py27-appdirs/distinfo
>===================================================================
>--- devel/py27-appdirs/distinfo	(nonexistent)
>+++ devel/py27-appdirs/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1488903788
>+SHA256 (python/appdirs-1.4.3-py2.py3-none-any.whl) = d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e
>+SIZE (python/appdirs-1.4.3-py2.py3-none-any.whl) = 12154
>Index: devel/py27-appdirs/pkg-descr
>===================================================================
>--- devel/py27-appdirs/pkg-descr	(nonexistent)
>+++ devel/py27-appdirs/pkg-descr	(working copy)
>@@ -0,0 +1,19 @@
>+appdirs is small Python module for determining appropriate platform-specific
>+dirs, e.g. a "user data dir". Those are typically platform-specific, for
>+instance, if running on Mac OS X, you should use:
>+
>+~/Library/Application Support/<AppName>
>+
>+On Linux (and other Unices) the dir, according to the XDG spec, is:
>+
>+~/.local/share/<AppName>
>+
>+appdirs will help the application to choose an appropriate:
>+- user data dir (user_data_dir)
>+- user config dir (user_config_dir)
>+- user cache dir (user_cache_dir)
>+- site data dir (site_data_dir)
>+- site config dir (site_config_dir)
>+- user log dir (user_log_dir)
>+
>+WWW: https://github.com/ActiveState/appdirs
>Index: devel/py27-packaging/Makefile
>===================================================================
>--- devel/py27-packaging/Makefile	(nonexistent)
>+++ devel/py27-packaging/Makefile	(working copy)
>@@ -0,0 +1,20 @@
>+# $FreeBSD$
>+
>+PORTNAME=	packaging
>+PORTVERSION=	16.8
>+CATEGORIES=	devel python
>+MASTER_SITES=	https://pypi.python.org/packages/87/1b/c39b7c65b5612812b83d6cab7ef2885eac9f6beb0b7b8a7071a186aea3b1/
>+
>+MAINTAINER=	python@FreeBSD.org
>+COMMENT=	Core utilities for Python packages
>+
>+LICENSE=	APACHE20 BSD2CLAUSE
>+LICENSE_COMB=	dual
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
>+
>+USES?=		python:2.7
>+USES+=		wheel
>+
>+.include <bsd.port.mk>
>Index: devel/py27-packaging/distinfo
>===================================================================
>--- devel/py27-packaging/distinfo	(nonexistent)
>+++ devel/py27-packaging/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1488902023
>+SHA256 (python/packaging-16.8-py2.py3-none-any.whl) = 99276dc6e3a7851f32027a68f1095cd3f77c148091b092ea867a351811cfe388
>+SIZE (python/packaging-16.8-py2.py3-none-any.whl) = 23069
>Index: devel/py27-packaging/pkg-descr
>===================================================================
>--- devel/py27-packaging/pkg-descr	(nonexistent)
>+++ devel/py27-packaging/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+Core utilities for Python packages
>+
>+WWW: https://github.com/pypa/packaging
>Index: devel/py27-pyparsing/Makefile
>===================================================================
>--- devel/py27-pyparsing/Makefile	(nonexistent)
>+++ devel/py27-pyparsing/Makefile	(working copy)
>@@ -0,0 +1,18 @@
>+# Created by: Hye-Shik Chang
>+# $FreeBSD$
>+
>+PORTNAME=	pyparsing
>+PORTVERSION=	2.2.0
>+PORTREVISION=	1
>+CATEGORIES=	devel python
>+MASTER_SITES=	https://pypi.python.org/packages/6a/8a/718fd7d3458f9fab8e67186b00abdd345b639976bc7fb3ae722e1b026a50/
>+
>+MAINTAINER=	sunpoet@FreeBSD.org
>+COMMENT=	General parsing module for Python
>+
>+LICENSE=	MIT
>+
>+USES?=		python:2.7
>+USES+=		wheel
>+
>+.include <bsd.port.mk>
>Index: devel/py27-pyparsing/distinfo
>===================================================================
>--- devel/py27-pyparsing/distinfo	(nonexistent)
>+++ devel/py27-pyparsing/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1488901180
>+SHA256 (python/pyparsing-2.2.0-py2.py3-none-any.whl) = fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010
>+SIZE (python/pyparsing-2.2.0-py2.py3-none-any.whl) = 56385
>Index: devel/py27-pyparsing/pkg-descr
>===================================================================
>--- devel/py27-pyparsing/pkg-descr	(nonexistent)
>+++ devel/py27-pyparsing/pkg-descr	(working copy)
>@@ -0,0 +1,7 @@
>+Pyparsing is a general parsing module for Python. Grammars are implemented
>+directly in the client code using parsing objects, instead of externally, as
>+with lex/yacc-type tools. Includes simple examples for parsing SQL, CORBA IDL,
>+and 4-function math.
>+
>+WWW: https://pypi.python.org/pypi/pyparsing
>+WWW: http://pyparsing.wikispaces.com/
>Index: devel/py27-setuptools/Makefile
>===================================================================
>--- devel/py27-setuptools/Makefile	(revision 437570)
>+++ devel/py27-setuptools/Makefile	(working copy)
>@@ -1,12 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	setuptools
>-PORTVERSION=	32.1.0
>-PORTREVISION=	1
>+PORTVERSION=	34.3.3
> CATEGORIES=	devel python
>-MASTER_SITES=	CHEESESHOP
>-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-DIST_SUBDIR=	python
>+MASTER_SITES=	https://pypi.python.org/packages/dd/d5/0c24cf773269681b2ce088b7afbaadddc2273cf0bd91c3f3961458097de2/
> 
> MAINTAINER=	python@FreeBSD.org
> COMMENT=	Python packages installer
>@@ -13,15 +10,14 @@
> 
> LICENSE=	PSFL
> 
>-NO_ARCH=	yes
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}appdirs \
>+		${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/${PYTHON_PKGNAMEPREFIX}packaging \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.6.0:devel/${PYTHON_PKGNAMEPREFIX}six
>+
> USES?=		python:2.7
>-USE_PYTHON=	autoplist concurrent distutils
>+USES+=		wheel:noautoplist
> 
>-PYDISTUTILS_SETUP=	${PYSETUP}
> 
>-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
>-MAKE_ENV+=		SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
>-
> PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
> 
> .include <bsd.port.pre.mk>
>@@ -31,17 +27,11 @@
> SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
> .endif
> 
>-# These create dependency loops in redports/poudriere, because setuptools
>-# is currently an explicit BUILD & RUN dependency in Uses/python.mk.
>-#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
>-#.if ${PYTHON_REL} < 3300
>-#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
>-#.endif
>-
> post-install:
>+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
>+	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf easy_install-${PYTHON_VER} easy-install
>+.endif
> 	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
>+	${FIND} -s ${STAGEDIR} ! -type d | ${SED} 's,${STAGEDIR}${PREFIX}/,, ; /easy-install.pth.dist/d' >> ${TMPPLIST}
> 
>-do-test:
>-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
>-
> .include <bsd.port.post.mk>
>Index: devel/py27-setuptools/distinfo
>===================================================================
>--- devel/py27-setuptools/distinfo	(revision 437570)
>+++ devel/py27-setuptools/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482063347
>-SHA256 (python/setuptools-32.1.0.tar.gz) = 86d57bf86edc0ecfd2dc0907ed3710bc4501fb13a06c0fcaf7632305b00ce832
>-SIZE (python/setuptools-32.1.0.tar.gz) = 656843
>+TIMESTAMP = 1491152505
>+SHA256 (python/setuptools-34.3.3-py2.py3-none-any.whl) = e436d8c9dcf67ea8902bfa7cce1ef698f36bf303f13b4f62a5668891ecd380dd
>+SIZE (python/setuptools-34.3.3-py2.py3-none-any.whl) = 389395
>Index: devel/py27-six/Makefile
>===================================================================
>--- devel/py27-six/Makefile	(nonexistent)
>+++ devel/py27-six/Makefile	(working copy)
>@@ -0,0 +1,18 @@
>+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
>+# $FreeBSD$
>+
>+PORTNAME=	six
>+PORTVERSION=	1.10.0
>+PORTREVISION=	1
>+CATEGORIES=	devel python
>+MASTER_SITES=	https://pypi.python.org/packages/c8/0a/b6723e1bc4c516cb687841499455a8505b44607ab535be01091c0f24f079/
>+
>+MAINTAINER=	python@FreeBSD.org
>+COMMENT=	Python 2 and 3 compatibility utilities
>+
>+LICENSE=	MIT
>+
>+USES?=		python:2.7
>+USES+=		wheel
>+
>+.include <bsd.port.mk>
>Index: devel/py27-six/distinfo
>===================================================================
>--- devel/py27-six/distinfo	(nonexistent)
>+++ devel/py27-six/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489338753
>+SHA256 (python/six-1.10.0-py2.py3-none-any.whl) = 0ff78c403d9bccf5a425a6d31a12aa6b47f1c21ca4dc2573a7e2f32a97335eb1
>+SIZE (python/six-1.10.0-py2.py3-none-any.whl) = 10341
>Index: devel/py27-six/pkg-descr
>===================================================================
>--- devel/py27-six/pkg-descr	(nonexistent)
>+++ devel/py27-six/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+Six is a Python 2 and 3 compatibility library. It provides utility
>+functions for smoothing over the differences between the Python versions
>+with the goal of writing Python code that is compatible on both Python
>+versions. See the documentation for more information on what is provided.
>+
>+WWW: https://pypi.python.org/pypi/six
>Index: devel/py3-prompt_toolkit/Makefile
>===================================================================
>--- devel/py3-prompt_toolkit/Makefile	(revision 437570)
>+++ devel/py3-prompt_toolkit/Makefile	(working copy)
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py3-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py3-wcwidth
> 
> USES=		python:3.3+
>Index: devel/py3-six/Makefile
>===================================================================
>--- devel/py3-six/Makefile	(revision 437570)
>+++ devel/py3-six/Makefile	(nonexistent)
>@@ -1,10 +0,0 @@
>-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
>-# $FreeBSD$
>-
>-MASTERDIR=	${.CURDIR}/../py-six
>-
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest
>-
>-USES=	python:3.3+
>-
>-.include "${MASTERDIR}/Makefile"
>Index: devel/py33-setuptools/Makefile
>===================================================================
>--- devel/py33-setuptools/Makefile	(revision 437570)
>+++ devel/py33-setuptools/Makefile	(nonexistent)
>@@ -1,8 +0,0 @@
>-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
>-# $FreeBSD$
>-
>-MASTERDIR=	${.CURDIR}/../py27-setuptools
>-
>-USES=		python:3.3
>-
>-.include "${MASTERDIR}/Makefile"
>Index: devel/py34-appdirs/Makefile
>===================================================================
>--- devel/py34-appdirs/Makefile	(nonexistent)
>+++ devel/py34-appdirs/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-appdirs
>+
>+USES=	python:3.4
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py34-packaging/Makefile
>===================================================================
>--- devel/py34-packaging/Makefile	(nonexistent)
>+++ devel/py34-packaging/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-packaging
>+
>+USES=	python:3.4
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py34-pyparsing/Makefile
>===================================================================
>--- devel/py34-pyparsing/Makefile	(nonexistent)
>+++ devel/py34-pyparsing/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-pyparsing
>+
>+USES=	python:3.4
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py34-six/Makefile
>===================================================================
>--- devel/py34-six/Makefile	(nonexistent)
>+++ devel/py34-six/Makefile	(working copy)
>@@ -0,0 +1,8 @@
>+# Created by: Danilo G. Baio <dbaio@bsd.com.br>
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-six
>+
>+USES=	python:3.4
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py35-appdirs/Makefile
>===================================================================
>--- devel/py35-appdirs/Makefile	(nonexistent)
>+++ devel/py35-appdirs/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-appdirs
>+
>+USES=	python:3.5
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py35-packaging/Makefile
>===================================================================
>--- devel/py35-packaging/Makefile	(nonexistent)
>+++ devel/py35-packaging/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-packaging
>+
>+USES=	python:3.5
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py35-pyparsing/Makefile
>===================================================================
>--- devel/py35-pyparsing/Makefile	(nonexistent)
>+++ devel/py35-pyparsing/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-pyparsing
>+
>+USES=	python:3.5
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py35-six/Makefile
>===================================================================
>--- devel/py35-six/Makefile	(nonexistent)
>+++ devel/py35-six/Makefile	(working copy)
>@@ -0,0 +1,8 @@
>+# Created by: Danilo G. Baio <dbaio@bsd.com.br>
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-six
>+
>+USES=	python:3.5
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py36-appdirs/Makefile
>===================================================================
>--- devel/py36-appdirs/Makefile	(nonexistent)
>+++ devel/py36-appdirs/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-appdirs
>+
>+USES=	python:3.6
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py36-packaging/Makefile
>===================================================================
>--- devel/py36-packaging/Makefile	(nonexistent)
>+++ devel/py36-packaging/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-packaging
>+
>+USES=	python:3.6
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py36-pyparsing/Makefile
>===================================================================
>--- devel/py36-pyparsing/Makefile	(nonexistent)
>+++ devel/py36-pyparsing/Makefile	(working copy)
>@@ -0,0 +1,7 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-pyparsing
>+
>+USES=	python:3.6
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/py36-six/Makefile
>===================================================================
>--- devel/py36-six/Makefile	(nonexistent)
>+++ devel/py36-six/Makefile	(working copy)
>@@ -0,0 +1,8 @@
>+# Created by: Danilo G. Baio <dbaio@bsd.com.br>
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../py27-six
>+
>+USES=	python:3.6
>+
>+.include "${MASTERDIR}/Makefile"
>Index: devel/pylint/Makefile
>===================================================================
>--- devel/pylint/Makefile	(revision 437570)
>+++ devel/pylint/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.4.5:devel/py-astroid \
> 		${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort \
> 		${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils concurrent
>Index: devel/rbtools/Makefile
>===================================================================
>--- devel/rbtools/Makefile	(revision 437570)
>+++ devel/rbtools/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm
> 
>Index: devel/spice-protocol/Makefile
>===================================================================
>--- devel/spice-protocol/Makefile	(revision 437570)
>+++ devel/spice-protocol/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> GNU_CONFIGURE=	yes
> USES=		gmake pathfix pkgconfig python tar:bzip2
>Index: emulators/py-nova/Makefile
>===================================================================
>--- emulators/py-nova/Makefile	(revision 437570)
>+++ emulators/py-nova/Makefile	(working copy)
>@@ -42,7 +42,7 @@
> 		${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \
> 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
> 		${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify \
> 		${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache \
>Index: graphics/piglit/Makefile
>===================================================================
>--- graphics/piglit/Makefile	(revision 437570)
>+++ graphics/piglit/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl \
> 		${PYNUMPY} \
> 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> LIB_DEPENDS=	libcaca.so:graphics/libcaca \
> 		libdrm.so:graphics/libdrm \
> 		libOpenCL.so:devel/ocl-icd \
>@@ -23,7 +23,7 @@
> 		libwaffle-1.so:graphics/waffle
> RUN_DEPENDS=	${PYNUMPY} \
> 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	dumbbell
>Index: graphics/py-leather/Makefile
>===================================================================
>--- graphics/py-leather/Makefile	(revision 437570)
>+++ graphics/py-leather/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: graphics/py-plotly/Makefile
>===================================================================
>--- graphics/py-plotly/Makefile	(revision 437570)
>+++ graphics/py-plotly/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
> 
> NO_ARCH=	yes
>Index: graphics/py-pydot/Makefile
>===================================================================
>--- graphics/py-pydot/Makefile	(revision 437570)
>+++ graphics/py-pydot/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	dot:graphics/graphviz \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/${PYTHON_PKGNAMEPREFIX}pyparsing
> 
> NO_ARCH=	yes
> USE_PYTHON=	autoplist concurrent distutils
>Index: graphics/py-scikit-image/Makefile
>===================================================================
>--- graphics/py-scikit-image/Makefile	(revision 437570)
>+++ graphics/py-scikit-image/Makefile	(working copy)
>@@ -14,12 +14,12 @@
> 
> BUILD_DEPENDS=	${PYNUMPY} \
> 		${LOCALBASE}/bin/cython:lang/cython \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \
> 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc
> RUN_DEPENDS=	${PYNUMPY} \
> 		${LOCALBASE}/bin/cython:lang/cython \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \
> 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \
>Index: graphics/qgis/Makefile
>===================================================================
>--- graphics/qgis/Makefile	(revision 437570)
>+++ graphics/qgis/Makefile	(working copy)
>@@ -105,7 +105,7 @@
> 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
> 			${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \
> 			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
>-			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>+			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
> PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
>@@ -124,7 +124,7 @@
> 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
> 			${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \
> 			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
>-			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>+			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
>Index: graphics/variety/Makefile
>===================================================================
>--- graphics/variety/Makefile	(revision 437570)
>+++ graphics/variety/Makefile	(working copy)
>@@ -26,7 +26,7 @@
> 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2 \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		ImageMagick>=6.9.0.4,1:graphics/ImageMagick \
> 		bash>=4.3.33:shells/bash \
> 		ca_root_nss>=3.17.4:security/ca_root_nss \
>Index: irc/py-irc/Makefile
>===================================================================
>--- irc/py-irc/Makefile	(revision 437570)
>+++ irc/py-irc/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
> 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
> 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util \
> 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
> 
>Index: mail/offlineimap/Makefile
>===================================================================
>--- mail/offlineimap/Makefile	(revision 437570)
>+++ mail/offlineimap/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> ## later versions have sqlite3 backend, which is recommended for local storages
> ## with large amount of emails
> ## (add additional variable to use in {BUILD|RUN}_DEPENDS per porter's hb 5.8.2)
>-OIMAP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+OIMAP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
> BUILD_DEPENDS=	${OIMAP_DEPENDS}
> RUN_DEPENDS=	${OIMAP_DEPENDS}
>Index: mail/py-fuglu/Makefile
>===================================================================
>--- mail/py-fuglu/Makefile	(revision 437570)
>+++ mail/py-fuglu/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> 
> RUN_DEPENDS=	postfix:mail/postfix \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python:2.4+
> USE_PYTHON=	autoplist distutils
>Index: math/py-keras/Makefile
>===================================================================
>--- math/py-keras/Makefile	(revision 437570)
>+++ math/py-keras/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	fchollet
>Index: math/py-matplotlib/Makefile
>===================================================================
>--- math/py-matplotlib/Makefile	(revision 437570)
>+++ math/py-matplotlib/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
> 
> USE_GITHUB=	yes
>Index: math/py-patsy/Makefile
>===================================================================
>--- math/py-patsy/Makefile	(revision 437570)
>+++ math/py-patsy/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_COMB=	multi
> 
> RUN_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python zip
> USE_PYTHON=	distutils autoplist
>Index: misc/py-cinder/Makefile
>===================================================================
>--- misc/py-cinder/Makefile	(revision 437570)
>+++ misc/py-cinder/Makefile	(working copy)
>@@ -46,7 +46,7 @@
> 		${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
> 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \
> 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
>@@ -59,7 +59,7 @@
> 		${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
> 		${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
>Index: misc/py-glance/Makefile
>===================================================================
>--- misc/py-glance/Makefile	(revision 437570)
>+++ misc/py-glance/Makefile	(working copy)
>@@ -40,7 +40,7 @@
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
>Index: multimedia/livestreamer/Makefile
>===================================================================
>--- multimedia/livestreamer/Makefile	(revision 437570)
>+++ multimedia/livestreamer/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp
> 
> USES=		python
>Index: multimedia/py-subliminal/Makefile
>===================================================================
>--- multimedia/py-subliminal/Makefile	(revision 437570)
>+++ multimedia/py-subliminal/Makefile	(working copy)
>@@ -22,8 +22,8 @@
> 		${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt \
> 		${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish \
> 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>-		${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
>+		${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/${PYTHON_PKGNAMEPREFIX}appdirs \
> 		${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz
> 
>Index: net/cloud-init/Makefile
>===================================================================
>--- net/cloud-init/Makefile	(revision 437570)
>+++ net/cloud-init/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> 		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
> 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth \
>Index: net/py-kafka-python/Makefile
>===================================================================
>--- net/py-kafka-python/Makefile	(revision 437570)
>+++ net/py-kafka-python/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	APACHE20
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_PYTHON=	autoplist distutils
> USES=		python shebangfix
>Index: net/py-ldaptor/Makefile
>===================================================================
>--- net/py-ldaptor/Makefile	(revision 437570)
>+++ net/py-ldaptor/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> MAINTAINER=	bra@fsn.hu
> COMMENT=	Pure-python LDAP module for Twisted
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
> 
> GITVERSION=	aad8ded658b36337a08aeb7402b6b67eb8771bea
>Index: net/py-magic-wormhole/Makefile
>===================================================================
>--- net/py-magic-wormhole/Makefile	(revision 437570)
>+++ net/py-magic-wormhole/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna \
> 		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
> 		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2 \
> 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm \
> 
>Index: net/py-python-barbicanclient/Makefile
>===================================================================
>--- net/py-python-barbicanclient/Makefile	(revision 437570)
>+++ net/py-python-barbicanclient/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
>Index: net/py-python-ceilometerclient/Makefile
>===================================================================
>--- net/py-python-ceilometerclient/Makefile	(revision 437570)
>+++ net/py-python-ceilometerclient/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils \
>Index: net/py-python-cinderclient/Makefile
>===================================================================
>--- net/py-python-cinderclient/Makefile	(revision 437570)
>+++ net/py-python-cinderclient/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils
> 
>Index: net/py-python-designateclient/Makefile
>===================================================================
>--- net/py-python-designateclient/Makefile	(revision 437570)
>+++ net/py-python-designateclient/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \
>Index: net/py-python-glanceclient/Makefile
>===================================================================
>--- net/py-python-glanceclient/Makefile	(revision 437570)
>+++ net/py-python-glanceclient/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils
> 
>Index: net/py-python-heatclient/Makefile
>===================================================================
>--- net/py-python-heatclient/Makefile	(revision 437570)
>+++ net/py-python-heatclient/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient \
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
>Index: net/py-python-keystoneclient/Makefile
>===================================================================
>--- net/py-python-keystoneclient/Makefile	(revision 437570)
>+++ net/py-python-keystoneclient/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
> 		${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore
> 
> USES=		python shebangfix
>Index: net/py-python-neutronclient/Makefile
>===================================================================
>--- net/py-python-neutronclient/Makefile	(revision 437570)
>+++ net/py-python-neutronclient/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> 		${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
> 
> USES=		python shebangfix
>Index: net/py-python-novaclient/Makefile
>===================================================================
>--- net/py-python-novaclient/Makefile	(revision 437570)
>+++ net/py-python-novaclient/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
> 
> USES=		python shebangfix
>Index: net/py-pyvmomi/Makefile
>===================================================================
>--- net/py-pyvmomi/Makefile	(revision 437570)
>+++ net/py-pyvmomi/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	APACHE20
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: net/py-socketio-client/Makefile
>===================================================================
>--- net/py-socketio-client/Makefile	(revision 437570)
>+++ net/py-socketio-client/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client
> 
> USES=		python
>Index: net/py-tweepy/Makefile
>===================================================================
>--- net/py-tweepy/Makefile	(revision 437570)
>+++ net/py-tweepy/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_GITHUB=	yes
>Index: net/py-wolframalpha/Makefile
>===================================================================
>--- net/py-wolframalpha/Makefile	(revision 437570)
>+++ net/py-wolframalpha/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
> 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=	python:2 zip
> USE_PYTHON=	autoplist distutils
>Index: net-p2p/py-transmissionrpc/Makefile
>===================================================================
>--- net-p2p/py-transmissionrpc/Makefile	(revision 437570)
>+++ net-p2p/py-transmissionrpc/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>Index: print/dot2tex/Makefile
>===================================================================
>--- print/dot2tex/Makefile	(revision 437570)
>+++ print/dot2tex/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		dot:graphics/graphviz
> 
> NO_ARCH=	yes
>Index: science/py-cdo/Makefile
>===================================================================
>--- science/py-cdo/Makefile	(revision 437570)
>+++ science/py-cdo/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	GPLv2
> 
> RUN_DEPENDS=	cdo:science/cdo \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USE_PYTHON=	autoplist concurrent distutils
>Index: science/py-h5py/Makefile
>===================================================================
>--- science/py-h5py/Makefile	(revision 437570)
>+++ science/py-h5py/Makefile	(working copy)
>@@ -14,11 +14,11 @@
> 
> BUILD_DEPENDS=	${PYNUMPY} \
> 		cython:lang/cython \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig
> LIB_DEPENDS=	libhdf5.so:science/hdf5
> RUN_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> 
>Index: security/py-YubiOTP/Makefile
>===================================================================
>--- security/py-YubiOTP/Makefile	(revision 437570)
>+++ security/py-YubiOTP/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
> 
> USES=		python
>Index: security/py-acme/Makefile
>===================================================================
>--- security/py-acme/Makefile	(revision 437570)
>+++ security/py-acme/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
>Index: security/py-certbot/Makefile
>===================================================================
>--- security/py-certbot/Makefile	(revision 437570)
>+++ security/py-certbot/Makefile	(working copy)
>@@ -25,7 +25,7 @@
> 		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
> 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
>Index: security/py-crits/Makefile
>===================================================================
>--- security/py-crits/Makefile	(revision 437570)
>+++ security/py-crits/Makefile	(working copy)
>@@ -57,7 +57,7 @@
> 		${PYTHON_PKGNAMEPREFIX}celery>=3.0.12:devel/py-celery          \
> 		${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0_9:www/py-requests1     \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=2.4.0:graphics/py-pillow               \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing     \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/${PYTHON_PKGNAMEPREFIX}pyparsing     \
> 		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.15:net/py-ldap                \
> 		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic                  \
> 		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse     \
>Index: security/py-cryptography/Makefile
>===================================================================
>--- security/py-cryptography/Makefile	(revision 437570)
>+++ security/py-cryptography/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \
> 		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \
> 		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
>Index: security/py-keystone/Makefile
>===================================================================
>--- security/py-keystone/Makefile	(revision 437570)
>+++ security/py-keystone/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> 		${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
> 		${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
>Index: security/py-oauth2client/Makefile
>===================================================================
>--- security/py-oauth2client/Makefile	(revision 437570)
>+++ security/py-oauth2client/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
> 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \
> 		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USE_PYTHON=	autoplist concurrent distutils
>Index: security/py-openssl/Makefile
>===================================================================
>--- security/py-openssl/Makefile	(revision 437570)
>+++ security/py-openssl/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:security/py-cryptography \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> OPTIONS_DEFINE=	EXAMPLES
> 
>Index: security/py-plaso/Makefile
>===================================================================
>--- security/py-plaso/Makefile	(revision 437570)
>+++ security/py-plaso/Makefile	(working copy)
>@@ -38,7 +38,7 @@
> 		${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \
> 		${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile \
> 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq \
>Index: security/py-pymacaroons-pynacl/Makefile
>===================================================================
>--- security/py-pymacaroons-pynacl/Makefile	(revision 437570)
>+++ security/py-pymacaroons-pynacl/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
> 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
>Index: security/py-pynacl/Makefile
>===================================================================
>--- security/py-pynacl/Makefile	(revision 437570)
>+++ security/py-pynacl/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> BUILD_DEPENDS=	${RUN_DEPENDS}
> LIB_DEPENDS=	libsodium.so:security/libsodium
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
>Index: security/py-pysaml2/Makefile
>===================================================================
>--- security/py-pysaml2/Makefile	(revision 437570)
>+++ security/py-pysaml2/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		xmlsec1:security/xmlsec1
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
>Index: security/py-python-social-auth/Makefile
>===================================================================
>--- security/py-python-social-auth/Makefile	(revision 437570)
>+++ security/py-python-social-auth/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
> 
> NO_ARCH=	yes
>Index: security/py-rekall-core/Makefile
>===================================================================
>--- security/py-rekall-core/Makefile	(revision 437570)
>+++ security/py-rekall-core/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> 		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
> 		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.4,1:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil \
> 		${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone \
>Index: security/py-tuf/Makefile
>===================================================================
>--- security/py-tuf/Makefile	(revision 437570)
>+++ security/py-tuf/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> COMMENT=	Framework for securing software update systems
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
> 		${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl
>Index: sysutils/fusefs-gitfs/Makefile
>===================================================================
>--- sysutils/fusefs-gitfs/Makefile	(revision 437570)
>+++ sysutils/fusefs-gitfs/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 		${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy \
> 		${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2 \
> 		${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest
> 
> USE_GITHUB=	yes
>Index: sysutils/py-consul/Makefile
>===================================================================
>--- sysutils/py-consul/Makefile	(revision 437570)
>+++ sysutils/py-consul/Makefile	(working copy)
>@@ -11,9 +11,9 @@
> LICENSE=	MIT
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six
>+				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six
>+				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	cablehead
>Index: sysutils/py-dlipower/Makefile
>===================================================================
>--- sysutils/py-dlipower/Makefile	(revision 437570)
>+++ sysutils/py-dlipower/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python shebangfix
> SHEBANG_FILES=	scripts/fence_dli
>Index: sysutils/py-freenas.cli/Makefile
>===================================================================
>--- sysutils/py-freenas.cli/Makefile	(revision 437570)
>+++ sysutils/py-freenas.cli/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
> 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor \
> 		${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils \
> 		${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher
> 
>Index: textproc/py-agate/Makefile
>===================================================================
>--- textproc/py-agate/Makefile	(revision 437570)
>+++ textproc/py-agate/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse \
> 		${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel \
> 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime \
>Index: textproc/py-csvkit/Makefile
>===================================================================
>--- textproc/py-csvkit/Makefile	(revision 437570)
>+++ textproc/py-csvkit/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 		${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel \
> 		${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf \
> 		${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: textproc/py-pyelasticsearch/Makefile
>===================================================================
>--- textproc/py-pyelasticsearch/Makefile	(revision 437570)
>+++ textproc/py-pyelasticsearch/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \
> 		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3
> 
> USES=		python
>Index: textproc/py-pyes/Makefile
>===================================================================
>--- textproc/py-pyes/Makefile	(revision 437570)
>+++ textproc/py-pyes/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> MAINTAINER=	dvl@FreeBSD.org
> COMMENT=	Python connector for ElasticSearch - the pythonic way to use ElasticSearch
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3
> 
> USES=		python:2
>Index: textproc/py-pyscss/Makefile
>===================================================================
>--- textproc/py-pyscss/Makefile	(revision 437570)
>+++ textproc/py-pyscss/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
> 		${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib
> LIB_DEPENDS=	libpcre.so:devel/pcre
>Index: textproc/py-qrcode/Makefile
>===================================================================
>--- textproc/py-qrcode/Makefile	(revision 437570)
>+++ textproc/py-qrcode/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow
> 
> USES=		python
>Index: textproc/py-rdflib/Makefile
>===================================================================
>--- textproc/py-rdflib/Makefile	(revision 437570)
>+++ textproc/py-rdflib/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate \
>-	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
>+	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 	${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper \
> 	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
> 
>Index: textproc/py-scour/Makefile
>===================================================================
>--- textproc/py-scour/Makefile	(revision 437570)
>+++ textproc/py-scour/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	APACHE20
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: textproc/py-sphinx/Makefile
>===================================================================
>--- textproc/py-sphinx/Makefile	(revision 437570)
>+++ textproc/py-sphinx/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
> 		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel\
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
> 		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
>@@ -27,7 +27,7 @@
> 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme \
> 		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster \
> 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize \
> 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
>Index: textproc/py-sphinx-intl/Makefile
>===================================================================
>--- textproc/py-sphinx-intl/Makefile	(revision 437570)
>+++ textproc/py-sphinx-intl/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 
> RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx \
> 		${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib \
>-		${PKGNAMEPREFIX}six>=1.8.0:devel/py-six
>+		${PKGNAMEPREFIX}six>=1.8.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: textproc/py-wstools/Makefile
>===================================================================
>--- textproc/py-wstools/Makefile	(revision 437570)
>+++ textproc/py-wstools/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: textproc/translate-toolkit/Makefile
>===================================================================
>--- textproc/translate-toolkit/Makefile	(revision 437570)
>+++ textproc/translate-toolkit/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject \
> 		msghack:devel/gettext-msghack \
> 		${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse \
>Index: www/py-MechanicalSoup/Makefile
>===================================================================
>--- www/py-MechanicalSoup/Makefile	(revision 437570)
>+++ www/py-MechanicalSoup/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	hickford
>Index: www/py-WebTest/Makefile
>===================================================================
>--- www/py-WebTest/Makefile	(revision 437570)
>+++ www/py-WebTest/Makefile	(working copy)
>@@ -11,11 +11,11 @@
> 
> LICENSE=	MIT
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
> 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
> 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
>Index: www/py-autobahn/Makefile
>===================================================================
>--- www/py-autobahn/Makefile	(revision 437570)
>+++ www/py-autobahn/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest \
> 		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
>Index: www/py-bleach/Makefile
>===================================================================
>--- www/py-bleach/Makefile	(revision 437570)
>+++ www/py-bleach/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose
> 
>Index: www/py-blogofile/Makefile
>===================================================================
>--- www/py-blogofile/Makefile	(revision 437570)
>+++ www/py-blogofile/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \
> 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile \
> 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
>Index: www/py-bokeh/Makefile
>===================================================================
>--- www/py-bokeh/Makefile	(revision 437570)
>+++ www/py-bokeh/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
>Index: www/py-django-appconf/Makefile
>===================================================================
>--- www/py-django-appconf/Makefile	(revision 437570)
>+++ www/py-django-appconf/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: www/py-django-bitfield/Makefile
>===================================================================
>--- www/py-django-bitfield/Makefile	(revision 437570)
>+++ www/py-django-bitfield/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: www/py-django-extensions/Makefile
>===================================================================
>--- www/py-django-extensions/Makefile	(revision 437570)
>+++ www/py-django-extensions/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2
>Index: www/py-django-guardian/Makefile
>===================================================================
>--- www/py-django-guardian/Makefile	(revision 437570)
>+++ www/py-django-guardian/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
> 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: www/py-django-picklefield/Makefile
>===================================================================
>--- www/py-django-picklefield/Makefile	(revision 437570)
>+++ www/py-django-picklefield/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-simple-captcha/Makefile
>===================================================================
>--- www/py-django-simple-captcha/Makefile	(revision 437570)
>+++ www/py-django-simple-captcha/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-tables2/Makefile
>===================================================================
>--- www/py-django-tables2/Makefile	(revision 437570)
>+++ www/py-django-tables2/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> 
>Index: www/py-django_openstack_auth/Makefile
>===================================================================
>--- www/py-django_openstack_auth/Makefile	(revision 437570)
>+++ www/py-django_openstack_auth/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1 \
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
> 		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy \
>Index: www/py-falcon/Makefile
>===================================================================
>--- www/py-falcon/Makefile	(revision 437570)
>+++ www/py-falcon/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> BUILD_DEPENDS=	cython>=0.11.2:lang/cython
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse
> 
> USES=		python
>Index: www/py-feedgenerator/Makefile
>===================================================================
>--- www/py-feedgenerator/Makefile	(revision 437570)
>+++ www/py-feedgenerator/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-flask-cors/Makefile
>===================================================================
>--- www/py-flask-cors/Makefile	(revision 437570)
>+++ www/py-flask-cors/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-flask-restful/Makefile
>===================================================================
>--- www/py-flask-restful/Makefile	(revision 437570)
>+++ www/py-flask-restful/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601 \
> 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
> 
> NO_ARCH=	yes
>Index: www/py-flask-restplus/Makefile
>===================================================================
>--- www/py-flask-restplus/Makefile	(revision 437570)
>+++ www/py-flask-restplus/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
>Index: www/py-flask-restplus08/Makefile
>===================================================================
>--- www/py-flask-restplus08/Makefile	(revision 437570)
>+++ www/py-flask-restplus08/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.2:www/py-flask-restful \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
>Index: www/py-flexget/Makefile
>===================================================================
>--- www/py-flexget/Makefile	(revision 437570)
>+++ www/py-flexget/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py \
> 		${PYTHON_PKGNAMEPREFIX}pathlib>=1.0:devel/py-pathlib \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
> 		${PYTHON_PKGNAMEPREFIX}guessit>=2.0.4:multimedia/py-guessit \
>Index: www/py-formalchemy/Makefile
>===================================================================
>--- www/py-formalchemy/Makefile	(revision 437570)
>+++ www/py-formalchemy/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10 \
> 		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \
> 		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \
>Index: www/py-google-api-python-client/Makefile
>===================================================================
>--- www/py-google-api-python-client/Makefile	(revision 437570)
>+++ www/py-google-api-python-client/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> #BUILD_DEPENDS=	${PKGNAMEPREFIX}oauth2client>=1.4.6:security/py-oauth2client
> RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2 \
> 		${PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate
> 
> DJANGO_DESC=	Use the library with Django
>Index: www/py-graphite-api/Makefile
>===================================================================
>--- www/py-graphite-api/Makefile	(revision 437570)
>+++ www/py-graphite-api/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 		${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache \
> 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal \
> 		${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog \
>-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing \
>+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/${PYTHON_PKGNAMEPREFIX}pyparsing \
> 		${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml \
> 		${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi \
> 		${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn \
>Index: www/py-horizon/Makefile
>===================================================================
>--- www/py-horizon/Makefile	(revision 437570)
>+++ www/py-horizon/Makefile	(working copy)
>@@ -41,7 +41,7 @@
> 		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic \
> 		${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular \
> 		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap \
>Index: www/py-html5lib/Makefile
>===================================================================
>--- www/py-html5lib/Makefile	(revision 437570)
>+++ www/py-html5lib/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python
>Index: www/py-libsass/Makefile
>===================================================================
>--- www/py-libsass/Makefile	(revision 437570)
>+++ www/py-libsass/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-paste/Makefile
>===================================================================
>--- www/py-paste/Makefile	(revision 437570)
>+++ www/py-paste/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> MAINTAINER=	nivit@FreeBSD.org
> COMMENT=	Tools for using a Web Server Gateway Interface stack
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-pastescript/Makefile
>===================================================================
>--- www/py-pastescript/Makefile	(revision 437570)
>+++ www/py-pastescript/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \
> 		${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
> 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>Index: www/py-pelican/Makefile
>===================================================================
>--- www/py-pelican/Makefile	(revision 437570)
>+++ www/py-pelican/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
> 		${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
> 
>Index: www/py-praw/Makefile
>===================================================================
>--- www/py-praw/Makefile	(revision 437570)
>+++ www/py-praw/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock
> 
>Index: www/py-requestbuilder/Makefile
>===================================================================
>--- www/py-requestbuilder/Makefile	(revision 437570)
>+++ www/py-requestbuilder/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python:-2.7
> USE_PYTHON=	distutils autoplist
>Index: www/py-rollbar/Makefile
>===================================================================
>--- www/py-rollbar/Makefile	(revision 437570)
>+++ www/py-rollbar/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-routes/Makefile
>===================================================================
>--- www/py-routes/Makefile	(revision 437570)
>+++ www/py-routes/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru
> 
> USES=		python
>Index: www/py-slimit/Makefile
>===================================================================
>--- www/py-slimit/Makefile	(revision 437570)
>+++ www/py-slimit/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> .include <bsd.port.pre.mk>
> 
> .if ${PYTHON_REL} >= 3000
>-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> pre-build:
> 	@cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src
> .endif
>Index: www/py-splinter/Makefile
>===================================================================
>--- www/py-splinter/Makefile	(revision 437570)
>+++ www/py-splinter/Makefile	(working copy)
>@@ -16,7 +16,7 @@
> 		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
> 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \
>-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-user_agent/Makefile
>===================================================================
>--- www/py-user_agent/Makefile	(revision 437570)
>+++ www/py-user_agent/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: www/py-w3lib/Makefile
>===================================================================
>--- www/py-w3lib/Makefile	(revision 437570)
>+++ www/py-w3lib/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> NO_ARCH=	yes
> USES=		python:2.7+
>Index: www/rtv/Makefile
>===================================================================
>--- www/rtv/Makefile	(revision 437570)
>+++ www/rtv/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
> 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \
>Index: www/seahub/Makefile
>===================================================================
>--- www/seahub/Makefile	(revision 437570)
>+++ www/seahub/Makefile	(working copy)
>@@ -25,7 +25,7 @@
> 		${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup \
> 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
>-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
>+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/${PYTHON_PKGNAMEPREFIX}six \
> 		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
> 		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
>Index: x11-toolkits/Makefile
>===================================================================
>--- x11-toolkits/Makefile	(revision 437570)
>+++ x11-toolkits/Makefile	(working copy)
>@@ -219,7 +219,6 @@
>     SUBDIR += py-wxPython28-common
>     SUBDIR += py-wxPython30
>     SUBDIR += py-xlib
>-    SUBDIR += py33-tkinter
>     SUBDIR += py34-tkinter
>     SUBDIR += py35-tkinter
>     SUBDIR += py36-tkinter
>Index: x11-toolkits/py-xlib/Makefile
>===================================================================
>--- x11-toolkits/py-xlib/Makefile	(revision 437570)
>+++ x11-toolkits/py-xlib/Makefile	(working copy)
>@@ -12,8 +12,8 @@
> LICENSE=	GPLv2+
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm \
>-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
>+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/${PYTHON_PKGNAMEPREFIX}six
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	python-xlib
>Index: x11-toolkits/py33-tkinter/Makefile
>===================================================================
>--- x11-toolkits/py33-tkinter/Makefile	(revision 437570)
>+++ x11-toolkits/py33-tkinter/Makefile	(nonexistent)
>@@ -1,7 +0,0 @@
>-# $FreeBSD$
>-
>-MASTERDIR=	${.CURDIR}/../py-tkinter
>-
>-PYTHON_VERSION=	python3.3
>-
>-.include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 217044: 179982 | 180610 | 181404