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

Remove now unnecessary overrides in various packages.

127 files changed, 130 insertions, 316 deletions

diff --git a/audio/py-mpd/Makefile b/audio/py-mpd/Makefile
index 8606c2dc057..5d12b9d3f7d 100644
--- a/audio/py-mpd/Makefile
+++ b/audio/py-mpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/17 14:47:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	python-mpd-0.3.0
 PKGNAME=	${PYPKGPREFIX}-mpd-0.3.0
@@ -13,7 +13,5 @@ LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index b5f5ec0a2c3..c3d4d90e4b6 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/11/21 23:22:18 mef Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	python-musicbrainz2-0.4.1
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -16,8 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PYTHON_SELF_CONFLICT=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../audio/libdiscid/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/py-python-termstyle/Makefile b/comms/py-python-termstyle/Makefile
index 5b384ac3a67..37fed74b37a 100644
--- a/comms/py-python-termstyle/Makefile
+++ b/comms/py-python-termstyle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/06 03:19:01 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	python-termstyle-0.1.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON=	termstyle.py
-EGG_NAME=	${DISTNAME:S/-/_/1}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 7bb080d421e..3ab1f9eaa58 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/10/07 16:47:21 adam Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	apsw-3.8.4.2-r1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-r/pl/}
@@ -14,8 +14,6 @@ LICENSE=	zlib
 
 USE_LANGUAGES=	c
 
-EGG_NAME=	${DISTNAME:S/-r/_r/}
-
 BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/databases/py-cassa/Makefile b/databases/py-cassa/Makefile
index e1421e8c380..ce3e7db9e16 100644
--- a/databases/py-cassa/Makefile
+++ b/databases/py-cassa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/05/09 07:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	pycassa-0.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://github.com/downloads/pycassa/pycassa/
 
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index abf06428d9f..81cb0d3de82 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	python-cdb-0.35
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://pilcrow.madison.wi.us/
 COMMENT=	Python extension module for cdb
 LICENSE=	gnu-gpl-v2
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.35
 
 .include "../../lang/python/distutils.mk"
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 130a4d493a9..3640feb39ab 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2014/10/12 14:53:38 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2014/12/31 13:57:25 wiz Exp $
 
 DISTNAME=	python-ldap-2.4.18
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.python-ldap.org/
 COMMENT=	LDAP client API for Python
 LICENSE=	python-software-foundation
 
-EGG_NAME=	${DISTNAME:S/python-ldap/python_ldap/}
-
 PY_LDAP_LIBRARY_DIRS=		${BUILDLINK_PREFIX.openldap-client}/lib
 PY_LDAP_INCLUDE_DIRS=		${BUILDLINK_PREFIX.openldap-client}/include
 PY_LDAP_LIBS=			ldap_r lber ssl crypto
diff --git a/databases/py-mysql-connector/Makefile b/databases/py-mysql-connector/Makefile
index 03e11cdcdad..6f07a614791 100644
--- a/databases/py-mysql-connector/Makefile
+++ b/databases/py-mysql-connector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/11/23 13:59:41 adam Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	mysql-connector-python-2.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
@@ -10,8 +10,6 @@ HOMEPAGE=	https://dev.mysql.com/downloads/connector/python/
 COMMENT=	Standardized mysql database driver for Python development
 LICENSE=	gnu-gpl-v2
 
-EGG_NAME=	${DISTNAME:S/-/_/:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index b2219e9724e..08007917be2 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2014/05/09 07:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	MySQL-python-1.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/MySQL-python/mysqldb/}
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.2.5
 
-EGG_NAME=		${DISTNAME:S/MySQL-/MySQL_/}
 USE_LANGUAGES=		c
 
 # These files must not be world-writable.
