summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2012-05-04 20:56:15 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2012-05-04 20:56:15 +0000
commitaa8976055056c41a1eb0da887a934c6b9fde663b (patch)
tree753f8e1319cd1bc9e3c0bd384ca18b4a7dbb53fa
parent- Fix Sendfile (diff)
- update math/R-cran-psych to 1.2.1 [1]
- update math/R to 2.15.0, and adjust dependent ports - minor changes to bsd.cran.mk [2]: rename MASTER_CRAN_SITES to MASTER_SITE_CRAN, as in bsd.sites.mk; make the install target more flexible and allow CRAN ports to override it; add a regression-test target; set USE_FORTRAN to match math/R; remove some of the redundant checks of USE_R_MOD; honor NOPORTDATA and NOPORTDOCS Reviewed by: thierry, tota, wen Approved by: D. Rue (maintainer) [1], wen [2]
Notes
Notes: svn path=/head/; revision=296023
-rw-r--r--Mk/bsd.cran.mk41
-rw-r--r--astro/R-cran-maptools/Makefile2
-rw-r--r--converters/R-cran-RJSONIO/Makefile2
-rw-r--r--converters/R-cran-rjson/Makefile1
-rw-r--r--databases/R-cran-DBI/Makefile2
-rw-r--r--databases/R-cran-RMySQL/Makefile2
-rw-r--r--devel/R-cran-Defaults/Makefile1
-rw-r--r--devel/R-cran-bitops/Makefile2
-rw-r--r--devel/R-cran-caret/Makefile1
-rw-r--r--devel/R-cran-foreach/Makefile1
-rw-r--r--devel/R-cran-iterators/Makefile1
-rw-r--r--devel/R-cran-itertools/Makefile2
-rw-r--r--devel/R-cran-memoise/Makefile1
-rw-r--r--devel/R-cran-plyr/Makefile2
-rw-r--r--devel/R-cran-proto/Makefile2
-rw-r--r--devel/R-cran-reshape/Makefile2
-rw-r--r--devel/R-cran-reshape2/Makefile2
-rw-r--r--finance/R-cran-PerformanceAnalytics/Makefile1
-rw-r--r--finance/R-cran-RFinanceYJ/Makefile2
-rw-r--r--finance/R-cran-TTR/Makefile1
-rw-r--r--finance/R-cran-ccgarch/Makefile2
-rw-r--r--finance/R-cran-gmm/Makefile2
-rw-r--r--finance/R-cran-lmtest/Makefile2
-rw-r--r--finance/R-cran-plm/Makefile2
-rw-r--r--finance/R-cran-quantmod/Makefile1
-rw-r--r--finance/R-cran-strucchange/Makefile2
-rw-r--r--finance/R-cran-urca/Makefile2
-rw-r--r--finance/R-cran-vars/Makefile2
-rw-r--r--ftp/R-cran-RCurl/Makefile2
-rw-r--r--graphics/R-cran-RColorBrewer/Makefile2
-rw-r--r--graphics/R-cran-colorspace/Makefile2
-rw-r--r--graphics/R-cran-diagram/Makefile2
-rw-r--r--graphics/R-cran-dichromat/Makefile2
-rw-r--r--graphics/R-cran-ggplot2/Makefile1
-rw-r--r--graphics/R-cran-munsell/Makefile2
-rw-r--r--graphics/R-cran-pixmap/Makefile2
-rw-r--r--graphics/R-cran-rgdal/Makefile2
-rw-r--r--graphics/R-cran-rtiff/Makefile2
-rw-r--r--graphics/R-cran-scales/Makefile1
-rw-r--r--graphics/R-cran-shape/Makefile2
-rw-r--r--math/R-cran-Formula/Makefile2
-rw-r--r--math/R-cran-KFAS/Makefile2
-rw-r--r--math/R-cran-RSvgDevice/Makefile2
-rw-r--r--math/R-cran-SuppDists/Makefile4
-rw-r--r--math/R-cran-Zelig/Makefile1
-rw-r--r--math/R-cran-bdsmatrix/Makefile2
-rw-r--r--math/R-cran-car/Makefile1
-rw-r--r--math/R-cran-coda/Makefile1
-rw-r--r--math/R-cran-deldir/Makefile1
-rw-r--r--math/R-cran-gpclib/Makefile2
-rw-r--r--math/R-cran-igraph/Makefile2
-rw-r--r--math/R-cran-inline/Makefile2
-rw-r--r--math/R-cran-memisc/Makefile2
-rw-r--r--math/R-cran-mvtnorm/Makefile2
-rw-r--r--math/R-cran-psych/Makefile7
-rw-r--r--math/R-cran-psych/distinfo4
-rw-r--r--math/R-cran-sandwich/Makefile2
-rw-r--r--math/R-cran-sm/Makefile2
-rw-r--r--math/R-cran-sp/Makefile1
-rw-r--r--math/R-cran-spdep/Makefile1
-rw-r--r--math/R-cran-xts/Makefile1
-rw-r--r--math/R-cran-zoo/Makefile2
-rw-r--r--math/R/Makefile3
-rw-r--r--math/R/distinfo4
-rw-r--r--math/R/pkg-plist131
-rw-r--r--math/ess/Makefile1
-rw-r--r--math/p5-Statistics-R/Makefile1
-rw-r--r--math/rkward-kde4/Makefile2
-rw-r--r--math/rkward/Makefile2
-rw-r--r--math/rpy/Makefile2
-rw-r--r--math/rpy/pkg-plist2
-rw-r--r--math/rpy2/Makefile1
-rw-r--r--net/R-cran-twitteR/Makefile2
-rw-r--r--science/R-cran-AMORE/Makefile2
-rw-r--r--science/R-cran-DCluster/Makefile1
-rw-r--r--science/R-cran-Epi/Makefile1
-rw-r--r--science/R-cran-bayesm/Makefile2
-rw-r--r--science/R-cran-e1071/Makefile2
-rw-r--r--science/R-cran-eco/Makefile2
-rw-r--r--science/R-cran-epicalc/Makefile2
-rw-r--r--science/R-cran-snow/Makefile1
-rw-r--r--science/R-cran-som/Makefile1
-rw-r--r--security/R-cran-ROAuth/Makefile2
-rw-r--r--security/R-cran-digest/Makefile1
-rw-r--r--textproc/R-cran-XML/Makefile2
-rw-r--r--textproc/R-cran-stringr/Makefile2
-rw-r--r--textproc/R-cran-xtable/Makefile2
-rw-r--r--www/R-cran-Rpad/Makefile2
-rw-r--r--www/R-cran-scrapeR/Makefile2
89 files changed, 200 insertions, 132 deletions
diff --git a/Mk/bsd.cran.mk b/Mk/bsd.cran.mk
index fc4506726562..a478bfca4b10 100644
--- a/Mk/bsd.cran.mk
+++ b/Mk/bsd.cran.mk
@@ -6,8 +6,7 @@
CRAN_Include_MAINTAINER= wen@FreeBSD.org
-.if defined(USE_R_MOD)
-MASTER_CRAN_SITES+= http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \
+MASTER_SITE_CRAN+= http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \
http://cran.rakanu.com/src/contrib/ \
http://cran.ms.unimelb.edu.au/src/contrib/ \
http://mirror.its.dal.ca/cran/src/contrib/ \
@@ -18,16 +17,14 @@ MASTER_CRAN_SITES+= http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \
http://cran.md.tsukuba.ac.jp/src/contrib/ \
http://mirrors.ibiblio.org/pub/mirrors/CRAN/src/contrib/ \
http://cran.cnr.berkeley.edu/src/contrib/
-.endif
-MASTER_SITES?= ${MASTER_CRAN_SITES}
+MASTER_SITES?= ${MASTER_SITE_CRAN}
-.if defined(USE_R_MOD)
+USE_FORTRAN= yes
BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
PKGNAMEPREFIX?= R-cran-
-.endif
R_MOD_DIR?= lib/R/library/${PORTNAME}
PLIST_SUB+= R_MOD_DIR=${R_MOD_DIR}
@@ -35,14 +32,38 @@ WRKSRC?= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
R_COMMAND= ${LOCALBASE}/bin/R
-R_INS= ${R_COMMAND} CMD INSTALL
+
+.if !target(regression-test)
+R_POSTCMD_CHECK_OPTIONS?= --timings
+
+.if !exists(${LOCALBASE}/bin/pdflatex)
+R_POSTCMD_CHECK_OPTIONS+= --no-manual --no-rebuild-vignettes
+.endif
+
+regression-test: build
+ @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \
+ ${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \
+ ${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME}
+.endif
+
+.if !target(do-install)
+.if defined(NOPORTDATA)
+R_POSTCMD_INSTALL_OPTIONS+= --no-data --no-demo
+.else
+R_POSTCMD_INSTALL_OPTIONS+= --install-tests
+.endif
+
+.if defined(NOPORTDOCS)
+R_POSTCMD_INSTALL_OPTIONS+= --no-docs --no-html
+.endif
do-install:
-.if defined(USE_R_MOD)
- @cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${R_INS} ${PORTNAME}
+ @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} ${R_COMMAND} \
+ ${R_PRECMD_INSTALL_OPTIONS} CMD INSTALL \
+ ${R_POSTCMD_INSTALL_OPTIONS} ${PORTNAME}
.endif
-.if defined(USE_R_MOD) && defined(R_MOD_AUTOPLIST)
+.if defined(R_MOD_AUTOPLIST)
.if !target(post-install-script)
post-install-script:
@${FIND} -ds ${PREFIX}/${R_MOD_DIR} \( -type f -or -type l \) -print | \
diff --git a/astro/R-cran-maptools/Makefile b/astro/R-cran-maptools/Makefile
index 4246fb0804d4..fcc088b4dafd 100644
--- a/astro/R-cran-maptools/Makefile
+++ b/astro/R-cran-maptools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= maptools
DISTVERSION= 0.8-14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/converters/R-cran-RJSONIO/Makefile b/converters/R-cran-RJSONIO/Makefile
index 4f76083c3995..7ae8b4dc1942 100644
--- a/converters/R-cran-RJSONIO/Makefile
+++ b/converters/R-cran-RJSONIO/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RJSONIO
DISTVERSION= 0.98-1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/converters/R-cran-rjson/Makefile b/converters/R-cran-rjson/Makefile
index dd7c3c825b8c..3b17193f07d6 100644
--- a/converters/R-cran-rjson/Makefile
+++ b/converters/R-cran-rjson/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rjson
PORTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= converters
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/databases/R-cran-DBI/Makefile b/databases/R-cran-DBI/Makefile
index 3911f4756aaf..e9e40e574f4d 100644
--- a/databases/R-cran-DBI/Makefile
+++ b/databases/R-cran-DBI/Makefile
@@ -7,7 +7,7 @@
PORTNAME= DBI
DISTVERSION= 0.2-5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/databases/R-cran-RMySQL/Makefile b/databases/R-cran-RMySQL/Makefile
index 34258ff792d4..3fb310054222 100644
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RMySQL
DISTVERSION= 0.9-3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-Defaults/Makefile b/devel/R-cran-Defaults/Makefile
index 707a9b9b1e5b..b541d5d06514 100644
--- a/devel/R-cran-Defaults/Makefile
+++ b/devel/R-cran-Defaults/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Defaults
DISTVERSION= 1.1-1
+PORTREVISION= 1
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-bitops/Makefile b/devel/R-cran-bitops/Makefile
index af804dfcc0c2..d1954abc60d7 100644
--- a/devel/R-cran-bitops/Makefile
+++ b/devel/R-cran-bitops/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bitops
DISTVERSION= 1.0-4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-caret/Makefile b/devel/R-cran-caret/Makefile
index 64cf87188491..01f427146d20 100644
--- a/devel/R-cran-caret/Makefile
+++ b/devel/R-cran-caret/Makefile
@@ -7,6 +7,7 @@
PORTNAME= caret
DISTVERSION= 5.15-023
+PORTREVISION= 1
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index cc1099dfc9ef..ee25a7b5b92c 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -7,6 +7,7 @@
PORTNAME= foreach
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/devel/R-cran-iterators/Makefile b/devel/R-cran-iterators/Makefile
index 942bea33bca6..79a9a4af8c12 100644
--- a/devel/R-cran-iterators/Makefile
+++ b/devel/R-cran-iterators/Makefile
@@ -7,6 +7,7 @@
PORTNAME= iterators
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/devel/R-cran-itertools/Makefile b/devel/R-cran-itertools/Makefile
index d760cc030b9c..1ef5eb9a2152 100644
--- a/devel/R-cran-itertools/Makefile
+++ b/devel/R-cran-itertools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= itertools
DISTVERSION= 0.1-1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-memoise/Makefile b/devel/R-cran-memoise/Makefile
index 7cf9a76ce2af..44c7793665b4 100644
--- a/devel/R-cran-memoise/Makefile
+++ b/devel/R-cran-memoise/Makefile
@@ -7,6 +7,7 @@
PORTNAME= memoise
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile
index ca3a6c979b1f..494911f7cf35 100644
--- a/devel/R-cran-plyr/Makefile
+++ b/devel/R-cran-plyr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plyr
PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-proto/Makefile b/devel/R-cran-proto/Makefile
index 69dfbe100b8b..2e0ad60b3266 100644
--- a/devel/R-cran-proto/Makefile
+++ b/devel/R-cran-proto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= proto
DISTVERSION= 0.3-9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/devel/R-cran-reshape/Makefile b/devel/R-cran-reshape/Makefile
index ac2c180434d4..ceff01aabfe2 100644
--- a/devel/R-cran-reshape/Makefile
+++ b/devel/R-cran-reshape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= reshape
PORTVERSION= 0.8.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/devel/R-cran-reshape2/Makefile b/devel/R-cran-reshape2/Makefile
index 92decb6c1ffb..60635a754b79 100644
--- a/devel/R-cran-reshape2/Makefile
+++ b/devel/R-cran-reshape2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= reshape2
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/finance/R-cran-PerformanceAnalytics/Makefile b/finance/R-cran-PerformanceAnalytics/Makefile
index 67ae9ceba8a2..91bd5382018a 100644
--- a/finance/R-cran-PerformanceAnalytics/Makefile
+++ b/finance/R-cran-PerformanceAnalytics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= PerformanceAnalytics
PORTVERSION= 1.0.4.4
+PORTREVISION= 1
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/finance/R-cran-RFinanceYJ/Makefile b/finance/R-cran-RFinanceYJ/Makefile
index fd7b02ab103e..bd75c8340b35 100644
--- a/finance/R-cran-RFinanceYJ/Makefile
+++ b/finance/R-cran-RFinanceYJ/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RFinanceYJ
PORTVERSION= 0.1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/finance/R-cran-TTR/Makefile b/finance/R-cran-TTR/Makefile
index cb552842557f..726d347d8561 100644
--- a/finance/R-cran-TTR/Makefile
+++ b/finance/R-cran-TTR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= TTR
DISTVERSION= 0.21-1
+PORTREVISION= 1
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-ccgarch/Makefile b/finance/R-cran-ccgarch/Makefile
index ba881992c504..b6a84822fe6c 100644
--- a/finance/R-cran-ccgarch/Makefile
+++ b/finance/R-cran-ccgarch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ccgarch
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/finance/R-cran-gmm/Makefile b/finance/R-cran-gmm/Makefile
index 8db21f60ac90..a6140fe5db64 100644
--- a/finance/R-cran-gmm/Makefile
+++ b/finance/R-cran-gmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmm
DISTVERSION= 1.3-8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-lmtest/Makefile b/finance/R-cran-lmtest/Makefile
index 809e86d9618c..7218627ef705 100644
--- a/finance/R-cran-lmtest/Makefile
+++ b/finance/R-cran-lmtest/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lmtest
DISTVERSION= 0.9-29
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-plm/Makefile b/finance/R-cran-plm/Makefile
index a0b58f69b2f6..dab8c63ca79c 100644
--- a/finance/R-cran-plm/Makefile
+++ b/finance/R-cran-plm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plm
DISTVERSION= 1.2-8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-quantmod/Makefile b/finance/R-cran-quantmod/Makefile
index e816e60f00fe..5d7fc37e58be 100644
--- a/finance/R-cran-quantmod/Makefile
+++ b/finance/R-cran-quantmod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quantmod
DISTVERSION= 0.3-17
+PORTREVISION= 1
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-strucchange/Makefile b/finance/R-cran-strucchange/Makefile
index c899d5f1d5c3..4e2468d10180 100644
--- a/finance/R-cran-strucchange/Makefile
+++ b/finance/R-cran-strucchange/Makefile
@@ -7,7 +7,7 @@
PORTNAME= strucchange
DISTVERSION= 1.4-6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-urca/Makefile b/finance/R-cran-urca/Makefile
index 21bbf2cb4b1a..8053ba6ce00b 100644
--- a/finance/R-cran-urca/Makefile
+++ b/finance/R-cran-urca/Makefile
@@ -7,7 +7,7 @@
PORTNAME= urca
DISTVERSION= 1.2-6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/finance/R-cran-vars/Makefile b/finance/R-cran-vars/Makefile
index 851ff3471512..66903b196d13 100644
--- a/finance/R-cran-vars/Makefile
+++ b/finance/R-cran-vars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vars
DISTVERSION= 1.4-9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
index 1b6a236e0224..ff2e5ad495ec 100644
--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RCurl
DISTVERSION= 1.91-1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-RColorBrewer/Makefile b/graphics/R-cran-RColorBrewer/Makefile
index ff3ed96122e2..a07bab9ee8d7 100644
--- a/graphics/R-cran-RColorBrewer/Makefile
+++ b/graphics/R-cran-RColorBrewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RColorBrewer
DISTVERSION= 1.0-5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-colorspace/Makefile b/graphics/R-cran-colorspace/Makefile
index 85beff8d3f3e..9ff5b838aee0 100644
--- a/graphics/R-cran-colorspace/Makefile
+++ b/graphics/R-cran-colorspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= colorspace
DISTVERSION= 1.1-1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-diagram/Makefile b/graphics/R-cran-diagram/Makefile
index 3d217e5e36a2..1080d1525331 100644
--- a/graphics/R-cran-diagram/Makefile
+++ b/graphics/R-cran-diagram/Makefile
@@ -7,7 +7,7 @@
PORTNAME= diagram
PORTVERSION= 1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/R-cran-dichromat/Makefile b/graphics/R-cran-dichromat/Makefile
index 5f144526dc8f..1d8522903b68 100644
--- a/graphics/R-cran-dichromat/Makefile
+++ b/graphics/R-cran-dichromat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dichromat
DISTVERSION= 1.2-4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-ggplot2/Makefile b/graphics/R-cran-ggplot2/Makefile
index f74cacc222f7..75fdb30537a9 100644
--- a/graphics/R-cran-ggplot2/Makefile
+++ b/graphics/R-cran-ggplot2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ggplot2
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/R-cran-munsell/Makefile b/graphics/R-cran-munsell/Makefile
index e6937a39ee0e..1d210f12e733 100644
--- a/graphics/R-cran-munsell/Makefile
+++ b/graphics/R-cran-munsell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= munsell
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/R-cran-pixmap/Makefile b/graphics/R-cran-pixmap/Makefile
index e34fea0f1998..ec02cdd2bcd5 100644
--- a/graphics/R-cran-pixmap/Makefile
+++ b/graphics/R-cran-pixmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pixmap
DISTVERSION= 0.4-11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index 421da98e9e5b..726b4ca32c11 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rgdal
DISTVERSION= 0.7-8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-rtiff/Makefile b/graphics/R-cran-rtiff/Makefile
index dcda0269186c..5a68f136e15c 100644
--- a/graphics/R-cran-rtiff/Makefile
+++ b/graphics/R-cran-rtiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rtiff
PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/R-cran-scales/Makefile b/graphics/R-cran-scales/Makefile
index bc970fa6419b..85cf468a98aa 100644
--- a/graphics/R-cran-scales/Makefile
+++ b/graphics/R-cran-scales/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scales
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/R-cran-shape/Makefile b/graphics/R-cran-shape/Makefile
index a62c672da056..5df8c639c86b 100644
--- a/graphics/R-cran-shape/Makefile
+++ b/graphics/R-cran-shape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= shape
PORTVERSION= 1.3.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-Formula/Makefile b/math/R-cran-Formula/Makefile
index b70a529ff154..46974d3e4a57 100644
--- a/math/R-cran-Formula/Makefile
+++ b/math/R-cran-Formula/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Formula
DISTVERSION= 1.1-0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-KFAS/Makefile b/math/R-cran-KFAS/Makefile
index 9a96059853f1..5c2c5e2043f5 100644
--- a/math/R-cran-KFAS/Makefile
+++ b/math/R-cran-KFAS/Makefile
@@ -7,7 +7,7 @@
PORTNAME= KFAS
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index 681a3c90008d..65e038e64816 100644
--- a/math/R-cran-RSvgDevice/Makefile
+++ b/math/R-cran-RSvgDevice/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RSvgDevice
PORTVERSION= 0.6.4.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index 82b4ff5a8108..f4adb3c682b4 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -7,9 +7,9 @@
PORTNAME= SuppDists
DISTVERSION= 1.1-8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math
-MASTER_SITES= ${MASTER_CRAN_SITES} \
+MASTER_SITES= ${MASTER_SITE_CRAN} \
http://r.research.att.com/benchmarks/:benchmark \
LOCAL/bf:benchmark
DISTFILES= ${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index 571578e48324..00a37853ca70 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Zelig
DISTVERSION= 3.5.5
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-bdsmatrix/Makefile b/math/R-cran-bdsmatrix/Makefile
index b78e774bef19..daacd4b2f81a 100644
--- a/math/R-cran-bdsmatrix/Makefile
+++ b/math/R-cran-bdsmatrix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bdsmatrix
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index 7168c31dce90..b1f5b9273902 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -7,6 +7,7 @@
PORTNAME= car
DISTVERSION= 2.0-12
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile
index e78e747a4acf..c061b3ef4072 100644
--- a/math/R-cran-coda/Makefile
+++ b/math/R-cran-coda/Makefile
@@ -7,6 +7,7 @@
PORTNAME= coda
DISTVERSION= 0.14-7
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-deldir/Makefile b/math/R-cran-deldir/Makefile
index 95371730ebfb..22c8891045b8 100644
--- a/math/R-cran-deldir/Makefile
+++ b/math/R-cran-deldir/Makefile
@@ -7,6 +7,7 @@
PORTNAME= deldir
DISTVERSION= 0.0-19
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index 07550f0589b7..7642525a343f 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpclib
DISTVERSION= 1.5-1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 8452665acaf8..11ad6d16a4ff 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= igraph
DISTVERSION= 0.5.5-4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index 9a36dea2728f..5289bc23073a 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inline
PORTVERSION= 0.3.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index c4c3e9657ca0..c3ca2b7ff4d7 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= memisc
DISTVERSION= 0.95-38
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-mvtnorm/Makefile b/math/R-cran-mvtnorm/Makefile
index 77930a4a2093..e5b4a45de751 100644
--- a/math/R-cran-mvtnorm/Makefile
+++ b/math/R-cran-mvtnorm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mvtnorm
PORTVERSION= 0.9.96
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index 2e332f2957ba..d58044ddc6f0 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= psych
-PORTVERSION= 1.0.94
-PORTREVISION= 6
+PORTVERSION= 1.2.1
CATEGORIES= math science
-DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= drue@therub.org
COMMENT= Psych package for the R project
-USE_R_MOD= yes
+USE_R_MOD= yes
R_MOD_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/math/R-cran-psych/distinfo b/math/R-cran-psych/distinfo
index 9262a76b6cf1..e371c2670354 100644
--- a/math/R-cran-psych/distinfo
+++ b/math/R-cran-psych/distinfo
@@ -1,2 +1,2 @@
-SHA256 (psych_1.0-94.tar.gz) = ba545081583cbdcb834bb8c9b65c63dd2598bd4c98b9af464ec82fe4bcfbf246
-SIZE (psych_1.0-94.tar.gz) = 1516940
+SHA256 (psych_1.2.1.tar.gz) = df1560859e98d862eed66f7e88a4178a757983becaefd17adeec13fc6d9b6e4d
+SIZE (psych_1.2.1.tar.gz) = 1939946
diff --git a/math/R-cran-sandwich/Makefile b/math/R-cran-sandwich/Makefile
index 7f8d516bd87b..61d50bc96c8f 100644
--- a/math/R-cran-sandwich/Makefile
+++ b/math/R-cran-sandwich/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sandwich
DISTVERSION= 2.2-9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index 89343d47c52e..af649400ed92 100644
--- a/math/R-cran-sm/Makefile
+++ b/math/R-cran-sm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sm
DISTVERSION= 2.2-4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index f3441d7bf0ee..37b28b9f186d 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sp
DISTVERSION= 0.9-98
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-spdep/Makefile b/math/R-cran-spdep/Makefile
index 5c3b16edce02..18baca820eca 100644
--- a/math/R-cran-spdep/Makefile
+++ b/math/R-cran-spdep/Makefile
@@ -7,6 +7,7 @@
PORTNAME= spdep
DISTVERSION= 0.5-45
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-xts/Makefile b/math/R-cran-xts/Makefile
index 532f157d3b13..a923ecc95807 100644
--- a/math/R-cran-xts/Makefile
+++ b/math/R-cran-xts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xts
DISTVERSION= 0.8-6
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-zoo/Makefile b/math/R-cran-zoo/Makefile
index bd55c6c32c30..a1ae00a1373e 100644
--- a/math/R-cran-zoo/Makefile
+++ b/math/R-cran-zoo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zoo
DISTVERSION= 1.7-7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R/Makefile b/math/R/Makefile
index fcbaa6b84db7..d94bce0b794b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME?= R
-PORTVERSION= 2.14.2
+PORTVERSION= 2.15.0
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@@ -236,6 +236,7 @@ post-patch:
${WRKSRC}/src/extra/tzone/tzfile.h \
${WRKSRC}/src/scripts/javareconf
.if !defined(LIBRMATH_SLAVEPORT)
+ @${RM} -rf ${WRKSRC}/src/library/compiler/inst/po/compiler-zh_CN
.if defined(WITHOUT_NLS)
@(cd ${WRKSRC}/src/library/Recommended; \
for tarfile in *.tgz *.tar.gz ; do \
diff --git a/math/R/distinfo b/math/R/distinfo
index dab42c92e685..67767e7a7b14 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,2 +1,2 @@
-SHA256 (R-2.14.2.tar.gz) = ccd8b43a746dc7105a1c77423ea1bb72dc333b41d9e9801a96d6f71c2266736e
-SIZE (R-2.14.2.tar.gz) = 23893986
+SHA256 (R-2.15.0.tar.gz) = 6f26304773e92d8b61f150e1ccd21c153a32b89e8032b1ece45e5f4c34d9e397
+SIZE (R-2.15.0.tar.gz) = 24195517
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index e8bb51ecc09b..380f596595d4 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -36,7 +36,7 @@ lib/R/bin/LINK
lib/R/bin/R
lib/R/bin/REMOVE
lib/R/bin/Rcmd
-lib/R/bin/Rd2dvi
+lib/R/bin/Rd2pdf
lib/R/bin/Rdconv
lib/R/bin/Rdiff
lib/R/bin/Rprof
@@ -100,12 +100,12 @@ lib/R/include/Rinternals.h
lib/R/include/Rmath.h
lib/R/include/Rversion.h
lib/R/include/S.h
-%%LIBR%%lib/R/lib/libR.so
-%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
%%LAPACK%%lib/R/lib/libRblas.so
%%LAPACK%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
%%LAPACK%%lib/R/lib/libRlapack.so
%%LAPACK%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
+%%LIBR%%lib/R/lib/libR.so
+%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
lib/R/library/KernSmooth/DESCRIPTION
lib/R/library/KernSmooth/INDEX
lib/R/library/KernSmooth/LICENCE
@@ -177,8 +177,6 @@ lib/R/library/Matrix/Copyrights
lib/R/library/Matrix/DESCRIPTION
lib/R/library/Matrix/Doxyfile
lib/R/library/Matrix/INDEX
-lib/R/library/Matrix/test-tools-1.R
-lib/R/library/Matrix/test-tools-Matrix.R
lib/R/library/Matrix/Meta/Rd.rds
lib/R/library/Matrix/Meta/data.rds
lib/R/library/Matrix/Meta/hsearch.rds
@@ -241,6 +239,8 @@ lib/R/library/Matrix/libs/Matrix.so
%%NLS%%lib/R/library/Matrix/po/de/LC_MESSAGES/R-Matrix.mo
%%NLS%%lib/R/library/Matrix/po/en@quot/LC_MESSAGES/Matrix.mo
%%NLS%%lib/R/library/Matrix/po/en@quot/LC_MESSAGES/R-Matrix.mo
+lib/R/library/Matrix/test-tools-1.R
+lib/R/library/Matrix/test-tools-Matrix.R
lib/R/library/Matrix/test-tools.R
lib/R/library/base/CITATION
lib/R/library/base/DESCRIPTION
@@ -265,6 +265,7 @@ lib/R/library/base/help/base.rdx
lib/R/library/base/help/paths.rds
lib/R/library/base/html/00Index.html
lib/R/library/base/html/R.css
+%%NLS%%lib/R/library/base/po/da/LC_MESSAGES/R-base.mo
%%NLS%%lib/R/library/base/po/de/LC_MESSAGES/R-base.mo
%%NLS%%lib/R/library/base/po/en@quot/LC_MESSAGES/R-base.mo
%%NLS%%lib/R/library/base/po/fr/LC_MESSAGES/R-base.mo
@@ -389,21 +390,23 @@ lib/R/library/compiler/help/compiler.rdx
lib/R/library/compiler/help/paths.rds
lib/R/library/compiler/html/00Index.html
lib/R/library/compiler/html/R.css
+%%NLS%%lib/R/library/compiler/po/da/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/de/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/en@quot/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/fr/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/ja/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/pt_BR/LC_MESSAGES/R-compiler.mo
%%NLS%%lib/R/library/compiler/po/ru/LC_MESSAGES/R-compiler.mo
+%%NLS%%lib/R/library/compiler/po/zh_CN/LC_MESSAGES/R-compiler.mo
lib/R/library/datasets/DESCRIPTION
lib/R/library/datasets/INDEX
-lib/R/library/datasets/NAMESPACE
lib/R/library/datasets/Meta/Rd.rds
lib/R/library/datasets/Meta/data.rds
lib/R/library/datasets/Meta/hsearch.rds
lib/R/library/datasets/Meta/links.rds
lib/R/library/datasets/Meta/nsInfo.rds
lib/R/library/datasets/Meta/package.rds
+lib/R/library/datasets/NAMESPACE
lib/R/library/datasets/data/Rdata.rdb
lib/R/library/datasets/data/Rdata.rds
lib/R/library/datasets/data/Rdata.rdx
@@ -573,6 +576,8 @@ lib/R/library/grDevices/icc/srgb
lib/R/library/grDevices/icc/srgb.flate
%%PANGOCAIRO%%lib/R/library/grDevices/libs/cairo.so
lib/R/library/grDevices/libs/grDevices.so
+%%NLS%%lib/R/library/grDevices/po/da/LC_MESSAGES/R-grDevices.mo
+%%NLS%%lib/R/library/grDevices/po/da/LC_MESSAGES/grDevices.mo
%%NLS%%lib/R/library/grDevices/po/de/LC_MESSAGES/R-grDevices.mo
%%NLS%%lib/R/library/grDevices/po/de/LC_MESSAGES/grDevices.mo
%%NLS%%lib/R/library/grDevices/po/en_GB/LC_MESSAGES/R-grDevices.mo
@@ -613,9 +618,6 @@ lib/R/library/graphics/demo/persp.R
lib/R/library/graphics/demo/plotmath.R
lib/R/library/graphics/help/AnIndex
lib/R/library/graphics/help/aliases.rds
-lib/R/library/graphics/help/graphics.rdb
-lib/R/library/graphics/help/graphics.rdx
-lib/R/library/graphics/help/paths.rds
lib/R/library/graphics/help/figures/mai.pdf
lib/R/library/graphics/help/figures/mai.png
lib/R/library/graphics/help/figures/oma.pdf
@@ -623,8 +625,12 @@ lib/R/library/graphics/help/figures/oma.png
lib/R/library/graphics/help/figures/pch.pdf
lib/R/library/graphics/help/figures/pch.png
lib/R/library/graphics/help/figures/pch.svg
+lib/R/library/graphics/help/graphics.rdb
+lib/R/library/graphics/help/graphics.rdx
+lib/R/library/graphics/help/paths.rds
lib/R/library/graphics/html/00Index.html
lib/R/library/graphics/html/R.css
+%%NLS%%lib/R/library/graphics/po/da/LC_MESSAGES/R-graphics.mo
%%NLS%%lib/R/library/graphics/po/de/LC_MESSAGES/R-graphics.mo
%%NLS%%lib/R/library/graphics/po/en@quot/LC_MESSAGES/R-graphics.mo
%%NLS%%lib/R/library/graphics/po/fr/LC_MESSAGES/R-graphics.mo
@@ -641,51 +647,23 @@ lib/R/library/grid/Meta/hsearch.rds
lib/R/library/grid/Meta/links.rds
lib/R/library/grid/Meta/nsInfo.rds
lib/R/library/grid/Meta/package.rds
-lib/R/library/grid/Meta/vignette.rds
lib/R/library/grid/NAMESPACE
lib/R/library/grid/R/grid
lib/R/library/grid/R/grid.rdb
lib/R/library/grid/R/grid.rdx
lib/R/library/grid/doc/changes.txt
-lib/R/library/grid/doc/displaylist.R
-lib/R/library/grid/doc/displaylist.Rnw
lib/R/library/grid/doc/displaylist.pdf
-lib/R/library/grid/doc/frame.R
-lib/R/library/grid/doc/frame.Rnw
lib/R/library/grid/doc/frame.pdf
-lib/R/library/grid/doc/grid.R
-lib/R/library/grid/doc/grid.Rnw
lib/R/library/grid/doc/grid.pdf
-lib/R/library/grid/doc/grobs.R
-lib/R/library/grid/doc/grobs.Rnw
lib/R/library/grid/doc/grobs.pdf
-lib/R/library/grid/doc/index.html
-lib/R/library/grid/doc/interactive.R
-lib/R/library/grid/doc/interactive.Rnw
lib/R/library/grid/doc/interactive.pdf
-lib/R/library/grid/doc/locndimn.R
-lib/R/library/grid/doc/locndimn.Rnw
lib/R/library/grid/doc/locndimn.pdf
-lib/R/library/grid/doc/moveline.R
-lib/R/library/grid/doc/moveline.Rnw
lib/R/library/grid/doc/moveline.pdf
-lib/R/library/grid/doc/nonfinite.R
-lib/R/library/grid/doc/nonfinite.Rnw
lib/R/library/grid/doc/nonfinite.pdf
-lib/R/library/grid/doc/plotexample.R
-lib/R/library/grid/doc/plotexample.Rnw
lib/R/library/grid/doc/plotexample.pdf
-lib/R/library/grid/doc/rotated.R
-lib/R/library/grid/doc/rotated.Rnw
lib/R/library/grid/doc/rotated.pdf
-lib/R/library/grid/doc/saveload.R
-lib/R/library/grid/doc/saveload.Rnw
lib/R/library/grid/doc/saveload.pdf
-lib/R/library/grid/doc/sharing.R
-lib/R/library/grid/doc/sharing.Rnw
lib/R/library/grid/doc/sharing.pdf
-lib/R/library/grid/doc/viewports.R
-lib/R/library/grid/doc/viewports.Rnw
lib/R/library/grid/doc/viewports.pdf
lib/R/library/grid/help/AnIndex
lib/R/library/grid/help/aliases.rds
@@ -695,6 +673,8 @@ lib/R/library/grid/help/paths.rds
lib/R/library/grid/html/00Index.html
lib/R/library/grid/html/R.css
lib/R/library/grid/libs/grid.so
+%%NLS%%lib/R/library/grid/po/da/LC_MESSAGES/R-grid.mo
+%%NLS%%lib/R/library/grid/po/da/LC_MESSAGES/grid.mo
%%NLS%%lib/R/library/grid/po/de/LC_MESSAGES/R-grid.mo
%%NLS%%lib/R/library/grid/po/de/LC_MESSAGES/grid.mo
%%NLS%%lib/R/library/grid/po/en@quot/LC_MESSAGES/R-grid.mo
@@ -765,6 +745,8 @@ lib/R/library/methods/help/paths.rds
lib/R/library/methods/html/00Index.html
lib/R/library/methods/html/R.css
lib/R/library/methods/libs/methods.so
+%%NLS%%lib/R/library/methods/po/da/LC_MESSAGES/R-methods.mo
+%%NLS%%lib/R/library/methods/po/da/LC_MESSAGES/methods.mo
%%NLS%%lib/R/library/methods/po/de/LC_MESSAGES/R-methods.mo
%%NLS%%lib/R/library/methods/po/de/LC_MESSAGES/methods.mo
%%NLS%%lib/R/library/methods/po/en@quot/LC_MESSAGES/R-methods.mo
@@ -877,14 +859,10 @@ lib/R/library/parallel/Meta/hsearch.rds
lib/R/library/parallel/Meta/links.rds
lib/R/library/parallel/Meta/nsInfo.rds
lib/R/library/parallel/Meta/package.rds
-lib/R/library/parallel/Meta/vignette.rds
lib/R/library/parallel/NAMESPACE
lib/R/library/parallel/R/parallel
lib/R/library/parallel/R/parallel.rdb
lib/R/library/parallel/R/parallel.rdx
-lib/R/library/parallel/doc/index.html
-lib/R/library/parallel/doc/parallel.R
-lib/R/library/parallel/doc/parallel.Rnw
lib/R/library/parallel/doc/parallel.pdf
lib/R/library/parallel/help/AnIndex
lib/R/library/parallel/help/aliases.rds
@@ -894,6 +872,8 @@ lib/R/library/parallel/help/paths.rds
lib/R/library/parallel/html/00Index.html
lib/R/library/parallel/html/R.css
lib/R/library/parallel/libs/parallel.so
+%%NLS%%lib/R/library/parallel/po/da/LC_MESSAGES/R-parallel.mo
+%%NLS%%lib/R/library/parallel/po/da/LC_MESSAGES/parallel.mo
%%NLS%%lib/R/library/parallel/po/de/LC_MESSAGES/R-parallel.mo
%%NLS%%lib/R/library/parallel/po/de/LC_MESSAGES/parallel.mo
%%NLS%%lib/R/library/parallel/po/en@quot/LC_MESSAGES/R-parallel.mo
@@ -902,6 +882,8 @@ lib/R/library/parallel/libs/parallel.so
%%NLS%%lib/R/library/parallel/po/fr/LC_MESSAGES/parallel.mo
%%NLS%%lib/R/library/parallel/po/ru/LC_MESSAGES/R-parallel.mo
%%NLS%%lib/R/library/parallel/po/ru/LC_MESSAGES/parallel.mo
+%%NLS%%lib/R/library/parallel/po/zh_CN/LC_MESSAGES/R-parallel.mo
+%%NLS%%lib/R/library/parallel/po/zh_CN/LC_MESSAGES/parallel.mo
lib/R/library/rpart/DESCRIPTION
lib/R/library/rpart/INDEX
lib/R/library/rpart/Meta/Rd.rds
@@ -1002,6 +984,8 @@ lib/R/library/splines/help/splines.rdx
lib/R/library/splines/html/00Index.html
lib/R/library/splines/html/R.css
lib/R/library/splines/libs/splines.so
+%%NLS%%lib/R/library/splines/po/da/LC_MESSAGES/R-splines.mo
+%%NLS%%lib/R/library/splines/po/da/LC_MESSAGES/splines.mo
%%NLS%%lib/R/library/splines/po/de/LC_MESSAGES/R-splines.mo
%%NLS%%lib/R/library/splines/po/de/LC_MESSAGES/splines.mo
%%NLS%%lib/R/library/splines/po/en@quot/LC_MESSAGES/R-splines.mo
@@ -1036,6 +1020,7 @@ lib/R/library/stats4/help/stats4.rdb
lib/R/library/stats4/help/stats4.rdx
lib/R/library/stats4/html/00Index.html
lib/R/library/stats4/html/R.css
+%%NLS%%lib/R/library/stats4/po/da/LC_MESSAGES/R-stats4.mo
%%NLS%%lib/R/library/stats4/po/de/LC_MESSAGES/R-stats4.mo
%%NLS%%lib/R/library/stats4/po/en@quot/LC_MESSAGES/R-stats4.mo
%%NLS%%lib/R/library/stats4/po/fr/LC_MESSAGES/R-stats4.mo
@@ -1072,6 +1057,8 @@ lib/R/library/stats/help/stats.rdx
lib/R/library/stats/html/00Index.html
lib/R/library/stats/html/R.css
lib/R/library/stats/libs/stats.so
+%%NLS%%lib/R/library/stats/po/da/LC_MESSAGES/R-stats.mo
+%%NLS%%lib/R/library/stats/po/da/LC_MESSAGES/stats.mo
%%NLS%%lib/R/library/stats/po/de/LC_MESSAGES/R-stats.mo
%%NLS%%lib/R/library/stats/po/de/LC_MESSAGES/stats.mo
%%NLS%%lib/R/library/stats/po/en@quot/LC_MESSAGES/R-stats.mo
@@ -1110,9 +1097,9 @@ 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/index.html
+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/timedep.R
lib/R/library/survival/doc/validate.pdf
lib/R/library/survival/help/AnIndex
lib/R/library/survival/help/aliases.rds
@@ -1158,6 +1145,8 @@ lib/R/library/tcltk/help/tcltk.rdx
lib/R/library/tcltk/html/00Index.html
lib/R/library/tcltk/html/R.css
%%TCLTK%%lib/R/library/tcltk/libs/tcltk.so
+%%NLS%%lib/R/library/tcltk/po/da/LC_MESSAGES/R-tcltk.mo
+%%NLS%%lib/R/library/tcltk/po/da/LC_MESSAGES/tcltk.mo
%%NLS%%lib/R/library/tcltk/po/de/LC_MESSAGES/R-tcltk.mo
%%NLS%%lib/R/library/tcltk/po/de/LC_MESSAGES/tcltk.mo
%%NLS%%lib/R/library/tcltk/po/en@quot/LC_MESSAGES/R-tcltk.mo
@@ -1193,6 +1182,8 @@ lib/R/library/tools/help/tools.rdx
lib/R/library/tools/html/00Index.html
lib/R/library/tools/html/R.css
lib/R/library/tools/libs/tools.so
+%%NLS%%lib/R/library/tools/po/da/LC_MESSAGES/R-tools.mo
+%%NLS%%lib/R/library/tools/po/da/LC_MESSAGES/tools.mo
%%NLS%%lib/R/library/tools/po/de/LC_MESSAGES/R-tools.mo
%%NLS%%lib/R/library/tools/po/de/LC_MESSAGES/tools.mo
%%NLS%%lib/R/library/tools/po/en@quot/LC_MESSAGES/R-tools.mo
@@ -1219,17 +1210,13 @@ lib/R/library/utils/Meta/hsearch.rds
lib/R/library/utils/Meta/links.rds
lib/R/library/utils/Meta/nsInfo.rds
lib/R/library/utils/Meta/package.rds
-lib/R/library/utils/Meta/vignette.rds
lib/R/library/utils/NAMESPACE
lib/R/library/utils/R/utils
lib/R/library/utils/R/utils.rdb
lib/R/library/utils/R/utils.rdx
lib/R/library/utils/Sweave/Sweave-test-1.Rnw
lib/R/library/utils/Sweave/example-1.Rnw
-lib/R/library/utils/doc/Sweave.R
-lib/R/library/utils/doc/Sweave.Rnw
lib/R/library/utils/doc/Sweave.pdf
-lib/R/library/utils/doc/index.html
lib/R/library/utils/help/AnIndex
lib/R/library/utils/help/aliases.rds
lib/R/library/utils/help/paths.rds
@@ -1240,6 +1227,7 @@ lib/R/library/utils/html/R.css
lib/R/library/utils/iconvlist
lib/R/library/utils/misc/exDIF.csv
lib/R/library/utils/misc/exDIF.dif
+%%NLS%%lib/R/library/utils/po/da/LC_MESSAGES/R-utils.mo
%%NLS%%lib/R/library/utils/po/de/LC_MESSAGES/R-utils.mo
%%NLS%%lib/R/library/utils/po/en@quot/LC_MESSAGES/R-utils.mo
%%NLS%%lib/R/library/utils/po/fr/LC_MESSAGES/R-utils.mo
@@ -1271,6 +1259,7 @@ lib/R/share/licenses/LGPL-2
lib/R/share/licenses/LGPL-2.1
lib/R/share/licenses/LGPL-3
lib/R/share/licenses/license.db
+%%NLS%%lib/R/share/locale/da/LC_MESSAGES/R.mo
%%NLS%%lib/R/share/locale/de/LC_MESSAGES/R.mo
%%NLS%%lib/R/share/locale/en_GB/LC_MESSAGES/R.mo
%%NLS%%lib/R/share/locale/en/LC_MESSAGES/R.mo
@@ -1308,20 +1297,20 @@ lib/R/share/texmf/tex/latex/ts1aer.fd
lib/R/share/texmf/tex/latex/ts1aett.fd
lib/R/share/texmf/tex/latex/upquote.sty
%%LIBR%%libdata/pkgconfig/libR.pc
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-FAQ.pdf
%%DOCSDIR%%/manual/R-FAQ.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-admin.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-FAQ.pdf
%%DOCSDIR%%/manual/R-admin.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-data.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-admin.pdf
%%DOCSDIR%%/manual/R-data.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-exts.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-data.pdf
%%DOCSDIR%%/manual/R-exts.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-intro.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-exts.pdf
%%DOCSDIR%%/manual/R-intro.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-ints.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-intro.pdf
%%DOCSDIR%%/manual/R-ints.html
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-lang.pdf
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-ints.pdf
%%DOCSDIR%%/manual/R-lang.html
+%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-lang.pdf
%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/refman.pdf
@dirrm lib/R/share/texmf/tex/latex
@dirrm lib/R/share/texmf/tex
@@ -1361,6 +1350,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/share/locale/en
%%NLS%%@dirrm lib/R/share/locale/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/share/locale/de
+%%NLS%%@dirrm lib/R/share/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/share/locale/da
%%NLS%%@dirrm lib/R/share/locale
@dirrm lib/R/share/licenses
@dirrm lib/R/share/java
@@ -1386,6 +1377,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/utils/po/en@quot
%%NLS%%@dirrm lib/R/library/utils/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/utils/po/de
+%%NLS%%@dirrm lib/R/library/utils/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/utils/po/da
%%NLS%%@dirrm lib/R/library/utils/po
@dirrm lib/R/library/utils/misc
@dirrm lib/R/library/utils/html
@@ -1415,6 +1408,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/tools/po/en@quot
%%NLS%%@dirrm lib/R/library/tools/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/tools/po/de
+%%NLS%%@dirrm lib/R/library/tools/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/tools/po/da
%%NLS%%@dirrm lib/R/library/tools/po
@dirrm lib/R/library/tools/libs
@dirrm lib/R/library/tools/html
@@ -1440,6 +1435,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/tcltk/po/en@quot
%%NLS%%@dirrm lib/R/library/tcltk/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/tcltk/po/de
+%%NLS%%@dirrm lib/R/library/tcltk/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/tcltk/po/da
%%NLS%%@dirrm lib/R/library/tcltk/po
%%TCLTK%%@dirrm lib/R/library/tcltk/libs
@dirrm lib/R/library/tcltk/html
@@ -1477,6 +1474,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/stats/po/en@quot
%%NLS%%@dirrm lib/R/library/stats/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/stats/po/de
+%%NLS%%@dirrm lib/R/library/stats/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/stats/po/da
%%NLS%%@dirrm lib/R/library/stats/po
@dirrm lib/R/library/stats/libs
@dirrm lib/R/library/stats/html
@@ -1504,6 +1503,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/stats4/po/en@quot
%%NLS%%@dirrm lib/R/library/stats4/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/stats4/po/de
+%%NLS%%@dirrm lib/R/library/stats4/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/stats4/po/da
%%NLS%%@dirrm lib/R/library/stats4/po
@dirrm lib/R/library/stats4/html
@dirrm lib/R/library/stats4/help
@@ -1527,6 +1528,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/splines/po/en@quot
%%NLS%%@dirrm lib/R/library/splines/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/splines/po/de
+%%NLS%%@dirrm lib/R/library/splines/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/splines/po/da
%%NLS%%@dirrm lib/R/library/splines/po
@dirrm lib/R/library/splines/libs
@dirrm lib/R/library/splines/html
@@ -1564,6 +1567,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
@dirrm lib/R/library/rpart/R
@dirrm lib/R/library/rpart/Meta
@dirrm lib/R/library/rpart
+%%NLS%%@dirrm lib/R/library/parallel/po/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/parallel/po/zh_CN
%%NLS%%@dirrm lib/R/library/parallel/po/ru/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/parallel/po/ru
%%NLS%%@dirrm lib/R/library/parallel/po/fr/LC_MESSAGES
@@ -1572,6 +1577,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/parallel/po/en@quot
%%NLS%%@dirrm lib/R/library/parallel/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/parallel/po/de
+%%NLS%%@dirrm lib/R/library/parallel/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/parallel/po/da
%%NLS%%@dirrm lib/R/library/parallel/po
@dirrm lib/R/library/parallel/libs
@dirrm lib/R/library/parallel/html
@@ -1632,6 +1639,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/methods/po/en@quot
%%NLS%%@dirrm lib/R/library/methods/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/methods/po/de
+%%NLS%%@dirrm lib/R/library/methods/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/methods/po/da
%%NLS%%@dirrm lib/R/library/methods/po
@dirrm lib/R/library/methods/libs
@dirrm lib/R/library/methods/html
@@ -1672,6 +1681,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/grid/po/en@quot
%%NLS%%@dirrm lib/R/library/grid/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/grid/po/de
+%%NLS%%@dirrm lib/R/library/grid/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/grid/po/da
%%NLS%%@dirrm lib/R/library/grid/po
@dirrm lib/R/library/grid/libs
@dirrm lib/R/library/grid/html
@@ -1698,6 +1709,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/graphics/po/en@quot
%%NLS%%@dirrm lib/R/library/graphics/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/graphics/po/de
+%%NLS%%@dirrm lib/R/library/graphics/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/graphics/po/da
%%NLS%%@dirrm lib/R/library/graphics/po
@dirrm lib/R/library/graphics/html
@dirrm lib/R/library/graphics/help/figures
@@ -1726,6 +1739,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/grDevices/po/en_GB
%%NLS%%@dirrm lib/R/library/grDevices/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/grDevices/po/de
+%%NLS%%@dirrm lib/R/library/grDevices/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/grDevices/po/da
%%NLS%%@dirrm lib/R/library/grDevices/po
@dirrm lib/R/library/grDevices/libs
@dirrm lib/R/library/grDevices/icc
@@ -1755,6 +1770,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
@dirrm lib/R/library/datasets/data
@dirrm lib/R/library/datasets/Meta
@dirrm lib/R/library/datasets
+%%NLS%%@dirrm lib/R/library/compiler/po/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/compiler/po/zh_CN
%%NLS%%@dirrm lib/R/library/compiler/po/ru/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/compiler/po/ru
%%NLS%%@dirrm lib/R/library/compiler/po/pt_BR/LC_MESSAGES
@@ -1767,6 +1784,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/compiler/po/en@quot
%%NLS%%@dirrm lib/R/library/compiler/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/compiler/po/de
+%%NLS%%@dirrm lib/R/library/compiler/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/compiler/po/da
%%NLS%%@dirrm lib/R/library/compiler/po
@dirrm lib/R/library/compiler/html
@dirrm lib/R/library/compiler/help
@@ -1778,10 +1797,10 @@ lib/R/share/texmf/tex/latex/upquote.sty
@dirrm lib/R/library/codetools/R
@dirrm lib/R/library/codetools/Meta
@dirrm lib/R/library/codetools
-%%NLS%%@dirrm lib/R/library/cluster/po/de/LC_MESSAGES
-%%NLS%%@dirrm lib/R/library/cluster/po/de
%%NLS%%@dirrm lib/R/library/cluster/po/en@quot/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/cluster/po/en@quot
+%%NLS%%@dirrm lib/R/library/cluster/po/de/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/cluster/po/de
%%NLS%%@dirrm lib/R/library/cluster/po
@dirrm lib/R/library/cluster/libs
@dirrm lib/R/library/cluster/html
@@ -1838,6 +1857,8 @@ lib/R/share/texmf/tex/latex/upquote.sty
%%NLS%%@dirrm lib/R/library/base/po/en@quot
%%NLS%%@dirrm lib/R/library/base/po/de/LC_MESSAGES
%%NLS%%@dirrm lib/R/library/base/po/de
+%%NLS%%@dirrm lib/R/library/base/po/da/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/base/po/da
%%NLS%%@dirrm lib/R/library/base/po
@dirrm lib/R/library/base/html
@dirrm lib/R/library/base/help
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 2546b1e0bb96..59b8847c7de4 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ess
PORTVERSION= 12.04
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/
EXTRACT_SUFX= .tgz
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index 008e2474c680..fa8677ce2ade 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Statistics-R
PORTVERSION= 0.27
+PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FANGLY
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index cd8816479c8b..cc10b3a76ec1 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rkward
PORTVERSION= 0.5.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Current_Stable_Releases
PKGNAMESUFFIX= -kde4
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 6882ed01dc8a..37110270bf59 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rkward
DISTVERSION= 0.4.9a
-PORTREVISION= 15
+PORTREVISION= 16
PORTEPOCH= 3
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Historical_Releases/0.4.x_and_earlier/0.4.9a%20%28KDE3%29
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index a325da7b2ba5..27f13091e423 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpy
PORTVERSION= 1.0.3
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= math
MASTER_SITES= SF
diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist
index dd6ba061abf9..3e9191443dc5 100644
--- a/math/rpy/pkg-plist
+++ b/math/rpy/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON_SITELIBDIR%%/_rpy2142.so
+%%PYTHON_SITELIBDIR%%/_rpy2150.so
%%PYTHON_SITELIBDIR%%/rpy.py
%%PYTHON_SITELIBDIR%%/rpy.pyc
%%PYTHON_SITELIBDIR%%/rpy.pyo
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index ac7bbfb4f695..a36a869eadab 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= rpy2
PORTVERSION= 2.2.6
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= CHEESESHOP \
SF
diff --git a/net/R-cran-twitteR/Makefile b/net/R-cran-twitteR/Makefile
index 36637bf8eb6d..fcf897ad3f32 100644
--- a/net/R-cran-twitteR/Makefile
+++ b/net/R-cran-twitteR/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twitteR
PORTVERSION= 0.99.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/science/R-cran-AMORE/Makefile b/science/R-cran-AMORE/Makefile
index 8ccd048c2940..9001ea621cc0 100644
--- a/science/R-cran-AMORE/Makefile
+++ b/science/R-cran-AMORE/Makefile
@@ -7,7 +7,7 @@
PORTNAME= AMORE
PORTVERSION= 0.2.12
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/science/R-cran-DCluster/Makefile b/science/R-cran-DCluster/Makefile
index 3249b0b0ef9f..fb8a6640f7bd 100644
--- a/science/R-cran-DCluster/Makefile
+++ b/science/R-cran-DCluster/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DCluster
DISTVERSION= 0.2-5
+PORTREVISION= 1
CATEGORIES= science
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/science/R-cran-Epi/Makefile b/science/R-cran-Epi/Makefile
index 6d4cf469b9e7..4be445f2d186 100644
--- a/science/R-cran-Epi/Makefile
+++ b/science/R-cran-Epi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Epi
PORTVERSION= 1.1.34
+PORTREVISION= 1
CATEGORIES= science
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/science/R-cran-bayesm/Makefile b/science/R-cran-bayesm/Makefile
index dea2f9c7edd4..71360b117802 100644
--- a/science/R-cran-bayesm/Makefile
+++ b/science/R-cran-bayesm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bayesm
PORTVERSION= 2.2.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/science/R-cran-e1071/Makefile b/science/R-cran-e1071/Makefile
index b01443462fb8..5ddb85eb3ecc 100644
--- a/science/R-cran-e1071/Makefile
+++ b/science/R-cran-e1071/Makefile
@@ -7,7 +7,7 @@
PORTNAME= e1071
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/science/R-cran-eco/Makefile b/science/R-cran-eco/Makefile
index a9c727a41696..5c794872f817 100644
--- a/science/R-cran-eco/Makefile
+++ b/science/R-cran-eco/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eco
PORTVERSION= 3.1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/science/R-cran-epicalc/Makefile b/science/R-cran-epicalc/Makefile
index c3df2b0730b1..877e0e9c677b 100644
--- a/science/R-cran-epicalc/Makefile
+++ b/science/R-cran-epicalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epicalc
PORTVERSION= 2.14.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/science/R-cran-snow/Makefile b/science/R-cran-snow/Makefile
index 671e8aabd929..74980e7f8bc7 100644
--- a/science/R-cran-snow/Makefile
+++ b/science/R-cran-snow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snow
DISTVERSION= 0.3-9
+PORTREVISION= 1
CATEGORIES= science
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/science/R-cran-som/Makefile b/science/R-cran-som/Makefile
index d403b984af00..efd7cc353ed4 100644
--- a/science/R-cran-som/Makefile
+++ b/science/R-cran-som/Makefile
@@ -7,6 +7,7 @@
PORTNAME= som
DISTVERSION= 0.3-5
+PORTREVISION= 1
CATEGORIES= science
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/security/R-cran-ROAuth/Makefile b/security/R-cran-ROAuth/Makefile
index 3706f93fa01a..30bf5e13a843 100644
--- a/security/R-cran-ROAuth/Makefile
+++ b/security/R-cran-ROAuth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ROAuth
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/security/R-cran-digest/Makefile b/security/R-cran-digest/Makefile
index 2603d0481299..96c8a44383ef 100644
--- a/security/R-cran-digest/Makefile
+++ b/security/R-cran-digest/Makefile
@@ -7,6 +7,7 @@
PORTNAME= digest
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= security
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/textproc/R-cran-XML/Makefile b/textproc/R-cran-XML/Makefile
index 9795efa3ec0d..214fb3411129 100644
--- a/textproc/R-cran-XML/Makefile
+++ b/textproc/R-cran-XML/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XML
DISTVERSION= 3.9-4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/textproc/R-cran-stringr/Makefile b/textproc/R-cran-stringr/Makefile
index 3abccf5962cc..4957b56f5c75 100644
--- a/textproc/R-cran-stringr/Makefile
+++ b/textproc/R-cran-stringr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stringr
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/textproc/R-cran-xtable/Makefile b/textproc/R-cran-xtable/Makefile
index 3ff201a74ca1..45c7a1918597 100644
--- a/textproc/R-cran-xtable/Makefile
+++ b/textproc/R-cran-xtable/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtable
DISTVERSION= 1.7-0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/www/R-cran-Rpad/Makefile b/www/R-cran-Rpad/Makefile
index ea116b9e4e2d..fc97da157fac 100644
--- a/www/R-cran-Rpad/Makefile
+++ b/www/R-cran-Rpad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Rpad
PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/www/R-cran-scrapeR/Makefile b/www/R-cran-scrapeR/Makefile
index 230b41947dc5..73cd63ebed8d 100644
--- a/www/R-cran-scrapeR/Makefile
+++ b/www/R-cran-scrapeR/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scrapeR
PORTVERSION= 0.1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
DISTNAME= ${PORTNAME}_${PORTVERSION}