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

Remove now unnecessary overrides in various packages.

6 files changed, 7 insertions, 16 deletions

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