Default EGG_NAME to ${DISTNAME} in egg.mk and drop EGG_NAME from packages that

set it to ${DISTNAME}.

8 files changed, 10 insertions, 15 deletions

diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 5dbac419d2a..59c7c18762d 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/01 08:35:40 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/12 05:32:37 epg Exp $
 #
 
 DISTNAME=	Babel-0.9.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	http://ftp.edgewall.com/pub/babel/
 
diff --git a/lang/python/egg.mk b/lang/python/egg.mk
index 72e2092c2bd..aa70a0a95dd 100644
--- a/lang/python/egg.mk
+++ b/lang/python/egg.mk
@@ -1,9 +1,11 @@
-# $NetBSD: egg.mk,v 1.5 2008/09/10 16:33:38 epg Exp $
+# $NetBSD: egg.mk,v 1.6 2008/09/12 05:32:38 epg Exp $
 #
 # Common logic to handle Python Eggs
 #
 .include "../../mk/bsd.prefs.mk"
 
+EGG_NAME?=	${DISTNAME}
+
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 # Only Python 2.4 support by devel/py-setuptools right now
diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index a3dc4696c40..8a78e389f80 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/07/24 17:37:56 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/12 05:32:37 epg Exp $
 #
 
 DISTNAME=	boto-1.3a
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=	http://boto.googlecode.com/files/
 
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 52644f25ad8..8e72bba23f1 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/01 08:31:38 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/12 05:32:38 epg Exp $
 #
 
 DISTNAME=	Pygments-0.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	http://pypi.python.org/packages/source/P/Pygments/	\
 		${MASTER_SITE_SOURCEFORGE:=pygments/}
diff --git a/time/py-pytz/Makefile b/time/py-pytz/Makefile
index 84a9d7bf545..91848f9a883 100644
--- a/time/py-pytz/Makefile
+++ b/time/py-pytz/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/09/10 13:05:11 abs Exp $
+# $NetBSD: Makefile,v 1.3 2008/09/12 05:32:38 epg Exp $
 #
 
 DISTNAME=	pytz-2008b
 PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	time python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/pytz/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/ja-trac/Makefile b/www/ja-trac/Makefile
index de514b24c02..54e0251264a 100644
--- a/www/ja-trac/Makefile
+++ b/www/ja-trac/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/08/23 00:20:09 obache Exp $
+# $NetBSD: Makefile,v 1.19 2008/09/12 05:32:38 epg Exp $
 #
 
 DISTNAME=	Trac-0.11.1.ja1
 PKGNAME=	ja-${DISTNAME:tl:S/.ja/pl/}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.i-act.co.jp/project/products/downloads/
 EXTRACT_SUFX=	.zip
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index 66edee15abb..e22cadc2ece 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/01 08:38:22 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/12 05:32:38 epg Exp $
 #
 
 DISTNAME=	Genshi-0.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://ftp.edgewall.com/pub/genshi/
 
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index 022e9295fe8..c84bd56e37a 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/09/10 16:34:51 epg Exp $
+# $NetBSD: Makefile,v 1.5 2008/09/12 05:32:38 epg Exp $
 
 DISTNAME=	Paste-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://pypi.python.org/packages/source/P/Paste/