diff --git a/databases/py-python-sql/Makefile b/databases/py-python-sql/Makefile
index bede222d448..805e489147d 100644
--- a/databases/py-python-sql/Makefile
+++ b/databases/py-python-sql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/08/07 01:15:25 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	python-sql-0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	sql/aggregate.py
-EGG_NAME=		${DISTNAME:S/-/_/1}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/databases/py-redis-py/Makefile b/databases/py-redis-py/Makefile
index 894bbfb955e..1641351b3a5 100644
--- a/databases/py-redis-py/Makefile
+++ b/databases/py-redis-py/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/10/05 20:12:16 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	redis-2.10.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-/-py-/1}
@@ -12,7 +12,5 @@ LICENSE=	mit
 
 DEPENDS+=	redis-[0-9]*:../../databases/redis
 
-EGG_NAME=	${DISTNAME}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-sqlalchemy-i18n/Makefile b/databases/py-sqlalchemy-i18n/Makefile
index c64ee8715d2..3c7c8382f98 100644
--- a/databases/py-sqlalchemy-i18n/Makefile
+++ b/databases/py-sqlalchemy-i18n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/06 03:26:17 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	SQLAlchemy-i18n-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,8 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index d415669911e..968df050337 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/09/10 19:01:03 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	sqlalchemy-migrate-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -46,8 +46,6 @@ REPLACE_PYTHON+=	migrate/versioning/util/__init__.py
 REPLACE_PYTHON+=	migrate/versioning/util/keyedinstance.py
 REPLACE_PYTHON+=	migrate/versioning/version.py
 
-EGG_NAME=		${DISTNAME:S/-/_/1}
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-sqlalchemy-utils/Makefile b/databases/py-sqlalchemy-utils/Makefile
index 369c8ac5ec7..a0f8f7f828e 100644
--- a/databases/py-sqlalchemy-utils/Makefile
+++ b/databases/py-sqlalchemy-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/12/03 22:16:52 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	SQLAlchemy-Utils-0.27.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,7 +17,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/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index b3845637a7d..877708b5578 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/05/09 07:36:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	bzr-svn-${VER}
 CATEGORIES=	devel scm
@@ -25,7 +25,6 @@ USE_LANGUAGES=	#none
 #TEST_DEPENDS+=	${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 #TEST_TARGET=	check-verbose
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-subvertpy, py-paramiko
 
 .include "../../devel/bzr/plugin.mk"
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 7f59dd35eac..f327253d1c1 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2014/05/09 07:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	hg-git-0.4.0
-EGG_NAME=	${DISTNAME:S/hg-/hg_/}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/devel/py-buildbot-slave/Makefile b/devel/py-buildbot-slave/Makefile
index a1f1c547862..b1fc00084ba 100644
--- a/devel/py-buildbot-slave/Makefile
+++ b/devel/py-buildbot-slave/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/05/09 07:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=		buildbot-slave-0.8.8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=		buildbot_slave-0.8.8
 CATEGORIES=		devel net python
 MASTER_SITES=		http://buildbot.googlecode.com/files/
 
diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile
index 2511b96926a..4ffc50a509d 100644
--- a/devel/py-buildbot/Makefile
+++ b/devel/py-buildbot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/05/09 07:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=		buildbot-0.8.8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=		${DISTNAME}
 CATEGORIES=		devel net python
 MASTER_SITES=		http://buildbot.googlecode.com/files/
 
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index 4ae9e2e9eae..05451e2a2ee 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/05/09 07:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	python-daemon-1.6
-EGG_NAME=	${DISTNAME:S/-/_/}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
 CATEGORIES=	devel python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/python-daemon/
diff --git a/devel/py-decorator/Makefile b/devel/py-decorator/Makefile
index eff1bb9881e..b89382625e5 100644
--- a/devel/py-decorator/Makefile
+++ b/devel/py-decorator/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/06/14 14:27:53 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=		decorator-3.4.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=		${DISTNAME}
 CATEGORIES=		devel python
 MASTER_SITES=		http://pypi.python.org/packages/source/d/decorator/
 
diff --git a/devel/py-dulwich/Makefile b/devel/py-dulwich/Makefile
index 4ed8cee4c1c..4674137c62b 100644
--- a/devel/py-dulwich/Makefile
+++ b/devel/py-dulwich/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/05/09 07:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/31 13:57:26 wiz Exp $
 
 DISTNAME=	dulwich-0.9.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	https://pypi.python.org/packages/source/d/dulwich/
 
