Improve EGG_NAME default to work for packages with '-' in their name.

Remove now unnecessary overrides in various packages.

58 files changed, 58 insertions, 145 deletions

diff --git a/www/py-blosxom/Makefile b/www/py-blosxom/Makefile
index 034bdef060a..cc131fa400d 100644
--- a/www/py-blosxom/Makefile
+++ b/www/py-blosxom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2014/12/31 13:57:30 wiz Exp $
 
 PYBLOXSOMVERS=	1.5.3
 DISTNAME=	pyblosxom-${PYBLOXSOMVERS}
@@ -24,7 +24,6 @@ DOCFILES=       AUTHORS INSTALL LICENSE README.rst UPGRADE WHATSNEW
 INSTALLATION_DIRS=	${DOC_SUBDIR}
 
 REPLACE_PYTHON=		Pyblosxom/data/pyblosxom.cgi
-EGG_NAME=		${DISTNAME}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 503c133852c..f912dafc818 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/09/14 16:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	CherryPy-3.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,6 @@ COMMENT=	CherryPy is a pythonic, object-oriented HTTP framework
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=		# none
-EGG_NAME=		${DISTNAME}
 
 REPLACE_PYTHON=		cherrypy/cherryd
 REPLACE_PYTHON+=	cherrypy/test/sessiondemo.py
diff --git a/www/py-django-appconf/Makefile b/www/py-django-appconf/Makefile
index c0083a7e106..06c5c121f22 100644
--- a/www/py-django-appconf/Makefile
+++ b/www/py-django-appconf/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/04/27 10:50:13 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	django-appconf-0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index 4f9de48ecf5..36f6ecdd926 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	django-appmedia-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/divio/django-appmedia
 COMMENT=	Handling django app media
 LICENSE=	modified-bsd
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# empty
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.0.1
 
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index e5fa475536c..387efb683c4 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/04/12 09:00:23 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	django-classy-tags-0.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=	http://github.com/ojii/django-classy-tags/
 COMMENT=	Class based template tags for Django
 LICENSE=	modified-bsd
 
-EGG_NAME=		${DISTNAME:S/-/_/:S/-/_/}
 USE_LANGUAGES=		# empty
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index cf5aa29d112..7e327260c12 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/11/29 15:06:12 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	django-cms-3.0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,6 @@ DEPENDS+=	${PYPKGPREFIX}-djangocms-admin-style-[0-9]*:../../www/py-djangocms-adm
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# empty
 
 REPLACE_SH=	cms/static/cms/js/select2/release.sh
diff --git a/www/py-django-easy-thumbnails/Makefile b/www/py-django-easy-thumbnails/Makefile
index ee8cc67b49a..0c5bedefb2e 100644
--- a/www/py-django-easy-thumbnails/Makefile
+++ b/www/py-django-easy-thumbnails/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/12 10:10:27 adam Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	easy-thumbnails-1.5
 PKGNAME=	${PYPKGPREFIX}-django-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# empty
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-django-inline-ordering/Makefile b/www/py-django-inline-ordering/Makefile
index 076307a1254..ddd730c9d4d 100644
--- a/www/py-django-inline-ordering/Makefile
+++ b/www/py-django-inline-ordering/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/01/28 21:07:15 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	django-inline-ordering-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/centralniak/django-inline-ordering
 COMMENT=	Django app to ease ordering of related data
 LICENSE=	modified-bsd
 
