update math/R to 2.14.2, and adjust dependent ports

31 files changed, 38 insertions, 38 deletions

diff --git a/math/R-cran-Formula/Makefile b/math/R-cran-Formula/Makefile
index 05545e238196..b70a529ff154 100644
--- a/math/R-cran-Formula/Makefile
+++ b/math/R-cran-Formula/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Formula
 DISTVERSION=	1.1-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-KFAS/Makefile b/math/R-cran-KFAS/Makefile
index 5df41a70d277..9a96059853f1 100644
--- a/math/R-cran-KFAS/Makefile
+++ b/math/R-cran-KFAS/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	KFAS
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index a47ca86be2bd..681a3c90008d 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=	11
+PORTREVISION=	12
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index 9846cc822c73..82b4ff5a8108 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SuppDists
 DISTVERSION=	1.1-8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_CRAN_SITES} \
 		http://r.research.att.com/benchmarks/:benchmark \
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index 33bfacf1cfa0..836bc646da40 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Zelig
 DISTVERSION=	3.5.4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-bdsmatrix/Makefile b/math/R-cran-bdsmatrix/Makefile
index 48c9ce90bce2..b78e774bef19 100644
--- a/math/R-cran-bdsmatrix/Makefile
+++ b/math/R-cran-bdsmatrix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bdsmatrix
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index a12c0df23608..cef7ab7b5ee8 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	car
 DISTVERSION=	2.0-11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile
index 465bb89a4d52..6ef37508da52 100644
--- a/math/R-cran-coda/Makefile
+++ b/math/R-cran-coda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coda
 DISTVERSION=	0.14-6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-deldir/Makefile b/math/R-cran-deldir/Makefile
index 92f31aa9151a..07bfaa335278 100644
--- a/math/R-cran-deldir/Makefile
+++ b/math/R-cran-deldir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deldir
 DISTVERSION=	0.0-16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index f338e92490ab..07550f0589b7 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpclib
 DISTVERSION=	1.5-1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index c46f62165858..8452665acaf8 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	igraph
 DISTVERSION=	0.5.5-4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index 5c7700ff8e0c..9a36dea2728f 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inline
 PORTVERSION=	0.3.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index a38834a611c1..c4c3e9657ca0 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	memisc
 DISTVERSION=	0.95-38
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-mvtnorm/Makefile b/math/R-cran-mvtnorm/Makefile
index 9e062f613154..77930a4a2093 100644
--- a/math/R-cran-mvtnorm/Makefile
+++ b/math/R-cran-mvtnorm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mvtnorm
 PORTVERSION=	0.9.96
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
 
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index b480681fbc6a..2e332f2957ba 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psych
 PORTVERSION=	1.0.94
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math science
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
 
diff --git a/math/R-cran-sandwich/Makefile b/math/R-cran-sandwich/Makefile
index ddc4227cb819..7f8d516bd87b 100644
--- a/math/R-cran-sandwich/Makefile
+++ b/math/R-cran-sandwich/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sandwich
 DISTVERSION=	2.2-9
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index be539a2f7a32..89343d47c52e 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=	5
+PORTREVISION=	6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index 4137515d3f2c..b4331597ee9d 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sp
 DISTVERSION=	0.9-95
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-spdep/Makefile b/math/R-cran-spdep/Makefile
index 528ad97fc8f0..e90e8d05c880 100644
--- a/math/R-cran-spdep/Makefile
+++ b/math/R-cran-spdep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spdep
 DISTVERSION=	0.5-43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-xts/Makefile b/math/R-cran-xts/Makefile
index 38528fc01830..8b2f36d4b644 100644
--- a/math/R-cran-xts/Makefile
+++ b/math/R-cran-xts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xts
 DISTVERSION=	0.8-2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-zoo/Makefile b/math/R-cran-zoo/Makefile
index 884e824ef3c2..bd55c6c32c30 100644
--- a/math/R-cran-zoo/Makefile
+++ b/math/R-cran-zoo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zoo
 DISTVERSION=	1.7-7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R/Makefile b/math/R/Makefile
index 04539b2c78f8..0b46c9ee486e 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME?=	R
-PORTVERSION=	2.14.1
-PORTREVISION=	2
+PORTVERSION=	2.14.2
 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/ \
@@ -169,8 +168,10 @@ PLIST_SUB+=		LIBR=""
 
 .if defined(WITHOUT_PANGOCAIRO)
 CONFIGURE_ARGS+=	--without-cairo
+PLIST_SUB+=		PANGOCAIRO="@comment "
 .else
 USE_GNOME+=		pango
