diff options
| author | drochner <drochner@pkgsrc.org> | 2010-02-10 10:31:46 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-02-10 10:31:46 +0000 |
| commit | ca830eba011e81c6db43f64329340246a4d0223c (patch) | |
| tree | ac8a4f18940751ecd7a5442f506fb2825b9cc975 /devel | |
| parent | 66e4330ab4c137fa81c7180885a652360e1f3b5c (diff) | |
| download | pkgsrc-ca830eba011e81c6db43f64329340246a4d0223c.tar.gz | |
use ${PYVERSSUFFIX} to fix problems with other Python versions
(seen in bulk build)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/py-nose/Makefile | 6 | ||||
| -rw-r--r-- | devel/py-nose/PLIST | 7 | ||||
| -rw-r--r-- | devel/py-nose/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-nose/patches/patch-aa | 22 |
4 files changed, 32 insertions, 6 deletions
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index 09f92ab024b..8c85fdda6df 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/01/26 17:43:14 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/10 10:31:46 drochner Exp $ # DISTNAME= nose-0.11.1 @@ -18,6 +18,10 @@ LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # none +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} + +post-extract: + ${MV} ${WRKSRC}/nosetests.1 ${WRKSRC}/nosetests${PYVERSSUFFIX}.1 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-nose/PLIST b/devel/py-nose/PLIST index 37f14352574..c44f3de3624 100644 --- a/devel/py-nose/PLIST +++ b/devel/py-nose/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/26 17:43:14 drochner Exp $ -bin/nosetests -bin/nosetests-2.5 +@comment $NetBSD: PLIST,v 1.2 2010/02/10 10:31:46 drochner Exp $ +bin/nosetests-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -137,4 +136,4 @@ ${PYSITELIB}/nose/usage.txt ${PYSITELIB}/nose/util.py ${PYSITELIB}/nose/util.pyc ${PYSITELIB}/nose/util.pyo -man/man1/nosetests.1 +man/man1/nosetests${PYVERSSUFFIX}.1 diff --git a/devel/py-nose/distinfo b/devel/py-nose/distinfo index 411543b06fd..364a17846c4 100644 --- a/devel/py-nose/distinfo +++ b/devel/py-nose/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/01/26 17:43:14 drochner Exp $ +$NetBSD: distinfo,v 1.2 2010/02/10 10:31:46 drochner Exp $ SHA1 (nose-0.11.1.tar.gz) = 696530bb81d04d57277b1c8ca554739e98cc7652 RMD160 (nose-0.11.1.tar.gz) = 3a3aa22fd1f1647d4cd9ad2374dca3c58ca78e22 Size (nose-0.11.1.tar.gz) = 250343 bytes +SHA1 (patch-aa) = 328246aebf1f0bf5c73c920f573d943a48b4e8ff diff --git a/devel/py-nose/patches/patch-aa b/devel/py-nose/patches/patch-aa new file mode 100644 index 00000000000..0c7cb97221e --- /dev/null +++ b/devel/py-nose/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2010/02/10 10:31:46 drochner Exp $ + +--- setup.py.orig 2009-05-14 00:28:39.000000000 +0000 ++++ setup.py +@@ -10,7 +10,7 @@ try: + packages = find_packages(), + entry_points = { + 'console_scripts': [ +- 'nosetests = nose:run_exit', ++# 'nosetests = nose:run_exit', + 'nosetests%s = nose:run_exit' % py_vers_tag, + ], + 'distutils.commands': [ +@@ -59,7 +59,7 @@ setup( + download_url = \ + 'http://somethingaboutorange.com/mrl/projects/nose/nose-%s.tar.gz' \ + % VERSION, +- data_files = [('man/man1', ['nosetests.1'])], ++ data_files = [('man/man1', ['nosetests' + sys.version[0:3] + '.1'])], + package_data = {'': ['*.txt', + 'examples/*.py', + 'examples/*/*.py']}, |