-EGG_NAME=		${DISTNAME:S/-/_/:S/-/_/}
 USE_LANGUAGES=		# empty
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
diff --git a/www/py-django-mezzanine-filebrowser/Makefile b/www/py-django-mezzanine-filebrowser/Makefile
index cc8f4bc53e8..79ec5745de2 100644
--- a/www/py-django-mezzanine-filebrowser/Makefile
+++ b/www/py-django-mezzanine-filebrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	filebrowser-safe-0.2.13
 PKGNAME=	${PYPKGPREFIX}-django-mezzanine-${DISTNAME:S/-safe//}
@@ -19,7 +19,5 @@ USE_LANGUAGES=		# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.2.13
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django-mezzanine-grappelli/Makefile b/www/py-django-mezzanine-grappelli/Makefile
index c5e129c78f0..85ce3bce36c 100644
--- a/www/py-django-mezzanine-grappelli/Makefile
+++ b/www/py-django-mezzanine-grappelli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	grappelli-safe-0.2.11
 PKGNAME=	${PYPKGPREFIX}-django-mezzanine-${DISTNAME:S/-safe//}
@@ -17,8 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.2.11
 
 .include "../../lang/python/distutils.mk"
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index f82f92ad748..e75841bc949 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/09 09:58:21 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	django-mptt-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Utilities for implementing Modified Preorder Tree Traversal
 LICENSE=	mit
 
 USE_LANGUAGES=		# empty
-EGG_NAME=		${DISTNAME:S/-/_/}
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 9cca28be281..2fc199d3d9b 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:25 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	django-photologue-2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-imaging-[0-9]*:../../graphics/py-imaging
 DEPENDS+=	${PYPKGPREFIX}-django-south-[0-9]*:../../www/py-django-south
 DEPENDS+=	${PYPKGPREFIX}-django-tagging-[0-9]*:../../www/py-django-tagging
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-django-tagging, py-imaging
 
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 4e8c824b1c9..6b07d3745e0 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/03/13 07:08:34 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	django-sekizai-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Django Template Blocks with extra functionality
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=		# empty
-EGG_NAME=		${DISTNAME:S/-/_/}
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
diff --git a/www/py-django-south/Makefile b/www/py-django-south/Makefile
index d735d0761b9..5253728e351 100644
--- a/www/py-django-south/Makefile
+++ b/www/py-django-south/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/11/23 13:31:07 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	South-1.0.1
 PKGNAME=	${PYPKGPREFIX}-django-${DISTNAME:tl}
@@ -11,7 +11,6 @@ COMMENT=	Intelligent schema and data migrations for Django projects
 LICENSE=	apache-2.0
 
 WRKSRC=			${WRKDIR}/South-${PKGVERSION_NOREV}
-#EGG_NAME=		${DISTNAME}
 USE_LANGUAGES=		# empty
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index dc740249007..0de601aed46 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/05/09 07:37:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	django-tagging-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
 USE_LANGUAGES=		# none
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.1
-EGG_NAME=	${DISTNAME:S/-/_/}
 
 INSTALLATION_DIRS+=	share/doc/py-django-tagging
 
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index 899d2e9a61e..c668d2960b3 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/12/03 22:55:29 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	django-tastypie-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,8 +20,6 @@ PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-admin-style/Makefile b/www/py-djangocms-admin-style/Makefile
index e0e2864bf7f..015a49620eb 100644
--- a/www/py-djangocms-admin-style/Makefile
+++ b/www/py-djangocms-admin-style/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/11/23 13:17:10 adam Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-admin-style-0.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/divio/djangocms-admin-style/
 COMMENT=	Adds pretty CSS styles for the django CMS admin interface
 LICENSE=	modified-bsd
 
-EGG_NAME=		${DISTNAME:S/-/_/:S/-/_/}
 USE_LANGUAGES=		# empty
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
diff --git a/www/py-djangocms-file/Makefile b/www/py-djangocms-file/Makefile
index 1bff249b828..a03fb79c75d 100644
--- a/www/py-djangocms-file/Makefile
+++ b/www/py-djangocms-file/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-file-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-flash/Makefile b/www/py-djangocms-flash/Makefile
index c26da068f2e..3bd74c9d2d4 100644
--- a/www/py-djangocms-flash/Makefile
+++ b/www/py-djangocms-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-flash-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-googlemap/Makefile b/www/py-djangocms-googlemap/Makefile
index e676bffbce6..0b31f1ded27 100644
--- a/www/py-djangocms-googlemap/Makefile
+++ b/www/py-djangocms-googlemap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-googlemap-0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-inherit/Makefile b/www/py-djangocms-inherit/Makefile
index d0fa11efde3..502e064c2db 100644
--- a/www/py-djangocms-inherit/Makefile
+++ b/www/py-djangocms-inherit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-inherit-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-picture/Makefile b/www/py-djangocms-picture/Makefile
index a0b5c981677..bfb8c6d33f5 100644
--- a/www/py-djangocms-picture/Makefile
+++ b/www/py-djangocms-picture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-picture-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-teaser/Makefile b/www/py-djangocms-teaser/Makefile
index 75058ddb220..cad0ea33e78 100644
--- a/www/py-djangocms-teaser/Makefile
+++ b/www/py-djangocms-teaser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:31 wiz Exp $
 
 DISTNAME=	djangocms-teaser-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-text-ckeditor/Makefile b/www/py-djangocms-text-ckeditor/Makefile
index af54944878f..e20927e984d 100644
--- a/www/py-djangocms-text-ckeditor/Makefile
+++ b/www/py-djangocms-text-ckeditor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	djangocms-text-ckeditor-2.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangocms-video/Makefile b/www/py-djangocms-video/Makefile
index a0fb8eb8dab..c781eb76f0a 100644
--- a/www/py-djangocms-video/Makefile
+++ b/www/py-djangocms-video/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/30 10:18:38 adam Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	djangocms-video-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# none
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-djangorestframework/Makefile b/www/py-djangorestframework/Makefile
index 6c0025d423d..8abb123ff2e 100644
--- a/www/py-djangorestframework/Makefile
+++ b/www/py-djangorestframework/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:25 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	djangorestframework-0.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
-EGG_NAME=		${DISTNAME}
 USE_LANGUAGES=		# empty
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.2.3
 
diff --git a/www/py-flask-admin/Makefile b/www/py-flask-admin/Makefile
index f51439f3e1d..27a5a60825d 100644
--- a/www/py-flask-admin/Makefile
+++ b/www/py-flask-admin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/04/26 17:44:52 kleink Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Admin-1.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,8 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	pax
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.7:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-wtforms-[0-9]*:../../www/py-wtforms
 
diff --git a/www/py-flask-assets/Makefile b/www/py-flask-assets/Makefile
index 8ae47a00c41..c28ab07f892 100644
--- a/www/py-flask-assets/Makefile
+++ b/www/py-flask-assets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/22 19:30:32 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Assets-0.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.8:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-webassets>=0.10:../../www/py-webassets
 
diff --git a/www/py-flask-babel/Makefile b/www/py-flask-babel/Makefile
index 0b4a4bf1c5c..690c6cfba45 100644
--- a/www/py-flask-babel/Makefile
+++ b/www/py-flask-babel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/12 10:46:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Babel-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,8 +13,6 @@ LICENSE=	modified-bsd
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.5:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-speaklater>=1.2:../../devel/py-speaklater
 DEPENDS+=	${PYPKGPREFIX}-babel>=1.0:../../devel/py-babel
diff --git a/www/py-flask-babelex/Makefile b/www/py-flask-babelex/Makefile
index 38714c85730..3167757414e 100644
--- a/www/py-flask-babelex/Makefile
+++ b/www/py-flask-babelex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/21 11:23:09 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-BabelEx-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-babel>=1.0:../../devel/py-babel
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-speaklater>=1.2:../../devel/py-speaklater
diff --git a/www/py-flask-bootstrap/Makefile b/www/py-flask-bootstrap/Makefile
index 73eaa8ee541..e728a680dbb 100644
--- a/www/py-flask-bootstrap/Makefile
+++ b/www/py-flask-bootstrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/12/03 23:00:11 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Bootstrap-3.3.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,7 +13,6 @@ LICENSE=	apache-2.0 AND mit AND modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.8:../../www/py-flask
 
 USE_LANGUAGES=	# none
-EGG_NAME=	${DISTNAME:S/-/_/1}
 
 REPLACE_PYTHON+=	flask_bootstrap/__init__.py
 
diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile
index c6185cda7e1..15bcb8241d5 100644
--- a/www/py-flask-cache/Makefile
+++ b/www/py-flask-cache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/26 17:01:50 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Cache-0.13.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,5 @@ DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-flask-debugtoolbar/Makefile b/www/py-flask-debugtoolbar/Makefile
index b55b825fc56..7e5c99c44f3 100644
--- a/www/py-flask-debugtoolbar/Makefile
+++ b/www/py-flask-debugtoolbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/05/03 01:40:24 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-DebugToolbar-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,8 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 post-install:
 	${CHMOD} -x ${DESTDIR}${PREFIX}/${PYSITELIB}/flask_debugtoolbar/static/codemirror/mode/properties/index.html
 	${CHMOD} -x ${DESTDIR}${PREFIX}/${PYSITELIB}/flask_debugtoolbar/static/codemirror/mode/properties/properties.js
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index 273b9eb01ff..aa34be5190f 100644
--- a/www/py-flask-flatpages/Makefile
+++ b/www/py-flask-flatpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/04/04 18:20:35 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-FlatPages-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/SimonSapin/Flask-FlatPages
 COMMENT=	Provides flat static pages to a Flask application
 LICENSE=	modified-bsd
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 USE_LANGUAGES=	# empty
 
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
diff --git a/www/py-flask-frozen/Makefile b/www/py-flask-frozen/Makefile
index 4886de50919..16007952dca 100644
--- a/www/py-flask-frozen/Makefile
+++ b/www/py-flask-frozen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Frozen-Flask-0.11
 PKGNAME=	${PYPKGPREFIX}-flask-frozen-0.11
@@ -10,8 +10,6 @@ HOMEPAGE=	https://github.com/SimonSapin/Frozen-Flask
 COMMENT=	Freezes a Flask application into a set of static files
 LICENSE=	modified-bsd
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 USE_LANGUAGES=	# empty
 
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.7:../../www/py-flask
diff --git a/www/py-flask-login/Makefile b/www/py-flask-login/Makefile
index 91673b74521..c08109a3fe1 100644
--- a/www/py-flask-login/Makefile
+++ b/www/py-flask-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/21 08:59:18 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Login-0.2.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-flask-mail/Makefile b/www/py-flask-mail/Makefile
index 1a8ade07bec..010afb2d1a8 100644
--- a/www/py-flask-mail/Makefile
+++ b/www/py-flask-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/10/23 14:31:07 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:32 wiz Exp $
 
 DISTNAME=	Flask-Mail-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-blinker-[0-9]*:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 
diff --git a/www/py-flask-principal/Makefile b/www/py-flask-principal/Makefile
index 3543b88d63e..3c507621de5 100644
--- a/www/py-flask-principal/Makefile
+++ b/www/py-flask-principal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-Principal-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-blinker-[0-9]*:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 
diff --git a/www/py-flask-rest/Makefile b/www/py-flask-rest/Makefile
index 063a8f0cd36..2000e29a81b 100644
--- a/www/py-flask-rest/Makefile
+++ b/www/py-flask-rest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/01/08 19:28:12 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-REST-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/ametaireau/flask-rest/
 COMMENT=	Simple REST toolkit for Flask
 LICENSE=	modified-bsd
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 USE_LANGUAGES=	# empty
 
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
diff --git a/www/py-flask-script/Makefile b/www/py-flask-script/Makefile
index 6cf1a77285a..2faeff37d94 100644
--- a/www/py-flask-script/Makefile
+++ b/www/py-flask-script/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/05/21 09:03:43 kleink Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-Script-2.0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-flask-security/Makefile b/www/py-flask-security/Makefile
index b8eb5d3012c..f7d87222f93 100644
--- a/www/py-flask-security/Makefile
+++ b/www/py-flask-security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/10/23 14:34:42 kleink Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-Security-1.7.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -20,8 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.1:../../security/py-passlib
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 post-extract:
 	${FIND} ${WRKSRC} -type f -name .DS_Store -exec ${RM} {} \;
 
diff --git a/www/py-flask-sqlalchemy/Makefile b/www/py-flask-sqlalchemy/Makefile
index 22cb03804a6..b695b740251 100644
--- a/www/py-flask-sqlalchemy/Makefile
+++ b/www/py-flask-sqlalchemy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/10/23 14:42:05 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-SQLAlchemy-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.10:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.6:../../databases/py-sqlalchemy
 
diff --git a/www/py-flask-sslify/Makefile b/www/py-flask-sslify/Makefile
index 8a14450bf0e..51e574fde06 100644
--- a/www/py-flask-sslify/Makefile
+++ b/www/py-flask-sslify/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:45 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:33 wiz 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-testing/Makefile b/www/py-flask-testing/Makefile
index 80566cd576b..9fb1a59a7e6 100644
--- a/www/py-flask-testing/Makefile
+++ b/www/py-flask-testing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/08/07 02:29:08 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-Testing-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,5 @@ USE_LANGUAGES=	# none
 
 .include "options.mk"
 
-EGG_NAME=	${DISTNAME:S,-,_,}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index 0b38361f36c..54f180fc4ad 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/01/08 18:06:29 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-Uploads-0.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	#empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.5:../../www/py-flask
 
 .include "../../lang/python/egg.mk"
diff --git a/www/py-flask-user/Makefile b/www/py-flask-user/Makefile
index c86ff87e38f..4866936d96b 100644
--- a/www/py-flask-user/Makefile
+++ b/www/py-flask-user/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/12/05 03:01:20 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-User-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -25,8 +25,6 @@ DEPENDS+=	${PYPKGPREFIX}-flask-wtf-[0-9]*:../../www/py-flask-wtf
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 post-install:
 	${CHMOD} -x ${DESTDIR}${PREFIX}/${PYSITELIB}/flask_user/translations/zh/LC_MESSAGES/flask_user.mo
 
diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index 86d6c36c0b1..b549789f11d 100644
--- a/www/py-flask-wtf/Makefile
+++ b/www/py-flask-wtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/11/25 09:34:30 kleink Exp $
+# $NetBSD: Makefile,v 1.16 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	Flask-WTF-0.10.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "options.mk"
 
 DEPENDS+=	${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
diff --git a/www/py-google-api-python-client-py3/Makefile b/www/py-google-api-python-client-py3/Makefile
index 3a49e8f7044..471735d0f14 100644
--- a/www/py-google-api-python-client-py3/Makefile
+++ b/www/py-google-api-python-client-py3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/05 21:40:40 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	google-api-python-client-py3-1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ USE_LANGUAGES=			# none
 PYTHON_VERSIONS_INCOMPATIBLE=	26 27 # won't CONFLICT with the 2.x version
 
 REPLACE_PYTHON+=	apiclient/*.py oauth2client/*.py
-EGG_NAME=		${DISTNAME:S/-/_/g:S/3_/3-/1}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index 3f7837529af..d60eaf55d9f 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/24 14:45:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	google-api-python-client-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,8 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-uritemplate-[0-9]*:../../textproc/py-uritemplate
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 1.3.1
 
-EGG_NAME=		google_api_python_client-${PKGVERSION_NOREV}
-
 # doesn't work, but doesn't matter
 # see also https://github.com/google/google-api-python-client/issues/40
 REPLACE_PYTHON+=	googleapiclient/errors.py
diff --git a/www/py-http-parser/Makefile b/www/py-http-parser/Makefile
index 4534eea7ced..95a6397be10 100644
--- a/www/py-http-parser/Makefile
+++ b/www/py-http-parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/27 18:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:33 wiz Exp $
 
 DISTNAME=	http-parser-0.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	HTTP request/response parser
 LICENSE=	mit
 
 USE_LANGUAGES=	c
-EGG_NAME=	${DISTNAME:S/-/_/1}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-python-digest/Makefile b/www/py-python-digest/Makefile
index f778dc1700f..7b49c1d3074 100644
--- a/www/py-python-digest/Makefile
+++ b/www/py-python-digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/06/02 04:27:32 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	python-digest-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
-EGG_NAME=			${DISTNAME:S/-/_/1}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-python-mimeparse/Makefile b/www/py-python-mimeparse/Makefile
index fea75bea1f6..2be7e5539c0 100644
--- a/www/py-python-mimeparse/Makefile
+++ b/www/py-python-mimeparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/06/02 03:19:30 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	python-mimeparse-0.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,5 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-python3-digest/Makefile b/www/py-python3-digest/Makefile
index 092e0076827..c668f55edc8 100644
--- a/www/py-python3-digest/Makefile
+++ b/www/py-python3-digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/07 14:26:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	python3-digest-1.8b4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python3/python/}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	26 27
-EGG_NAME=			${DISTNAME:S/-/_/1}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile
index 53da9a1862b..51c7f027df1 100644
--- a/www/py-recaptcha/Makefile
+++ b/www/py-recaptcha/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/03/24 16:44:37 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	recaptcha-client-1.0.6
 PKGNAME=	${PYPKGPREFIX}-recaptcha-1.0.6
 CATEGORIES=	www devel python
 MASTER_SITES=	http://pypi.python.org/packages/source/r/recaptcha-client/
 
-EGG_NAME=	recaptcha_client-${PKGVERSION_NOREV}
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cheeseshop.python.org/pypi/recaptcha-client
 COMMENT=	Plugin for reCAPTCHA and reCAPTCHA Mailhide
diff --git a/www/py-wtforms-alchemy/Makefile b/www/py-wtforms-alchemy/Makefile
index 46c667057e3..d7c8a99cf61 100644
--- a/www/py-wtforms-alchemy/Makefile
+++ b/www/py-wtforms-alchemy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/11/10 18:36:49 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	WTForms-Alchemy-0.13.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -22,7 +22,5 @@ DEPENDS+=	${PYPKGPREFIX}-ordereddict>=1.1:../../devel/py-ordereddict
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-wtforms-components/Makefile b/www/py-wtforms-components/Makefile
index 42263af6a93..ccac4ab7722 100644
--- a/www/py-wtforms-components/Makefile
+++ b/www/py-wtforms-components/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/11/10 18:46:40 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	WTForms-Components-0.9.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -21,7 +21,5 @@ USE_LANGUAGES=	# none
 
 .include "options.mk"
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-wtforms-recaptcha/Makefile b/www/py-wtforms-recaptcha/Makefile
index e67a4a6f4ae..d6214a20f10 100644
--- a/www/py-wtforms-recaptcha/Makefile
+++ b/www/py-wtforms-recaptcha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/07/16 23:30:01 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	wtforms-recaptcha-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,5 @@ DEPENDS+=	${PYPKGPREFIX}-wtforms>=0.6.1:../../www/py-wtforms
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-wtforms-test/Makefile b/www/py-wtforms-test/Makefile
index b6276125014..6e9d61b6430 100644
--- a/www/py-wtforms-test/Makefile
+++ b/www/py-wtforms-test/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/06/14 15:01:58 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:34 wiz Exp $
 
 DISTNAME=	WTForms-Test-0.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,5 @@ DEPENDS+=	${PYPKGPREFIX}-wtforms>=1.0.2:../../www/py-wtforms
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"