+PLIST_SUB+=		PANGOCAIRO=""
 .endif
 
 .if defined(WITHOUT_PNG)
@@ -234,10 +235,6 @@ post-patch:
 		${WRKSRC}/src/extra/tzone/tzfile.h \
 		${WRKSRC}/src/scripts/javareconf
 .if !defined(LIBRMATH_SLAVEPORT)
-.if defined(WITH_PCRE_PORT)
-	@${REINPLACE_CMD} -e 's|_pcre_valid_utf8|_pcre_valid_utf|' \
-		${WRKSRC}/src/main/util.c
-.endif
 .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 a9c7416c029e..dab42c92e685 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,2 +1,2 @@
-SHA256 (R-2.14.1.tar.gz) = d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c
-SIZE (R-2.14.1.tar.gz) = 23697861
+SHA256 (R-2.14.2.tar.gz) = ccd8b43a746dc7105a1c77423ea1bb72dc333b41d9e9801a96d6f71c2266736e
+SIZE (R-2.14.2.tar.gz) = 23893986
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index 2f789a1db59c..e8bb51ecc09b 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -197,9 +197,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
@@ -216,9 +213,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
@@ -576,7 +571,7 @@ lib/R/library/grDevices/html/00Index.html
 lib/R/library/grDevices/html/R.css
 lib/R/library/grDevices/icc/srgb
 lib/R/library/grDevices/icc/srgb.flate
-lib/R/library/grDevices/libs/cairo.so
+%%PANGOCAIRO%%lib/R/library/grDevices/libs/cairo.so
 lib/R/library/grDevices/libs/grDevices.so
 %%NLS%%lib/R/library/grDevices/po/de/LC_MESSAGES/R-grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/de/LC_MESSAGES/grDevices.mo
@@ -1096,6 +1091,7 @@ lib/R/library/stats/libs/stats.so
 %%NLS%%lib/R/library/stats/po/tr/LC_MESSAGES/R-stats.mo
 %%NLS%%lib/R/library/stats/po/zh_CN/LC_MESSAGES/R-stats.mo
 %%NLS%%lib/R/library/stats/po/zh_CN/LC_MESSAGES/stats.mo
+lib/R/library/survival/CITATION
 lib/R/library/survival/DESCRIPTION
 lib/R/library/survival/INDEX
 lib/R/library/survival/Meta/Rd.rds
@@ -1113,14 +1109,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.Rnw
 lib/R/library/survival/doc/timedep.pdf
 lib/R/library/survival/doc/timedep.R
-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
@@ -1135,9 +1128,9 @@ lib/R/library/tcltk/Meta/Rd.rds
 lib/R/library/tcltk/Meta/demo.rds
 lib/R/library/tcltk/Meta/hsearch.rds
 lib/R/library/tcltk/Meta/links.rds
-%%TCLTK%%lib/R/library/tcltk/Meta/nsInfo.rds
+lib/R/library/tcltk/Meta/nsInfo.rds
 lib/R/library/tcltk/Meta/package.rds
-%%TCLTK%%lib/R/library/tcltk/NAMESPACE
+lib/R/library/tcltk/NAMESPACE
 lib/R/library/tcltk/R/tcltk
 %%TCLTK%%lib/R/library/tcltk/R/tcltk.rdb
 %%TCLTK%%lib/R/library/tcltk/R/tcltk.rdx
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 3e55618a0d52..d28918c6e24c 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ess
 PORTVERSION=	5.14
-PORTREVISION=	7
+PORTREVISION=	8
 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 39514c1a0ff8..250cf713e663 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Statistics-R
 PORTVERSION=	0.26
+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 b3354cf34e63..374e247e45f1 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.5.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/Current_Stable_Releases
 PKGNAMESUFFIX=	-kde4
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 7141f9611d1b..6882ed01dc8a 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rkward
 DISTVERSION=	0.4.9a
-PORTREVISION=	14
+PORTREVISION=	15
 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 6e72faecafd8..a325da7b2ba5 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	1.0.3
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	math
 MASTER_SITES=	SF
 
diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist
index b54f4eb7181e..dd6ba061abf9 100644
--- a/math/rpy/pkg-plist
+++ b/math/rpy/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON_SITELIBDIR%%/_rpy2141.so
+%%PYTHON_SITELIBDIR%%/_rpy2142.so
 %%PYTHON_SITELIBDIR%%/rpy.py
 %%PYTHON_SITELIBDIR%%/rpy.pyc
 %%PYTHON_SITELIBDIR%%/rpy.pyo
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 37e0f1d59ab3..9eb5acb142a4 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rpy2
 PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	CHEESESHOP \
 		SF