diff options
| -rw-r--r-- | math/rpy/Makefile | 3 | ||||
| -rw-r--r-- | math/rpy/files/patch-setup.py | 13 | ||||
| -rw-r--r-- | math/rpy/pkg-plist | 2 | ||||
| -rw-r--r-- | math/rpy2/Makefile | 3 | ||||
| -rw-r--r-- | math/rpy2/files/patch-setup.py | 13 | ||||
| -rw-r--r-- | math/rpy2/pkg-plist | 2 |
6 files changed, 32 insertions, 4 deletions
diff --git a/math/rpy/Makefile b/math/rpy/Makefile index 8108e5b3a9c9..d636d955081a 100644 --- a/math/rpy/Makefile +++ b/math/rpy/Makefile @@ -8,7 +8,7 @@ PORTNAME= rpy PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF @@ -27,5 +27,6 @@ BROKEN= Does not compile post-patch: @${REINPLACE_CMD} -e 's,^statichere ,,' ${WRKSRC}/src/rpymodule.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/math/rpy/files/patch-setup.py b/math/rpy/files/patch-setup.py new file mode 100644 index 000000000000..6cc97c1af08f --- /dev/null +++ b/math/rpy/files/patch-setup.py @@ -0,0 +1,13 @@ +--- 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/rpy/pkg-plist b/math/rpy/pkg-plist index 343cdfb59144..2654e251a09b 100644 --- a/math/rpy/pkg-plist +++ b/math/rpy/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_rpy2061.so +%%PYTHON_SITELIBDIR%%/_rpy2071.so %%PYTHON_SITELIBDIR%%/rpy.py %%PYTHON_SITELIBDIR%%/rpy.pyc %%PYTHON_SITELIBDIR%%/rpy.pyo diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile index 8108e5b3a9c9..d636d955081a 100644 --- a/math/rpy2/Makefile +++ b/math/rpy2/Makefile @@ -8,7 +8,7 @@ PORTNAME= rpy PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF @@ -27,5 +27,6 @@ BROKEN= Does not compile post-patch: @${REINPLACE_CMD} -e 's,^statichere ,,' ${WRKSRC}/src/rpymodule.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/math/rpy2/files/patch-setup.py b/math/rpy2/files/patch-setup.py new file mode 100644 index 000000000000..6cc97c1af08f --- /dev/null +++ b/math/rpy2/files/patch-setup.py @@ -0,0 +1,13 @@ +--- 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/pkg-plist b/math/rpy2/pkg-plist index 343cdfb59144..2654e251a09b 100644 --- a/math/rpy2/pkg-plist +++ b/math/rpy2/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_rpy2061.so +%%PYTHON_SITELIBDIR%%/_rpy2071.so %%PYTHON_SITELIBDIR%%/rpy.py %%PYTHON_SITELIBDIR%%/rpy.pyc %%PYTHON_SITELIBDIR%%/rpy.pyo |