From 08b509ea5d7b06897b6cf810c6a58df5a1411d80 Mon Sep 17 00:00:00 2001 From: bf Date: Sat, 7 May 2011 03:29:59 +0000 Subject: - update to 2.13.0 - switch to the bundled Rblas and Rlapack by default (this can be changed by setting BLAS and LAPACK) which favors correctness in some corner cases over a slight performance penalty; this will be revisited after the blas and lapack updates - replace the STATIC_LIBR option with a LIBR option (on by default): if on, libR.a and libR.so are installed, and R is linked to libR.so. Otherwise, R is static, and no libRs are installed. - remove the superfluous copy of libR.so in ${LOCALBASE}/lib [1] - enable the cairo and pango elements in the X11() graphics device by default, controlled by new PANGOCAIRO option - add a few small patches to dependent ports, bumping PORTREVISION where necessary PR: 153309 [1] Approved by: thierry (rkward*), wen (rpy*, R-cran-*) --- math/rpy/Makefile | 10 ++++++++-- math/rpy/pkg-plist | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'math/rpy') diff --git a/math/rpy/Makefile b/math/rpy/Makefile index de7e2d5b8f1f..4922e11f5a16 100644 --- a/math/rpy/Makefile +++ b/math/rpy/Makefile @@ -8,7 +8,7 @@ PORTNAME= rpy PORTVERSION= 1.0.3 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= math MASTER_SITES= SF @@ -17,7 +17,8 @@ COMMENT= Python interface to the R Programming Language BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \ R:${PORTSDIR}/math/R -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \ + R:${PORTSDIR}/math/R USE_PYTHON= yes USE_PYDISTUTILS= yes @@ -27,4 +28,9 @@ post-patch: @${REINPLACE_CMD} -e 's,^statichere ,,' ${WRKSRC}/src/rpymodule.c @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py +pre-configure: + @(if [ ! -e ${LOCALBASE}/lib/R/lib/libR.so ] ; then \ + ${ECHO_MSG} "==> ${PKGNAME} requires math/R to be built WITH_LIBR" ; \ + exit 1; fi) + .include diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist index 0db2a8caaa68..ba1e10aa6eba 100644 --- a/math/rpy/pkg-plist +++ b/math/rpy/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_rpy2122.so +%%PYTHON_SITELIBDIR%%/_rpy2130.so %%PYTHON_SITELIBDIR%%/rpy.py %%PYTHON_SITELIBDIR%%/rpy.pyc %%PYTHON_SITELIBDIR%%/rpy.pyo -- cgit