diff options
| author | wiz <wiz@pkgsrc.org> | 2014-12-31 13:57:25 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-12-31 13:57:25 +0000 |
| commit | a42c80ed47a2bad3770198295eba1c31a73b4728 (patch) | |
| tree | 6f2607c3acaa8e555f020155e7d5a5eda8a24fd6 /lang | |
| parent | 5ce45af0fae5f30835e2bef442cd28c0e87627f0 (diff) | |
| download | pkgsrc-a42c80ed47a2bad3770198295eba1c31a73b4728.tar.gz | |
Improve EGG_NAME default to work for packages with '-' in their name.
Remove now unnecessary overrides in various packages.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/distutils.mk | 4 | ||||
| -rw-r--r-- | lang/python/egg.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/python/distutils.mk b/lang/python/distutils.mk index eb09f18aef8..77816f5f4f7 100644 --- a/lang/python/distutils.mk +++ b/lang/python/distutils.mk @@ -1,4 +1,4 @@ -# $NetBSD: distutils.mk,v 1.6 2012/04/23 13:02:06 obache Exp $ +# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $ # # Common logic for python distributions that use distutils. # @@ -19,7 +19,7 @@ PYDISTUTILSPKG= yes # this norm and will work with all python versions. # Set the egg file basename. -EGG_NAME?= ${DISTNAME} +EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/g} # Python distutils will create an eggfile. PY_NO_EGG?= no diff --git a/lang/python/egg.mk b/lang/python/egg.mk index 2b0a1b382c1..5da8dd6836e 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.19 2014/12/17 07:23:04 wiz Exp $ +# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $ # # Common logic to handle Python Eggs # @@ -9,7 +9,7 @@ # use setuptools to create an egg. Some distributions use distutils, # which creates an egg-info file; those should use distutils.mk -EGG_NAME?= ${DISTNAME} +EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/g} EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info PYDISTUTILSPKG= yes |