diff options
| -rw-r--r-- | math/R/distinfo | 4 | ||||
| -rw-r--r-- | math/R/patches/patch-ac | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/math/R/distinfo b/math/R/distinfo index 4b0d8c90849..588c833ae19 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.55 2014/01/09 13:52:41 jperkin Exp $ +$NetBSD: distinfo,v 1.56 2014/01/13 11:25:54 jperkin Exp $ SHA1 (R-3.0.1.tar.gz) = 5cc65476837926fdf04105954ea94efa53ac85ce RMD160 (R-3.0.1.tar.gz) = 09910626891c2962b5c05d204b14d59444da0c3b Size (R-3.0.1.tar.gz) = 25508280 bytes -SHA1 (patch-ac) = f80b8796ba08d0320315716fa1c13d01385fed12 +SHA1 (patch-ac) = cbfe9853a6b1bdfa68d21c0a291f39545b131333 SHA1 (patch-ad) = 21c2f74ceb41afa72b0b268ba4b1dcb57f01e106 SHA1 (patch-doc_manual_R-defs.texi) = 57ad7175cc1bba48bcc74d29c6f85c02a84e4891 SHA1 (patch-doc_manual_R-intro.texi) = 592dbbe5e048f5bcbbb94fa3aec32ff2f0e321ba diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index 4bf5d7e9308..224b29ed87c 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.31 2014/01/09 13:52:41 jperkin Exp $ +$NetBSD: patch-ac,v 1.32 2014/01/13 11:25:54 jperkin Exp $ Do not include system paths in R_LD_LIBRARY_PATH. @@ -205,3 +205,12 @@ Do not include system paths in R_LD_LIBRARY_PATH. void F77_SYMBOL(xerbla)(char *srname, int *info) {} void blas_set () { +@@ -38085,7 +38116,7 @@ case "${host_os}" in + r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib" + ;; + solaris*) +- r_ld_library_defaults="/usr/lib:/lib" ++ r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64" + ;; + darwin*) + r_ld_library_defaults="/usr/X11R6/lib" |