diff options
| author | wen <wen@FreeBSD.org> | 2009-12-29 14:28:13 +0800 |
|---|---|---|
| committer | wen <wen@FreeBSD.org> | 2009-12-29 14:28:13 +0800 |
| commit | b7e86c754a8e6ce54019452a1392bdfa2c876c2a (patch) | |
| tree | f14ea28da7b6e262cc2cbe3f3544b45e39265ea1 /math | |
| parent | 6664163757a570a13f2b31d76860723295f7f683 (diff) | |
| download | freebsd-ports-gnome-b7e86c754a8e6ce54019452a1392bdfa2c876c2a.tar.gz freebsd-ports-gnome-b7e86c754a8e6ce54019452a1392bdfa2c876c2a.tar.zst freebsd-ports-gnome-b7e86c754a8e6ce54019452a1392bdfa2c876c2a.zip | |
- Fix the build error reported by pointyhat
Diffstat (limited to 'math')
| -rw-r--r-- | math/rpy/Makefile | 2 | ||||
| -rw-r--r-- | math/rpy/files/patch-rpy_tools.py | 13 | ||||
| -rw-r--r-- | math/rpy/pkg-plist | 2 | ||||
| -rw-r--r-- | math/rpy2/Makefile | 2 | ||||
| -rw-r--r-- | math/rpy2/files/patch-rpy_tools.py | 13 | ||||
| -rw-r--r-- | math/rpy2/pkg-plist | 2 |
6 files changed, 30 insertions, 4 deletions
diff --git a/math/rpy/Makefile b/math/rpy/Makefile index 984a17f0bd2b..99ff7a1ff9df 100644 --- a/math/rpy/Makefile +++ b/math/rpy/Makefile @@ -8,7 +8,7 @@ PORTNAME= rpy PORTVERSION= 1.0.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math MASTER_SITES= SF diff --git a/math/rpy/files/patch-rpy_tools.py b/math/rpy/files/patch-rpy_tools.py new file mode 100644 index 000000000000..09f166003c77 --- /dev/null +++ b/math/rpy/files/patch-rpy_tools.py @@ -0,0 +1,13 @@ +--- rpy_tools.py.orig 2009-12-29 09:42:02.000000000 +0800 ++++ rpy_tools.py 2009-12-29 09:42:41.000000000 +0800 +@@ -97,8 +97,8 @@ + if stat or len(output)<=0: + raise RuntimeError("Couldn't execute the R interpreter" + + " `%s'.\n" % rexec ) +- # edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9]\.[0-9])", output) +- version = re.search(" +([0-9]\.[0-9]\.[0-9])", output) ++ # edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9][0-9]\.[0-9])", output) ++ version = re.search(" +([0-9]\.[0-9][0-9]\.[0-9])", output) + if not version: + raise RuntimeError("Couldn't obtain version number from output\n" + "of `R --version'.\n") diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist index a802f8160b4d..3417af8a92fe 100644 --- a/math/rpy/pkg-plist +++ b/math/rpy/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_rpy2092.so +%%PYTHON_SITELIBDIR%%/_rpy2101.so %%PYTHON_SITELIBDIR%%/rpy.py %%PYTHON_SITELIBDIR%%/rpy.pyc %%PYTHON_SITELIBDIR%%/rpy.pyo diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile index 984a17f0bd2b..99ff7a1ff9df 100644 --- a/math/rpy2/Makefile +++ b/math/rpy2/Makefile @@ -8,7 +8,7 @@ PORTNAME= rpy PORTVERSION= 1.0.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math MASTER_SITES= SF diff --git a/math/rpy2/files/patch-rpy_tools.py b/math/rpy2/files/patch-rpy_tools.py new file mode 100644 index 000000000000..09f166003c77 --- /dev/null +++ b/math/rpy2/files/patch-rpy_tools.py @@ -0,0 +1,13 @@ +--- rpy_tools.py.orig 2009-12-29 09:42:02.000000000 +0800 ++++ rpy_tools.py 2009-12-29 09:42:41.000000000 +0800 +@@ -97,8 +97,8 @@ + if stat or len(output)<=0: + raise RuntimeError("Couldn't execute the R interpreter" + + " `%s'.\n" % rexec ) +- # edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9]\.[0-9])", output) +- version = re.search(" +([0-9]\.[0-9]\.[0-9])", output) ++ # edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9][0-9]\.[0-9])", output) ++ version = re.search(" +([0-9]\.[0-9][0-9]\.[0-9])", output) + if not version: + raise RuntimeError("Couldn't obtain version number from output\n" + "of `R --version'.\n") diff --git a/math/rpy2/pkg-plist b/math/rpy2/pkg-plist index a802f8160b4d..3417af8a92fe 100644 --- a/math/rpy2/pkg-plist +++ b/math/rpy2/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_rpy2092.so +%%PYTHON_SITELIBDIR%%/_rpy2101.so %%PYTHON_SITELIBDIR%%/rpy.py %%PYTHON_SITELIBDIR%%/rpy.pyc %%PYTHON_SITELIBDIR%%/rpy.pyo |