diff --git a/devel/py-gflags/Makefile b/devel/py-gflags/Makefile
index 3988ff8745a..e8e7b6bc01c 100644
--- a/devel/py-gflags/Makefile
+++ b/devel/py-gflags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/26 15:01:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	python-gflags-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 2.0
 
-EGG_NAME=		${DISTNAME:S/-/_/}
-
 REPLACE_PYTHON+=	*.py
 
 .include "../../lang/python/application.mk"
diff --git a/devel/py-logilab-astng/Makefile b/devel/py-logilab-astng/Makefile
index 794b5d6623d..610cf3326e9 100644
--- a/devel/py-logilab-astng/Makefile
+++ b/devel/py-logilab-astng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/12/05 17:20:56 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	logilab-astng-0.24.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-logilab-common>=0.53.0:../../devel/py-logilab-common
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-mxDateTime via py-logilab-common
-EGG_NAME=			${DISTNAME:S/-/_/1}
 
 do-test:
 	cd ${WRKSRC} && ${SH} test/fulltest.sh ${PYVERSSUFFIX}
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index ae177f78002..27fc7318608 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/12/05 17:07:49 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	logilab-common-0.63.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,6 @@ DEPENDS+=	${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama
 PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-mxDateTime
 
-EGG_NAME=		${DISTNAME:S/-/_/1}
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-extract:
diff --git a/devel/py-memcached/Makefile b/devel/py-memcached/Makefile
index 3a040564333..a372843da7d 100644
--- a/devel/py-memcached/Makefile
+++ b/devel/py-memcached/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/09 07:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	python-memcached-1.53
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/1}
@@ -15,7 +15,6 @@ USE_LANGUAGES=	# none
 DOCDIR=			${PREFIX}/share/doc/py-memcached
 INSTALLATION_DIRS=	${DOCDIR}
 REPLACE_PYTHON+=	memcache.py
-EGG_NAME=		${DISTNAME:S/-/_/1}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.53
 
 post-install:
diff --git a/devel/py-more-itertools/Makefile b/devel/py-more-itertools/Makefile
index d48e5166f02..bc08ddad6af 100644
--- a/devel/py-more-itertools/Makefile
+++ b/devel/py-more-itertools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:27 wiz 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/
 
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index 2d031e9d3df..11460039d52 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/06/08 23:17:37 rodent Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	msgpack-python-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python-/-/}
@@ -12,8 +12,6 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=	c c++
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../devel/msgpack/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-requests-toolbelt/Makefile b/devel/py-requests-toolbelt/Makefile
index c074dfd6f86..52048f9ef9e 100644
--- a/devel/py-requests-toolbelt/Makefile
+++ b/devel/py-requests-toolbelt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/08/18 10:00:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	requests-toolbelt-0.3.1
-EGG_NAME=	${DISTNAME:S/-/_/}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/source/r/requests-toolbelt/
diff --git a/devel/py-requests/Makefile b/devel/py-requests/Makefile
index a6bdb016aae..476073468eb 100644
--- a/devel/py-requests/Makefile
+++ b/devel/py-requests/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/12/12 20:01:29 imil Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	requests-2.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.1.3:../../textproc/py-sphinx
 
-WRKSRC=		${WRKDIR}/${EGG_NAME}
 USE_LANGUAGES=	c
 REPLACE_PYTHON=	requests/certs.py requests/packages/chardet/chardetect.py
 
diff --git a/filesystems/py-fuse-bindings/Makefile b/filesystems/py-fuse-bindings/Makefile
index a1982355f89..d0c116d63b9 100644
--- a/filesystems/py-fuse-bindings/Makefile
+++ b/filesystems/py-fuse-bindings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/09 07:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/31 13:57:27 wiz Exp $
 
 VERSION=		0.2.1
 DISTNAME=		fuse-python-${VERSION}
