diff options
| -rw-r--r-- | math/R/Makefile | 5 | ||||
| -rw-r--r-- | math/R/PLIST | 14 | ||||
| -rw-r--r-- | math/R/distinfo | 9 | ||||
| -rw-r--r-- | math/R/patches/patch-src_main_util.c | 26 |
4 files changed, 9 insertions, 45 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index 3eb02db2315..f897d2a55f0 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.125 2012/03/03 00:13:32 wiz Exp $ +# $NetBSD: Makefile,v 1.126 2012/04/15 03:29:47 markd Exp $ -DISTNAME= R-2.14.0 -PKGREVISION= 3 +DISTNAME= R-2.14.2 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-2/} diff --git a/math/R/PLIST b/math/R/PLIST index 4d1753b5c3c..bbbf2279d23 100644 --- a/math/R/PLIST +++ b/math/R/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2011/12/11 18:41:47 markd Exp $ +@comment $NetBSD: PLIST,v 1.14 2012/04/15 03:29:48 markd Exp $ bin/R bin/Rscript lib/R/COPYING @@ -198,9 +198,6 @@ lib/R/library/Matrix/doc/Announce.txt lib/R/library/Matrix/doc/Comparisons.R lib/R/library/Matrix/doc/Comparisons.Rnw lib/R/library/Matrix/doc/Comparisons.pdf -lib/R/library/Matrix/doc/DSC2009_abstract.pdf -lib/R/library/Matrix/doc/DSC2009_abstract.tex -lib/R/library/Matrix/doc/DSC2009_abstract.txt lib/R/library/Matrix/doc/Design-issues.R lib/R/library/Matrix/doc/Design-issues.Rnw lib/R/library/Matrix/doc/Design-issues.pdf @@ -217,9 +214,7 @@ lib/R/library/Matrix/doc/UFsparse/COLAMD.txt lib/R/library/Matrix/doc/UFsparse/SPQR.txt lib/R/library/Matrix/doc/UFsparse/UFconfig.txt lib/R/library/Matrix/doc/UFsparse/UserGuides.txt -lib/R/library/Matrix/doc/fullpage.sty lib/R/library/Matrix/doc/index.html -lib/R/library/Matrix/doc/myVignette.sty lib/R/library/Matrix/doc/sparseModels.R lib/R/library/Matrix/doc/sparseModels.Rnw lib/R/library/Matrix/doc/sparseModels.pdf @@ -1099,6 +1094,7 @@ lib/R/library/stats4/po/pt_BR/LC_MESSAGES/R-stats4.mo lib/R/library/stats4/po/ru/LC_MESSAGES/R-stats4.mo lib/R/library/stats4/po/tr/LC_MESSAGES/R-stats4.mo lib/R/library/stats4/po/zh_CN/LC_MESSAGES/R-stats4.mo +lib/R/library/survival/CITATION lib/R/library/survival/DESCRIPTION lib/R/library/survival/INDEX lib/R/library/survival/Meta/Rd.rds @@ -1116,14 +1112,11 @@ lib/R/library/survival/R/survival.rdx lib/R/library/survival/data/Rdata.rdb lib/R/library/survival/data/Rdata.rds lib/R/library/survival/data/Rdata.rdx -lib/R/library/survival/doc/cgd.dat -lib/R/library/survival/doc/d3.rda lib/R/library/survival/doc/index.html -lib/R/library/survival/doc/raheart.rda lib/R/library/survival/doc/timedep.R lib/R/library/survival/doc/timedep.Rnw lib/R/library/survival/doc/timedep.pdf -lib/R/library/survival/doc/validate.tex +lib/R/library/survival/doc/validate.pdf lib/R/library/survival/help/AnIndex lib/R/library/survival/help/aliases.rds lib/R/library/survival/help/paths.rds @@ -1320,4 +1313,3 @@ lib/R/share/texmf/tex/latex/upquote.sty lib/pkgconfig/libR.pc man/man1/R.1 man/man1/Rscript.1 -@pkgdir lib/R/doc/manual diff --git a/math/R/distinfo b/math/R/distinfo index 6b6aa3a58ee..db9874b1945 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.47 2012/03/06 21:34:29 wiz Exp $ +$NetBSD: distinfo,v 1.48 2012/04/15 03:29:48 markd Exp $ -SHA1 (R-2.14.0.tar.gz) = 0f46bf75a7c150350b1142c29a98e7994d2b4bef -RMD160 (R-2.14.0.tar.gz) = f2f2805c8660d58050be1d11abf376843dbb40ea -Size (R-2.14.0.tar.gz) = 22675106 bytes +SHA1 (R-2.14.2.tar.gz) = 523dca7694e4d0c8701fcc783ea3767e46fe7a62 +RMD160 (R-2.14.2.tar.gz) = 6055dd28a99baa7b23c55f74dc1479e93a0dee58 +Size (R-2.14.2.tar.gz) = 23893986 bytes SHA1 (patch-ac) = ea885d8391ec06a7cc7fcbbadce134c794b7a47c SHA1 (patch-ad) = 43ae23bd0815986c3bac661bd3354cd96b3e54e4 SHA1 (patch-src_main_format.c) = f337358361cd81547305d61be4682c4f73b6531a -SHA1 (patch-src_main_util.c) = ef4d1bc426f49f51903cf2da66897cfa023b2092 diff --git a/math/R/patches/patch-src_main_util.c b/math/R/patches/patch-src_main_util.c deleted file mode 100644 index 76af0411a13..00000000000 --- a/math/R/patches/patch-src_main_util.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_main_util.c,v 1.1 2012/03/06 21:34:29 wiz Exp $ - -Fix build with pcre-8.30+. -Based on Petr Písař <ppisar@redhat.com>'s patch -http://pkgs.fedoraproject.org/gitweb/?p=R.git;a=commitdiff_plain - ---- src/main/util.c.orig 2011-10-02 22:02:33.000000000 +0000 -+++ src/main/util.c -@@ -1257,8 +1257,16 @@ Rboolean mbcsValid(const char *str) - } - - #include "pcre.h" -+#if PCRE_MAJOR > 8 || PCRE_MINOR >= 30 -+extern int _pcre_valid_utf(const char *string, int length, int *erroroffset); -+ -+Rboolean utf8Valid(const char *str) -+{ -+ int errp; -+ return (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0); -+} - /* This changed at 8.13: we don't allow < 8.0 */ --#if PCRE_MAJOR > 8 || PCRE_MINOR >= 13 -+#elif PCRE_MAJOR > 8 || PCRE_MINOR >= 13 - extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset); - - Rboolean utf8Valid(const char *str) |