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

Remove now unnecessary overrides in various packages.

11 files changed, 11 insertions, 30 deletions

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"