Correctly build as Python Egg.

14 files changed, 155 insertions, 151 deletions

diff --git a/devel/py-daemonize/Makefile b/devel/py-daemonize/Makefile
index 384181aba08..03e70d923df 100644
--- a/devel/py-daemonize/Makefile
+++ b/devel/py-daemonize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/05/11 16:26:14 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
 
 DISTNAME=	daemonize-2.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,5 +12,5 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-daemonize/PLIST b/devel/py-daemonize/PLIST
index cb6aed4540b..891be97f7fa 100644
--- a/devel/py-daemonize/PLIST
+++ b/devel/py-daemonize/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/11 16:26:14 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:44 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/daemonize.py
 ${PYSITELIB}/daemonize.pyc
 ${PYSITELIB}/daemonize.pyo
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
-${PYSITELIB}/daemonize.py
diff --git a/devel/py-jaraco_util/Makefile b/devel/py-jaraco_util/Makefile
index 97eb43d6bc0..0bc8f0cd050 100644
--- a/devel/py-jaraco_util/Makefile
+++ b/devel/py-jaraco_util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/05/09 21:30:26 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
 
 DISTNAME=	jaraco.util-10.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/./_/}
@@ -16,5 +16,5 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-more-itertools>=2.2:../../devel/py-more-itertools
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-jaraco_util/PLIST b/devel/py-jaraco_util/PLIST
index 41766ae43e7..204d13560f3 100644
--- a/devel/py-jaraco_util/PLIST
+++ b/devel/py-jaraco_util/PLIST
@@ -1,107 +1,107 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/09 21:30:26 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:44 joerg Exp $
 bin/calc-prorate
 bin/roll-dice
-${PYSITELIB}/jaraco.util-${PKGVERSION}-py3.3-nspkg.pth
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/namespace_packages.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_NAME}-nspkg.pth
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/jaraco/dateutil.py
 ${PYSITELIB}/jaraco/dateutil.pyc
 ${PYSITELIB}/jaraco/dateutil.pyo
-${PYSITELIB}/jaraco/tempora.pyc
-${PYSITELIB}/jaraco/tempora.pyo
-${PYSITELIB}/jaraco/dateutil.py
 ${PYSITELIB}/jaraco/filesystem/__init__.py
 ${PYSITELIB}/jaraco/filesystem/__init__.pyc
 ${PYSITELIB}/jaraco/filesystem/__init__.pyo
 ${PYSITELIB}/jaraco/lang/__init__.py
 ${PYSITELIB}/jaraco/lang/__init__.pyc
 ${PYSITELIB}/jaraco/lang/__init__.pyo
+${PYSITELIB}/jaraco/lang/python.py
 ${PYSITELIB}/jaraco/lang/python.pyc
 ${PYSITELIB}/jaraco/lang/python.pyo
-${PYSITELIB}/jaraco/lang/python.py
 ${PYSITELIB}/jaraco/tempora.py
+${PYSITELIB}/jaraco/tempora.pyc
+${PYSITELIB}/jaraco/tempora.pyo
 ${PYSITELIB}/jaraco/util/__init__.py
 ${PYSITELIB}/jaraco/util/__init__.pyc
 ${PYSITELIB}/jaraco/util/__init__.pyo
+${PYSITELIB}/jaraco/util/auth.py
 ${PYSITELIB}/jaraco/util/auth.pyc
 ${PYSITELIB}/jaraco/util/auth.pyo
+${PYSITELIB}/jaraco/util/bitutil.py
 ${PYSITELIB}/jaraco/util/bitutil.pyc
 ${PYSITELIB}/jaraco/util/bitutil.pyo
+${PYSITELIB}/jaraco/util/classutil.py
 ${PYSITELIB}/jaraco/util/classutil.pyc
 ${PYSITELIB}/jaraco/util/classutil.pyo
+${PYSITELIB}/jaraco/util/cmdline.py
 ${PYSITELIB}/jaraco/util/cmdline.pyc
 ${PYSITELIB}/jaraco/util/cmdline.pyo
+${PYSITELIB}/jaraco/util/cmp.py
 ${PYSITELIB}/jaraco/util/cmp.pyc
 ${PYSITELIB}/jaraco/util/cmp.pyo
+${PYSITELIB}/jaraco/util/collections.py
 ${PYSITELIB}/jaraco/util/collections.pyc
 ${PYSITELIB}/jaraco/util/collections.pyo
+${PYSITELIB}/jaraco/util/concurrency.py
 ${PYSITELIB}/jaraco/util/concurrency.pyc
 ${PYSITELIB}/jaraco/util/concurrency.pyo
+${PYSITELIB}/jaraco/util/context.py
 ${PYSITELIB}/jaraco/util/context.pyc
 ${PYSITELIB}/jaraco/util/context.pyo
