[pkgsrc/trunk]: pkgsrc Default EGG_NAME to ${DISTNAME} in egg.mk and drop EGG...

[epg <epg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd51b6b01bcf
branches:  trunk
changeset: 547076:dd51b6b01bcf
user:      epg <epg%pkgsrc.org@localhost>
date:      Fri Sep 12 05:32:37 2008 +0000

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

diffstat:

 devel/py-babel/Makefile       |  3 +--
 lang/python/egg.mk            |  4 +++-
 net/py-boto/Makefile          |  3 +--
 textproc/py-pygments/Makefile |  3 +--
 time/py-pytz/Makefile         |  3 +--
 www/ja-trac/Makefile          |  3 +--
 www/py-genshi/Makefile        |  3 +--
 www/py-paste/Makefile         |  3 +--
 8 files changed, 10 insertions(+), 15 deletions(-)

diffs (114 lines):

diff -r 2e7e1e713abd -r dd51b6b01bcf devel/py-babel/Makefile
--- a/devel/py-babel/Makefile   Fri Sep 12 00:49:36 2008 +0000
+++ b/devel/py-babel/Makefile   Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf lang/python/egg.mk
--- a/lang/python/egg.mk        Fri Sep 12 00:49:36 2008 +0000
+++ b/lang/python/egg.mk        Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf net/py-boto/Makefile
--- a/net/py-boto/Makefile      Fri Sep 12 00:49:36 2008 +0000
+++ b/net/py-boto/Makefile      Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf textproc/py-pygments/Makefile
--- a/textproc/py-pygments/Makefile     Fri Sep 12 00:49:36 2008 +0000
+++ b/textproc/py-pygments/Makefile     Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf time/py-pytz/Makefile
--- a/time/py-pytz/Makefile     Fri Sep 12 00:49:36 2008 +0000
+++ b/time/py-pytz/Makefile     Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf www/ja-trac/Makefile
--- a/www/ja-trac/Makefile      Fri Sep 12 00:49:36 2008 +0000
+++ b/www/ja-trac/Makefile      Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf www/py-genshi/Makefile
--- a/www/py-genshi/Makefile    Fri Sep 12 00:49:36 2008 +0000
+++ b/www/py-genshi/Makefile    Fri Sep 12 05:32:37 2008 +0000
@@ -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 -r 2e7e1e713abd -r dd51b6b01bcf www/py-paste/Makefile
--- a/www/py-paste/Makefile     Fri Sep 12 00:49:36 2008 +0000
+++ b/www/py-paste/Makefile     Fri Sep 12 05:32:37 2008 +0000
@@ -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/