@@ -11,7 +11,6 @@ HOMEPAGE=		http://sourceforge.net/apps/mediawiki/fuse/index.php?title=FusePython
 COMMENT=		Python bindings for FUSE and refuse
 LICENSE=		gnu-lgpl-v2.1
 
-EGG_NAME=		fuse_python-${VERSION}
 PYDISTUTILSPKG=		yes
 PY_PATCHLIST=		yes
 USE_TOOLS+=		pkg-config
diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile
index bfb8e394167..9fdb0b5919f 100644
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/05/09 07:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2014/12/31 13:57:27 wiz Exp $
 
 VERSION=	1.10.0
 PKGREVISION=	2
 DISTNAME=	allmydata-tahoe-${VERSION}
-EGG_NAME=	allmydata_tahoe-${VERSION}
 PKGNAME=	tahoe-lafs-${VERSION}
 CATEGORIES=	filesystems
 MASTER_SITES=	https://tahoe-lafs.org/source/tahoe-lafs/releases/
diff --git a/finance/py-python-bitcoinlib/Makefile b/finance/py-python-bitcoinlib/Makefile
index ca542eb558c..8e61bbcbd1a 100644
--- a/finance/py-python-bitcoinlib/Makefile
+++ b/finance/py-python-bitcoinlib/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/10/05 20:21:30 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	python-bitcoinlib-0.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +12,6 @@ LICENSE=	gnu-lgpl-v2.1 AND mit
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	26
 
 .include "../../lang/python/egg.mk"
diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index ee211e35814..d9a58c6ac55 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/05/09 07:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	python2-biggles-1.6.6
 PKGNAME=	${PYPKGPREFIX}${DISTNAME:S/python2//}
@@ -9,7 +9,6 @@ MAINTAINER=	Kai.Puolamaki@iki.fi
 HOMEPAGE=	http://biggles.sourceforge.net/
 COMMENT=	Python module for creating 2D scientific plots
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not ported yet as of 1.6.6
 
 .include "../../lang/python/distutils.mk"
diff --git a/graphics/py-gnuplot/Makefile b/graphics/py-gnuplot/Makefile
index a52c10d4552..69cc3b886aa 100644
--- a/graphics/py-gnuplot/Makefile
+++ b/graphics/py-gnuplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/05/09 07:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	gnuplot-py-1.8
 PKGNAME=	${PYPKGPREFIX}-gnuplot-1.8
@@ -14,7 +14,6 @@ LICENSE=	gnu-lgpl-v2.1
 DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 
 USE_LANGUAGES=	# empty
-EGG_NAME=	${DISTNAME:S/-/_/}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.8
 
diff --git a/inputmethod/ibus-tegaki/Makefile b/inputmethod/ibus-tegaki/Makefile
index 749db336734..2dfd80b1b42 100644
--- a/inputmethod/ibus-tegaki/Makefile
+++ b/inputmethod/ibus-tegaki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:27 wiz Exp $
 
 DISTNAME=	ibus-tegaki-0.3.1
 PKGREVISION=	2
@@ -21,7 +21,6 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	ibus-engine-tegaki.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
-EGG_NAME=		${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2 via py-ibus-python
 
 .include "../../lang/python/distutils.mk"
diff --git a/inputmethod/scim-tegaki/Makefile b/inputmethod/scim-tegaki/Makefile
index f1dd089eb8b..4a389e8819a 100644
--- a/inputmethod/scim-tegaki/Makefile
+++ b/inputmethod/scim-tegaki/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/05/17 16:10:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	scim-tegaki-0.1
 PKGREVISION=	2
@@ -21,8 +20,6 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	src/__init__.py
 SUBST_SED.prefix=	-e 's|/usr/local/share|${PREFIX}/share|g'
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-pygtk/Makefile b/inputmethod/tegaki-pygtk/Makefile
index 3f1e18c036e..dc359937497 100644
--- a/inputmethod/tegaki-pygtk/Makefile
+++ b/inputmethod/tegaki-pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-pygtk-0.3.1
 PKGREVISION=	2
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2
 
 .include "../../lang/python/distutils.mk"
diff --git a/inputmethod/tegaki-python/Makefile b/inputmethod/tegaki-python/Makefile
index 5539d350c25..ceb7b7362c0 100644
--- a/inputmethod/tegaki-python/Makefile
+++ b/inputmethod/tegaki-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-python-0.3.1
 PKGREVISION=	1
@@ -23,7 +23,6 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	tegaki/engine.py
 SUBST_SED.prefix=	-e 's|/usr/local/share|${PREFIX}/share|g'
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-zinnia
 
 .include "../../lang/python/distutils.mk"
diff --git a/inputmethod/tegaki-recognize/Makefile b/inputmethod/tegaki-recognize/Makefile
index 6dd7a4f5538..1cf8f1a53c0 100644
--- a/inputmethod/tegaki-recognize/Makefile
+++ b/inputmethod/tegaki-recognize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-recognize-0.3.1.2
 PKGREVISION=	1
@@ -17,8 +17,6 @@ USE_LANGUAGES=	# none
 REPLACE_PYTHON=	bin/tegaki-recognize
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.1.2
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/inputmethod/tegaki-tools/Makefile b/inputmethod/tegaki-tools/Makefile
index 660dd5d42ab..21b1cabdc4d 100644
--- a/inputmethod/tegaki-tools/Makefile
+++ b/inputmethod/tegaki-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-tools-0.3.1
 PKGREVISION=	1
@@ -16,7 +16,6 @@ DEPENDS+=	tegaki-pygtk>=0.3:../../inputmethod/tegaki-pygtk
 USE_LANGUAGES=	c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.1
-EGG_NAME=	${DISTNAME:S/-/_/}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/inputmethod/tegaki-train/Makefile b/inputmethod/tegaki-train/Makefile
index 2a182812bbb..320bf99bea4 100644
--- a/inputmethod/tegaki-train/Makefile
+++ b/inputmethod/tegaki-train/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-train-0.3.1
 PKGREVISION=	1
@@ -15,7 +15,6 @@ DEPENDS+=	tegaki-pygtk>=0.2:../../inputmethod/tegaki-pygtk
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.1
-EGG_NAME=	${DISTNAME:S/-/_/}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/inputmethod/tegaki-wagomu/Makefile b/inputmethod/tegaki-wagomu/Makefile
index e6c67203850..f0e856bcae6 100644
--- a/inputmethod/tegaki-wagomu/Makefile
+++ b/inputmethod/tegaki-wagomu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	tegaki-wagomu-0.3.1
 PKGREVISION=	6
@@ -29,7 +29,6 @@ SUBST_STAGE.fixver=	pre-configure
 SUBST_FILES.fixver=	tegakiwagomu.py
 SUBST_SED.fixver=	-e 's|0\.3|${PKGVERSION_NOREV}|'
 
-EGG_NAME=	${DISTNAME:S/-/_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.1
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/lang/python/distutils.mk b/lang/python/distutils.mk
index eb09f18aef8..77816f5f4f7 100644
--- a/lang/python/distutils.mk
+++ b/lang/python/distutils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distutils.mk,v 1.6 2012/04/23 13:02:06 obache Exp $
+# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $
 #
 # Common logic for python distributions that use distutils.
 #
@@ -19,7 +19,7 @@ PYDISTUTILSPKG=	yes
 # this norm and will work with all python versions.
 
 # Set the egg file basename.
-EGG_NAME?=	${DISTNAME}
+EGG_NAME?=	${DISTNAME:C/-([^0-9])/_\1/g}
 
 # Python distutils will create an eggfile.
 PY_NO_EGG?=	no
diff --git a/lang/python/egg.mk b/lang/python/egg.mk
index 2b0a1b382c1..5da8dd6836e 100644
--- a/lang/python/egg.mk
+++ b/lang/python/egg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.19 2014/12/17 07:23:04 wiz Exp $
+# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -9,7 +9,7 @@
 # use setuptools to create an egg.  Some distributions use distutils,
 # which creates an egg-info file; those should use distutils.mk
 
-EGG_NAME?=	${DISTNAME}
+EGG_NAME?=	${DISTNAME:C/-([^0-9])/_\1/g}
 EGG_INFODIR?=	${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
 PYDISTUTILSPKG=	yes
diff --git a/mail/py-sendmail-admin/Makefile b/mail/py-sendmail-admin/Makefile
index 5ff637ec325..0ae7147a02d 100644
--- a/mail/py-sendmail-admin/Makefile
+++ b/mail/py-sendmail-admin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/31 13:57:28 wiz Exp $
 
 VER=		1.0
 DISTNAME=	sendmail-admin-${VER}
@@ -16,8 +16,6 @@ PYTHON_SELF_CONFLICT=		yes
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index 1e44a351bdb..af924a26163 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/09 07:37:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:28 wiz Exp $
 
 VERSION=	2.0.8
 DISTNAME=	pyspf-${VERSION}
@@ -13,8 +13,6 @@ LICENSE=	python-software-foundation
 
 DEPENDS+=	${PYPKGPREFIX}-dns>=0:../../net/py-dns
 
-EGG_NAME=	pyspf-${VERSION}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-dns
 
 .include "../../lang/python/distutils.mk"
diff --git a/mail/py-validate-email-address/Makefile b/mail/py-validate-email-address/Makefile
index 8aad5d7d81e..32d721850c4 100644
--- a/mail/py-validate-email-address/Makefile
+++ b/mail/py-validate-email-address/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/05 18:35:39 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	validate-email-address-1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,5 @@ LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${DISTNAME:S/-/_/1:S/-/_/1}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/py-stdnum/Makefile b/misc/py-stdnum/Makefile
index 1ef7fd077c9..4368dae9fa1 100644
--- a/misc/py-stdnum/Makefile
+++ b/misc/py-stdnum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/09 07:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	python-stdnum-0.9
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -11,7 +11,6 @@ COMMENT=	Python module to handle standardized numbers and codes
 LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	# none
-EGG_NAME=	${DISTNAME:S/python-/python_/}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-suds
 
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index a7aaf37091f..6179ca23390 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/05/09 07:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	GeoIP-Python-1.2.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python-//}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.maxmind.com/app/python
 COMMENT=	GeoIP support for Python
 LICENSE=	gnu-lgpl-v2.1
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.2.7
 
 .include "../../lang/python/distutils.mk"
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index cb247244722..6df0671854c 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/05/09 07:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/31 13:57:28 wiz Exp $
 
 DISTNAME=	adns-python-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -13,8 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	${PYPKGPREFIX}-adns-python-[0-9]*
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.2.1
 
 BUILDLINK_API_DEPENDS.adns+=	adns>=1.2
diff --git a/net/py-apache-libcloud/Makefile b/net/py-apache-libcloud/Makefile
index 5c100faed49..0bfeb9c5dd2 100644
--- a/net/py-apache-libcloud/Makefile
+++ b/net/py-apache-libcloud/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/06/06 12:48:35 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	apache-libcloud-0.14.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=	${DISTNAME:S,-,_,}
 CATEGORIES=	net
 MASTER_SITES=	https://pypi.python.org/packages/source/a/apache-libcloud/
 
diff --git a/net/py-junos-eznc/Makefile b/net/py-junos-eznc/Makefile
index 1a5515e119b..41b9b9e466e 100644
--- a/net/py-junos-eznc/Makefile
+++ b/net/py-junos-eznc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/09/03 07:10:25 he Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	junos-eznc-1.0.1
-EGG_NAME=	${DISTNAME:S/-/_/}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	https://pypi.python.org/packages/source/j/junos-eznc/
diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile
index 88af7a74819..9f44d33af76 100644
--- a/net/py-suds/Makefile
+++ b/net/py-suds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/05/09 07:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	suds-0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://fedorahosted.org/suds/
 COMMENT=	Lightweight SOAP python client for consuming Web Services
 LICENSE=	gnu-lgpl-v3
 
-EGG_NAME=		${DISTNAME}
 USE_LANGUAGES=		# empty
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.4
 
diff --git a/net/upnpinspector/Makefile b/net/upnpinspector/Makefile
index ec2a563cea0..dcb9fc3104a 100644
--- a/net/upnpinspector/Makefile
+++ b/net/upnpinspector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/05/09 07:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	UPnP-Inspector-0.2.2
 PKGREVISION=	3
@@ -14,7 +14,6 @@ DEPENDS+=	coherence>=0.6.4:../../net/coherence
 DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
 USE_LANGUAGES=	# none
-EGG_NAME=	UPnP_Inspector-0.2.2
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2
 
diff --git a/security/py-asn1-modules/Makefile b/security/py-asn1-modules/Makefile
index d35f7152b05..02d3fd2279b 100644
--- a/security/py-asn1-modules/Makefile
+++ b/security/py-asn1-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/24 14:21:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=		pyasn1-modules-0.0.5
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -12,7 +12,5 @@ LICENSE=		2-clause-bsd
 
 DEPENDS+=		${PYPKGPREFIX}-asn1>=0.1.5:../../security/py-asn1
 
-EGG_NAME=		${DISTNAME:S/-/_/}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-libtaxii/Makefile b/security/py-libtaxii/Makefile
index bae0dc93fba..2e5d6c44500 100644
--- a/security/py-libtaxii/Makefile
+++ b/security/py-libtaxii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/03 08:59:33 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/31 13:57:29 wiz Exp $
 
 LIBTAXII_VERSION=	1.1.101
 DISTNAME=	libtaxii-${LIBTAXII_VERSION}
@@ -14,7 +14,5 @@ LICENSE=	modified-bsd
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
-EGG_NAME=	libtaxii-${LIBTAXII_VERSION}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 404739aa6e9..4be782f163f 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/09 07:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	python-mcrypt-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -11,8 +11,6 @@ HOMEPAGE=	http://labix.org/python-mcrypt
 COMMENT=	Python interface to mcrypt library
 LICENSE=	gnu-lgpl-v2.1
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.1
 
 .include "../../lang/python/distutils.mk"
diff --git a/security/py-requests-oauthlib/Makefile b/security/py-requests-oauthlib/Makefile
index fa3917e341f..61968dcda84 100644
--- a/security/py-requests-oauthlib/Makefile
+++ b/security/py-requests-oauthlib/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:29 wiz 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/
 
diff --git a/sysutils/py-magic/Makefile b/sysutils/py-magic/Makefile
index dae4533281b..394bc170c63 100644
--- a/sysutils/py-magic/Makefile
+++ b/sysutils/py-magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/06/02 00:12:59 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	python-magic-0.4.6
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/1}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://github.com/ahupp/python-magic
 COMMENT=	File type identification using libmagic
 LICENSE=	python-software-foundation
 
-EGG_NAME=	${DISTNAME:S/-magic/_magic/}
-
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile
index 604db4cf8a3..7bb01bf433c 100644
--- a/sysutils/py-notify/Makefile
+++ b/sysutils/py-notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/05/09 07:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	py-notify-0.2.1
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}/1}
@@ -11,8 +11,6 @@ HOMEPAGE=	http://home.gna.org/py-notify/
 COMMENT=	Python package providing tool for observer programming pattern
 LICENSE=	gnu-lgpl-v2.1
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.2.1
 
 .include "../../lang/python/distutils.mk"
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 4cda711a6be..9c6d39e4d37 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2014/05/09 07:37:20 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=	rdiff-backup-1.2.8
 PKGREVISION=	6
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.nongnu.org/rdiff-backup/
 COMMENT=	Remote incremental backup utility
 
 PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 1.2.8
-EGG_NAME=	${DISTNAME:S/-/_/}
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile
index f6cde84570c..e6a815e374f 100644
--- a/textproc/py-4Suite/Makefile
+++ b/textproc/py-4Suite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/05/09 07:37:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/31 13:57:29 wiz Exp $
 
 VER=		1.0.2
 DISTNAME=	4Suite-XML-${VER}
@@ -13,8 +13,6 @@ LICENSE=	apache-1.1
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 SUBST_CLASSES+=		python
 SUBST_FILES.python=	build/scripts.*/4xml
 SUBST_FILES.python+=	build/scripts.*/4xpath
diff --git a/textproc/py-Tempita/Makefile b/textproc/py-Tempita/Makefile
index 398dc128636..a93c1bafa7f 100644
--- a/textproc/py-Tempita/Makefile
+++ b/textproc/py-Tempita/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/01/17 23:26:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:29 wiz Exp $
 
 DISTNAME=		Tempita-0.5.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=		${DISTNAME}
 CATEGORIES=		textproc python
 MASTER_SITES=		http://pypi.python.org/packages/source/T/Tempita/
 
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 04163c6a30f..9f6c5736c91 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:48 asau Exp $
-#
+# $NetBSD: Makefile,v 1.7 2014/12/31 13:57:29 wiz Exp $
 
 VERS=		1.0.5
 DISTNAME=	python-creole-${VERS}
 PKGNAME=	${PYPKGPREFIX}-creole-${VERS}
-EGG_NAME=	python_creole-${VERS}
 CATEGORIES=	textproc www python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/python-creole/
 
diff --git a/textproc/py-jsonlib3/Makefile b/textproc/py-jsonlib3/Makefile
index 9eaa248526e..ecb5e91d828 100644
--- a/textproc/py-jsonlib3/Makefile
+++ b/textproc/py-jsonlib3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	jsonlib-python3-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python3//}
@@ -12,8 +12,6 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c
 
-EGG_NAME=	${DISTNAME:S/b-p/b_p/}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	26 27
 
 .include "../../lang/python/distutils.mk"
diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile
index 9fbb578c8c7..f8b076bf2b4 100644
--- a/textproc/py-mecab/Makefile
+++ b/textproc/py-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/05/09 07:37:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/31 13:57:30 wiz Exp $
 
 .include "../../textproc/mecab/Makefile.common"
 
@@ -11,8 +11,6 @@ LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 USE_LANGUAGES=	c c++
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 TEST_ENV+=	PYTHONPATH=${WRKSRC:Q}/build/lib.${LOWER_OPSYS}-${OS_VERSION}-${MACHINE_ARCH}-${PYVERSSUFFIX}
 
 do-test:
diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile
index c6ab87b115d..c5b9f5729cb 100644
--- a/textproc/py-vobject/Makefile
+++ b/textproc/py-vobject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/12/16 13:23:19 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	vobject-0.8.1c
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.8.1c
 
 PYTHON_SELF_CONFLICT=	yes
-EGG_NAME=	${DISTNAME}0
+EGG_NAME=	${DISTNAME:S/1c/1rc0/}
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
diff --git a/time/py-dateutil/Makefile b/time/py-dateutil/Makefile
index 65442b9fb6c..ca8a8885cf8 100644
--- a/time/py-dateutil/Makefile
+++ b/time/py-dateutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/12/13 09:28:01 obache Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	python-dateutil-2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -12,7 +12,5 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-mxDateTime/Makefile b/time/py-mxDateTime/Makefile
index 0247779dc7f..048fbfdf95d 100644
--- a/time/py-mxDateTime/Makefile
+++ b/time/py-mxDateTime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/05/09 07:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2014/12/31 13:57:30 wiz Exp $
 
 DISTNAME=	egenix-mx-base-3.2.7
 PKGNAME=	${PYPKGPREFIX}-mxDateTime-3.2.7
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.egenix.com/files/python/mxDateTime.html
 COMMENT=	Python extension that provides types and conversions for dates
 LICENSE=	egenix-public-license
 
-EGG_NAME=	${DISTNAME:S/-mx-/_mx_/}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.2.7
 
 REPLACE_PYTHON+=	egenix_mx_base.py
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"