aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--math/rpy/Makefile4
-rw-r--r--math/rpy/distinfo4
-rw-r--r--math/rpy/files/patch-src:setenv.c11
-rw-r--r--math/rpy/pkg-plist7
-rw-r--r--math/rpy2/Makefile4
-rw-r--r--math/rpy2/distinfo4
-rw-r--r--math/rpy2/files/patch-src:setenv.c11
-rw-r--r--math/rpy2/pkg-plist7
8 files changed, 16 insertions, 36 deletions
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index e82c0566289d..1b80517b4eb9 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= rpy
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,6 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib/R/modules"
+MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib"
.include <bsd.port.mk>
diff --git a/math/rpy/distinfo b/math/rpy/distinfo
index d1fdd7fd1ec3..1e745fcd5e65 100644
--- a/math/rpy/distinfo
+++ b/math/rpy/distinfo
@@ -1,2 +1,2 @@
-MD5 (rpy-0.3.1.tar.gz) = 3fd3e825523521bd5084748a60ba4a37
-SIZE (rpy-0.3.1.tar.gz) = 219278
+MD5 (rpy-0.3.5.tar.gz) = afc9ee721007ab1f04d4948f5e4c3787
+SIZE (rpy-0.3.5.tar.gz) = 72829
diff --git a/math/rpy/files/patch-src:setenv.c b/math/rpy/files/patch-src:setenv.c
deleted file mode 100644
index adce3e597b9f..000000000000
--- a/math/rpy/files/patch-src:setenv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/setenv.c.orig Wed Oct 29 14:47:12 2003
-+++ src/setenv.c Wed Oct 29 14:47:19 2003
-@@ -26,8 +26,6 @@
-
- int setenv(const char *name, const char *value, int clobber)
- {
-- char *malloc();
-- char *getenv();
- char *cp;
-
- if (clobber == 0 && getenv(name) != 0)
diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist
index a2013ba86a99..079bb8361364 100644
--- a/math/rpy/pkg-plist
+++ b/math/rpy/pkg-plist
@@ -1,9 +1,10 @@
-%%PYTHON_SITELIBDIR%%/io.py
-%%PYTHON_SITELIBDIR%%/io.pyc
-%%PYTHON_SITELIBDIR%%/io.pyo
+%%PYTHON_SITELIBDIR%%/_rpy.so
%%PYTHON_SITELIBDIR%%/rpy.py
%%PYTHON_SITELIBDIR%%/rpy.pyc
%%PYTHON_SITELIBDIR%%/rpy.pyo
+%%PYTHON_SITELIBDIR%%/rpy_io.py
+%%PYTHON_SITELIBDIR%%/rpy_io.pyc
+%%PYTHON_SITELIBDIR%%/rpy_io.pyo
%%PYTHON_SITELIBDIR%%/rpy_version.py
%%PYTHON_SITELIBDIR%%/rpy_version.pyc
%%PYTHON_SITELIBDIR%%/rpy_version.pyo
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index e82c0566289d..1b80517b4eb9 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= rpy
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,6 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib/R/modules"
+MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib"
.include <bsd.port.mk>
diff --git a/math/rpy2/distinfo b/math/rpy2/distinfo
index d1fdd7fd1ec3..1e745fcd5e65 100644
--- a/math/rpy2/distinfo
+++ b/math/rpy2/distinfo
@@ -1,2 +1,2 @@
-MD5 (rpy-0.3.1.tar.gz) = 3fd3e825523521bd5084748a60ba4a37
-SIZE (rpy-0.3.1.tar.gz) = 219278
+MD5 (rpy-0.3.5.tar.gz) = afc9ee721007ab1f04d4948f5e4c3787
+SIZE (rpy-0.3.5.tar.gz) = 72829
diff --git a/math/rpy2/files/patch-src:setenv.c b/math/rpy2/files/patch-src:setenv.c
deleted file mode 100644
index adce3e597b9f..000000000000
--- a/math/rpy2/files/patch-src:setenv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/setenv.c.orig Wed Oct 29 14:47:12 2003
-+++ src/setenv.c Wed Oct 29 14:47:19 2003
-@@ -26,8 +26,6 @@
-
- int setenv(const char *name, const char *value, int clobber)
- {
-- char *malloc();
-- char *getenv();
- char *cp;
-
- if (clobber == 0 && getenv(name) != 0)
diff --git a/math/rpy2/pkg-plist b/math/rpy2/pkg-plist
index a2013ba86a99..079bb8361364 100644
--- a/math/rpy2/pkg-plist
+++ b/math/rpy2/pkg-plist
@@ -1,9 +1,10 @@
-%%PYTHON_SITELIBDIR%%/io.py
-%%PYTHON_SITELIBDIR%%/io.pyc
-%%PYTHON_SITELIBDIR%%/io.pyo
+%%PYTHON_SITELIBDIR%%/_rpy.so
%%PYTHON_SITELIBDIR%%/rpy.py
%%PYTHON_SITELIBDIR%%/rpy.pyc
%%PYTHON_SITELIBDIR%%/rpy.pyo
+%%PYTHON_SITELIBDIR%%/rpy_io.py
+%%PYTHON_SITELIBDIR%%/rpy_io.pyc
+%%PYTHON_SITELIBDIR%%/rpy_io.pyo
%%PYTHON_SITELIBDIR%%/rpy_version.py
%%PYTHON_SITELIBDIR%%/rpy_version.pyc
%%PYTHON_SITELIBDIR%%/rpy_version.pyo