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

Remove now unnecessary overrides in various packages.

15 files changed, 15 insertions, 33 deletions

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