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

Remove now unnecessary overrides in various packages.

8 files changed, 8 insertions, 19 deletions

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"