diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-20 19:54:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-20 19:54:14 +0000 |
| commit | cf6c1d2300cfc350450ef5c744f1958d2821c2c8 (patch) | |
| tree | 7a9012379f0fb0e3a717a3360d602fa0b25c5eee /math | |
| parent | 7357e7eee15d3db02abd458c342d81b78b5fcdae (diff) | |
| download | pkgsrc-cf6c1d2300cfc350450ef5c744f1958d2821c2c8.tar.gz | |
Catch up with R 2.3.1: different module name, different output of
R --version, different dependency. Bump revision.
Diffstat (limited to 'math')
| -rw-r--r-- | math/py-rpy/Makefile | 8 | ||||
| -rw-r--r-- | math/py-rpy/PLIST | 4 | ||||
| -rw-r--r-- | math/py-rpy/distinfo | 3 | ||||
| -rw-r--r-- | math/py-rpy/patches/patch-aa | 13 |
4 files changed, 21 insertions, 7 deletions
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile index 4fdb04c2938..06b8692a6fe 100644 --- a/math/py-rpy/Makefile +++ b/math/py-rpy/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2006/06/02 23:34:26 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/20 19:54:14 joerg Exp $ # DISTNAME= rpy-0.4.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rpy/} @@ -12,9 +12,9 @@ HOMEPAGE= http://rpy.sourceforge.net/ COMMENT= R interface for Python PYDISTUTILSPKG= YES -PYTHON_VERSIONS_ACCEPTED= 24 23 22 +PYTHON_VERSIONS_ACCEPTED= 24 23 -BUILDLINK_API_DEPENDS.R+= R>=2.2.1 +BUILDLINK_API_DEPENDS.R+= R>=2.3.1 .include "../../lang/python/extension.mk" .include "../../math/py-Numeric/buildlink3.mk" diff --git a/math/py-rpy/PLIST b/math/py-rpy/PLIST index 1dd3497b775..629940ac261 100644 --- a/math/py-rpy/PLIST +++ b/math/py-rpy/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2006/01/27 21:50:41 markd Exp $ -${PYSITELIB}/_rpy2021.so +@comment $NetBSD: PLIST,v 1.7 2006/06/20 19:54:14 joerg Exp $ +${PYSITELIB}/_rpy2031.so ${PYSITELIB}/rpy.py ${PYSITELIB}/rpy.pyc ${PYSITELIB}/rpy.pyo diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo index da3d76075a8..7afe2ff041d 100644 --- a/math/py-rpy/distinfo +++ b/math/py-rpy/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/10/21 18:41:15 drochner Exp $ +$NetBSD: distinfo,v 1.6 2006/06/20 19:54:14 joerg Exp $ SHA1 (rpy-0.4.6.tar.gz) = 01d7548958820e5437eb4edb4c8f8bdd0c4f8f28 RMD160 (rpy-0.4.6.tar.gz) = efd46a9ecc9450c4c4ee90a153b3bb89a066f316 Size (rpy-0.4.6.tar.gz) = 77384 bytes +SHA1 (patch-aa) = 216dc7abbdfb9f6c9a127c7be8a5b44dfdbfaa11 diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa new file mode 100644 index 00000000000..f536b904897 --- /dev/null +++ b/math/py-rpy/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2006/06/20 19:54:14 joerg Exp $ + +--- rpy_tools.py.orig 2006-06-20 19:22:37.000000000 +0000 ++++ rpy_tools.py +@@ -93,7 +93,7 @@ def get_R_VERSION(RHOME=None, force_exec + if stat or len(output)<=0: + 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) + if not version: + raise RuntimeError("Couldn't obtain version number from output\n" + "of `R --version'.\n") |