diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
| commit | 08acf5c407242344b0047b8040900f52df620dde (patch) | |
| tree | 49936ec28d8b2a4256959f13245d757df97e04bd /math/rpy2/files | |
| parent | Upgrade to version 2.4.0. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_3_0'.release/7.3.0
Diffstat (limited to 'math/rpy2/files')
| -rw-r--r-- | math/rpy2/files/patch-rpy_tools.py | 13 | ||||
| -rw-r--r-- | math/rpy2/files/patch-setup.py | 13 | ||||
| -rw-r--r-- | math/rpy2/files/patch-src-RPy.h | 11 |
3 files changed, 0 insertions, 37 deletions
diff --git a/math/rpy2/files/patch-rpy_tools.py b/math/rpy2/files/patch-rpy_tools.py deleted file mode 100644 index 09f166003c77..000000000000 --- a/math/rpy2/files/patch-rpy_tools.py +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/files/patch-setup.py b/math/rpy2/files/patch-setup.py deleted file mode 100644 index 6cc97c1af08f..000000000000 --- a/math/rpy2/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py.orig 2008-07-29 22:53:21.000000000 +0200 -+++ setup.py 2008-07-29 22:54:04.000000000 +0200 -@@ -159,8 +159,8 @@ - source_files = source_files + ["src/setenv.c"] - else: # unix-like systems, this is known to work for Linux and Solaris - include_dirs = [ os.path.join(RHOME.strip(), 'include'), -- 'src', '/usr/share/R/include' ] -- libraries=['R','Rlapack'] -+ 'src', '%%LOCALBASE%%/lib/R/include' ] -+ libraries=['R','R'] - library_dirs = r_libs - runtime_libs = r_libs - extra_compile_args=["-shared"] diff --git a/math/rpy2/files/patch-src-RPy.h b/math/rpy2/files/patch-src-RPy.h deleted file mode 100644 index 333d43f91776..000000000000 --- a/math/rpy2/files/patch-src-RPy.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/RPy.h.orig 2008-12-17 16:53:19.000000000 +0800 -+++ src/RPy.h 2008-12-17 16:53:35.000000000 +0800 -@@ -74,7 +74,7 @@ - # endif - #endif /* _WIN32 */ - --#include <Rdevices.h> /* must follow Graphics.h */ -+#include <Rembedded.h> /* must follow Graphics.h */ - - - /* Missing definitions from Rinterface.h or RStartup.h */ |