+${PYSITELIB}/jaraco/util/dice.py
 ${PYSITELIB}/jaraco/util/dice.pyc
 ${PYSITELIB}/jaraco/util/dice.pyo
+${PYSITELIB}/jaraco/util/dictlib.py
 ${PYSITELIB}/jaraco/util/dictlib.pyc
 ${PYSITELIB}/jaraco/util/dictlib.pyo
+${PYSITELIB}/jaraco/util/editor.py
 ${PYSITELIB}/jaraco/util/editor.pyc
 ${PYSITELIB}/jaraco/util/editor.pyo
+${PYSITELIB}/jaraco/util/exceptions.py
 ${PYSITELIB}/jaraco/util/exceptions.pyc
 ${PYSITELIB}/jaraco/util/exceptions.pyo
+${PYSITELIB}/jaraco/util/filesystem.py
 ${PYSITELIB}/jaraco/util/filesystem.pyc
 ${PYSITELIB}/jaraco/util/filesystem.pyo
+${PYSITELIB}/jaraco/util/functools.py
 ${PYSITELIB}/jaraco/util/functools.pyc
 ${PYSITELIB}/jaraco/util/functools.pyo
+${PYSITELIB}/jaraco/util/input.py
 ${PYSITELIB}/jaraco/util/input.pyc
 ${PYSITELIB}/jaraco/util/input.pyo
+${PYSITELIB}/jaraco/util/itertools.py
 ${PYSITELIB}/jaraco/util/itertools.pyc
 ${PYSITELIB}/jaraco/util/itertools.pyo
+${PYSITELIB}/jaraco/util/logging.py
 ${PYSITELIB}/jaraco/util/logging.pyc
 ${PYSITELIB}/jaraco/util/logging.pyo
+${PYSITELIB}/jaraco/util/meta.py
 ${PYSITELIB}/jaraco/util/meta.pyc
 ${PYSITELIB}/jaraco/util/meta.pyo
+${PYSITELIB}/jaraco/util/numbers.py
 ${PYSITELIB}/jaraco/util/numbers.pyc
 ${PYSITELIB}/jaraco/util/numbers.pyo
+${PYSITELIB}/jaraco/util/properties.py
 ${PYSITELIB}/jaraco/util/properties.pyc
 ${PYSITELIB}/jaraco/util/properties.pyo
+${PYSITELIB}/jaraco/util/random.py
 ${PYSITELIB}/jaraco/util/random.pyc
 ${PYSITELIB}/jaraco/util/random.pyo
+${PYSITELIB}/jaraco/util/stream.py
 ${PYSITELIB}/jaraco/util/stream.pyc
 ${PYSITELIB}/jaraco/util/stream.pyo
+${PYSITELIB}/jaraco/util/string.py
 ${PYSITELIB}/jaraco/util/string.pyc
 ${PYSITELIB}/jaraco/util/string.pyo
+${PYSITELIB}/jaraco/util/subprocess.py
 ${PYSITELIB}/jaraco/util/subprocess.pyc
 ${PYSITELIB}/jaraco/util/subprocess.pyo
+${PYSITELIB}/jaraco/util/timing.py
 ${PYSITELIB}/jaraco/util/timing.pyc
 ${PYSITELIB}/jaraco/util/timing.pyo
+${PYSITELIB}/jaraco/util/ui.py
 ${PYSITELIB}/jaraco/util/ui.pyc
 ${PYSITELIB}/jaraco/util/ui.pyo
-${PYSITELIB}/jaraco/util/auth.py
-${PYSITELIB}/jaraco/util/bitutil.py
-${PYSITELIB}/jaraco/util/classutil.py
-${PYSITELIB}/jaraco/util/cmdline.py
-${PYSITELIB}/jaraco/util/cmp.py
-${PYSITELIB}/jaraco/util/collections.py
-${PYSITELIB}/jaraco/util/concurrency.py
-${PYSITELIB}/jaraco/util/context.py
-${PYSITELIB}/jaraco/util/dice.py
-${PYSITELIB}/jaraco/util/dictlib.py
-${PYSITELIB}/jaraco/util/editor.py
-${PYSITELIB}/jaraco/util/exceptions.py
-${PYSITELIB}/jaraco/util/filesystem.py
-${PYSITELIB}/jaraco/util/functools.py
-${PYSITELIB}/jaraco/util/input.py
-${PYSITELIB}/jaraco/util/itertools.py
-${PYSITELIB}/jaraco/util/logging.py
-${PYSITELIB}/jaraco/util/meta.py
-${PYSITELIB}/jaraco/util/numbers.py
-${PYSITELIB}/jaraco/util/properties.py
-${PYSITELIB}/jaraco/util/random.py
-${PYSITELIB}/jaraco/util/stream.py
-${PYSITELIB}/jaraco/util/string.py
-${PYSITELIB}/jaraco/util/subprocess.py
-${PYSITELIB}/jaraco/util/timing.py
-${PYSITELIB}/jaraco/util/ui.py
diff --git a/devel/py-more-itertools/Makefile b/devel/py-more-itertools/Makefile
index 16cfec440dc..d48e5166f02 100644
--- a/devel/py-more-itertools/Makefile
+++ b/devel/py-more-itertools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/05/09 21:22:37 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
 
 DISTNAME=	more-itertools-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=	${DISTNAME:C,-,_,}
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/source/m/more-itertools/
 
