pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-nose use ${PYVERSSUFFIX} to fix problems with...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2324b4bc9eb8
branches:  trunk
changeset: 571205:2324b4bc9eb8
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 10 10:31:46 2010 +0000

description:
use ${PYVERSSUFFIX} to fix problems with other Python versions
(seen in bulk build)

diffstat:

 devel/py-nose/Makefile         |   6 +++++-
 devel/py-nose/PLIST            |   7 +++----
 devel/py-nose/distinfo         |   3 ++-
 devel/py-nose/patches/patch-aa |  22 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diffs (75 lines):

diff -r 108abf79990d -r 2324b4bc9eb8 devel/py-nose/Makefile
--- a/devel/py-nose/Makefile    Wed Feb 10 03:56:00 2010 +0000
+++ b/devel/py-nose/Makefile    Wed Feb 10 10:31:46 2010 +0000
@@ -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 @@
 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 -r 108abf79990d -r 2324b4bc9eb8 devel/py-nose/PLIST
--- a/devel/py-nose/PLIST       Wed Feb 10 03:56:00 2010 +0000
+++ b/devel/py-nose/PLIST       Wed Feb 10 10:31:46 2010 +0000
@@ -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/util.py
 ${PYSITELIB}/nose/util.pyc
 ${PYSITELIB}/nose/util.pyo
-man/man1/nosetests.1
+man/man1/nosetests${PYVERSSUFFIX}.1
diff -r 108abf79990d -r 2324b4bc9eb8 devel/py-nose/distinfo
--- a/devel/py-nose/distinfo    Wed Feb 10 03:56:00 2010 +0000
+++ b/devel/py-nose/distinfo    Wed Feb 10 10:31:46 2010 +0000
@@ -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 -r 108abf79990d -r 2324b4bc9eb8 devel/py-nose/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-nose/patches/patch-aa    Wed Feb 10 10:31:46 2010 +0000
@@ -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']},



Home | Main Index | Thread Index | Old Index