3 files changed, 10 insertions, 20 deletions

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