@@ -12,5 +13,5 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-more-itertools/PLIST b/devel/py-more-itertools/PLIST
index 63450919ad1..61a5a10f190 100644
--- a/devel/py-more-itertools/PLIST
+++ b/devel/py-more-itertools/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/09 21:22:37 imil Exp $
-${PYSITELIB}/more_itertools-${PKGVERSION}-py3.3.egg-info/PKG-INFO
-${PYSITELIB}/more_itertools-${PKGVERSION}-py3.3.egg-info/SOURCES.txt
-${PYSITELIB}/more_itertools-${PKGVERSION}-py3.3.egg-info/dependency_links.txt
-${PYSITELIB}/more_itertools-${PKGVERSION}-py3.3.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:44 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/more_itertools/__init__.py
 ${PYSITELIB}/more_itertools/__init__.pyc
 ${PYSITELIB}/more_itertools/__init__.pyo
+${PYSITELIB}/more_itertools/more.py
 ${PYSITELIB}/more_itertools/more.pyc
 ${PYSITELIB}/more_itertools/more.pyo
+${PYSITELIB}/more_itertools/recipes.py
 ${PYSITELIB}/more_itertools/recipes.pyc
 ${PYSITELIB}/more_itertools/recipes.pyo
-${PYSITELIB}/more_itertools/more.py
-${PYSITELIB}/more_itertools/recipes.py
 ${PYSITELIB}/more_itertools/tests/__init__.py
 ${PYSITELIB}/more_itertools/tests/__init__.pyc
 ${PYSITELIB}/more_itertools/tests/__init__.pyo
+${PYSITELIB}/more_itertools/tests/test_more.py
 ${PYSITELIB}/more_itertools/tests/test_more.pyc
 ${PYSITELIB}/more_itertools/tests/test_more.pyo
+${PYSITELIB}/more_itertools/tests/test_recipes.py
 ${PYSITELIB}/more_itertools/tests/test_recipes.pyc
 ${PYSITELIB}/more_itertools/tests/test_recipes.pyo
-${PYSITELIB}/more_itertools/tests/test_more.py
-${PYSITELIB}/more_itertools/tests/test_recipes.py
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index d50f7c571ed..0acbbec71fb 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/05/08 15:18:10 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
 
 DISTNAME=	oauthlib-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,5 +12,5 @@ LICENSE=	original-bsd
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-oauthlib/PLIST b/security/py-oauthlib/PLIST
index 044d09d49b1..a76dc49a038 100644
--- a/security/py-oauthlib/PLIST
+++ b/security/py-oauthlib/PLIST
@@ -1,138 +1,138 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/08 15:18:10 imil Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:44 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/oauthlib/__init__.py
 ${PYSITELIB}/oauthlib/__init__.pyc
 ${PYSITELIB}/oauthlib/__init__.pyo
+${PYSITELIB}/oauthlib/common.py
 ${PYSITELIB}/oauthlib/common.pyc
 ${PYSITELIB}/oauthlib/common.pyo
-${PYSITELIB}/oauthlib/uri_validate.pyc
-${PYSITELIB}/oauthlib/uri_validate.pyo
-${PYSITELIB}/oauthlib/common.py
 ${PYSITELIB}/oauthlib/oauth1/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/__init__.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyo
 ${PYSITELIB}/oauthlib/oauth2/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/__init__.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyo
 ${PYSITELIB}/oauthlib/uri_validate.py
+${PYSITELIB}/oauthlib/uri_validate.pyc
+${PYSITELIB}/oauthlib/uri_validate.pyo
diff --git a/security/py-requests-oauthlib/Makefile b/security/py-requests-oauthlib/Makefile
index 43a8bb92d3a..fa3917e341f 100644
--- a/security/py-requests-oauthlib/Makefile
+++ b/security/py-requests-oauthlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/05/08 15:25:54 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:45 joerg Exp $
 
 DISTNAME=	requests-oauthlib-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=	${DISTNAME:S,-,_,}
 CATEGORIES=	security
 MASTER_SITES=	https://pypi.python.org/packages/source/r/requests-oauthlib/
 
