diff options
| author | joerg <joerg@pkgsrc.org> | 2010-02-15 16:32:20 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-02-15 16:32:20 +0000 |
| commit | 03b66c3e4b854af54fce5c08956de8e1f7a2bff0 (patch) | |
| tree | dc67e6284c1d203eceb06b6461ed5437a4b246d7 | |
| parent | 88db2ca6354d845c0e1ee20df439c0c587d4a455 (diff) | |
| download | pkgsrc-03b66c3e4b854af54fce5c08956de8e1f7a2bff0.tar.gz | |
Deal with two digit R --version output. Still mark as broken because it
depends on a no-longer existing header.
| -rw-r--r-- | math/py-rpy/Makefile | 4 | ||||
| -rw-r--r-- | math/py-rpy/distinfo | 4 | ||||
| -rw-r--r-- | math/py-rpy/patches/patch-aa | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile index e2f82eaeecc..e6699fbfbed 100644 --- a/math/py-rpy/Makefile +++ b/math/py-rpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/09/19 14:39:00 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2010/02/15 16:32:20 joerg Exp $ # DISTNAME= rpy-0.99.0 @@ -17,6 +17,8 @@ PYDISTUTILSPKG= YES BUILDLINK_API_DEPENDS.R+= R>=2.7.0 +BROKEN= Doesn't support modern R. + .include "../../lang/python/extension.mk" .include "../../math/py-Numeric/buildlink3.mk" .include "../../math/R/buildlink3.mk" diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo index d86a65d30e2..28c79f6d821 100644 --- a/math/py-rpy/distinfo +++ b/math/py-rpy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2007/03/14 11:55:41 markd Exp $ +$NetBSD: distinfo,v 1.8 2010/02/15 16:32:20 joerg Exp $ SHA1 (rpy-0.99.0.tar.gz) = 6b94e20adb555b9dfb914ef89745e75f3e9e4c8b RMD160 (rpy-0.99.0.tar.gz) = 9880e9da9d8b8cacccd947df906e643b7457aa44 Size (rpy-0.99.0.tar.gz) = 79120 bytes -SHA1 (patch-aa) = 216dc7abbdfb9f6c9a127c7be8a5b44dfdbfaa11 +SHA1 (patch-aa) = e148451a16e1d89bc26b4e86670772c626d24d69 diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa index f536b904897..d3f6dafe6ac 100644 --- a/math/py-rpy/patches/patch-aa +++ b/math/py-rpy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2006/06/20 19:54:14 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2010/02/15 16:32:20 joerg Exp $ --- rpy_tools.py.orig 2006-06-20 19:22:37.000000000 +0000 +++ rpy_tools.py @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2006/06/20 19:54:14 joerg Exp $ raise RuntimeError("Couldn't execute the R interpreter" + " `%s'.\n" % rexec ) - version = re.search("R +([0-9]\.[0-9]\.[0-9])", output) -+ version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output) ++ version = re.search("R version +([0-9]+\.[0-9]+\.[0-9]+)", output) if not version: raise RuntimeError("Couldn't obtain version number from output\n" "of `R --version'.\n") |