@@ -15,5 +16,5 @@ USE_LANGUAGES=	# none
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.2.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-oauthlib>=0.6.1:../../security/py-oauthlib
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-requests-oauthlib/PLIST b/security/py-requests-oauthlib/PLIST
index b5a09da501b..bfd432bca1c 100644
--- a/security/py-requests-oauthlib/PLIST
+++ b/security/py-requests-oauthlib/PLIST
@@ -1,34 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/08 15:25:54 imil Exp $
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/PKG-INFO
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/SOURCES.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/dependency_links.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/not-zip-safe
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/requires.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:45 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/requests_oauthlib/__init__.py
 ${PYSITELIB}/requests_oauthlib/__init__.pyc
 ${PYSITELIB}/requests_oauthlib/__init__.pyo
-${PYSITELIB}/requests_oauthlib/oauth1_auth.pyc
-${PYSITELIB}/requests_oauthlib/oauth1_auth.pyo
-${PYSITELIB}/requests_oauthlib/oauth1_session.pyc
-${PYSITELIB}/requests_oauthlib/oauth1_session.pyo
-${PYSITELIB}/requests_oauthlib/oauth2_auth.pyc
-${PYSITELIB}/requests_oauthlib/oauth2_auth.pyo
-${PYSITELIB}/requests_oauthlib/oauth2_session.pyc
-${PYSITELIB}/requests_oauthlib/oauth2_session.pyo
-${PYSITELIB}/requests_oauthlib/utils.pyc
-${PYSITELIB}/requests_oauthlib/utils.pyo
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.pyo
+${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.pyo
+${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.pyo
-${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.py
-${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.py
 ${PYSITELIB}/requests_oauthlib/oauth1_auth.py
+${PYSITELIB}/requests_oauthlib/oauth1_auth.pyc
+${PYSITELIB}/requests_oauthlib/oauth1_auth.pyo
 ${PYSITELIB}/requests_oauthlib/oauth1_session.py
+${PYSITELIB}/requests_oauthlib/oauth1_session.pyc
+${PYSITELIB}/requests_oauthlib/oauth1_session.pyo
 ${PYSITELIB}/requests_oauthlib/oauth2_auth.py
+${PYSITELIB}/requests_oauthlib/oauth2_auth.pyc
+${PYSITELIB}/requests_oauthlib/oauth2_auth.pyo
 ${PYSITELIB}/requests_oauthlib/oauth2_session.py
+${PYSITELIB}/requests_oauthlib/oauth2_session.pyc
+${PYSITELIB}/requests_oauthlib/oauth2_session.pyo
 ${PYSITELIB}/requests_oauthlib/utils.py
+${PYSITELIB}/requests_oauthlib/utils.pyc
+${PYSITELIB}/requests_oauthlib/utils.pyo
diff --git a/www/py-flask-sslify/Makefile b/www/py-flask-sslify/Makefile
index aff5e3fae8c..8a14450bf0e 100644
--- a/www/py-flask-sslify/Makefile
+++ b/www/py-flask-sslify/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/05/03 01:38:37 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:45 joerg Exp $
 
 DISTNAME=	Flask-SSLify-0.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=	${DISTNAME:S,-,_,}
 CATEGORIES=	python security www
 MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-SSLify/
 
diff --git a/www/py-flask-sslify/PLIST b/www/py-flask-sslify/PLIST
index d252899253c..27f5fd612b0 100644
--- a/www/py-flask-sslify/PLIST
+++ b/www/py-flask-sslify/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/03 01:38:37 rodent Exp $
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/not-zip-safe
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/requires.txt
-${PYSITELIB}/Flask_SSLify-${PKGVERSION}-py2.7.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:45 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/flask_sslify.py
 ${PYSITELIB}/flask_sslify.pyc
 ${PYSITELIB}/flask_sslify.pyo
diff --git a/www/py-flask-testing/Makefile b/www/py-flask-testing/Makefile
index 7ac8f293486..26ac6533aec 100644
--- a/www/py-flask-testing/Makefile
+++ b/www/py-flask-testing/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/05/03 02:13:35 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:45 joerg Exp $
 
 DISTNAME=	Flask-Testing-0.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=	${DISTNAME:S,-,_,}
 CATEGORIES=	python www
 MASTER_SITES=	https://pypi.python.org/packages/source/F/Flask-Testing/
 
diff --git a/www/py-flask-testing/PLIST b/www/py-flask-testing/PLIST
index fe191093410..a68751ced91 100644
--- a/www/py-flask-testing/PLIST
+++ b/www/py-flask-testing/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/03 02:13:35 rodent Exp $
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/not-zip-safe
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/requires.txt
-${PYSITELIB}/Flask_Testing-${PKGVERSION}-py2.7.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:45 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/flask_testing/__init__.py
 ${PYSITELIB}/flask_testing/__init__.pyc
 ${PYSITELIB}/flask_testing/__init__.pyo