- Update R to 2.12.2, a bugfix release

- Bump PORTREVISION of dependent ports,
  where necessary

Approved by:	makc, miwi (mentors, implicit)

18 files changed, 32 insertions, 71 deletions

diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index cd759b885a6b..4d05e5e2a9f3 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=	5
+PORTREVISION=	6
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index 85b0d60124bc..69545036736f 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Zelig
 PORTVERSION=	3.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_3.4-8
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index 93177556fcdc..50382442aeb3 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	car
 PORTVERSION=	1.2.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_1.2-16
diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile
index bef564b28d6f..75e5a9206460 100644
--- a/math/R-cran-coda/Makefile
+++ b/math/R-cran-coda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coda
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_${PORTVERSION}-2
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index ea60168377bf..73a66f53127f 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpclib
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_1.5-1
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 8338f3d177e7..c235ead3218a 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	igraph
 PORTVERSION=	0.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/R%20source%20package/${PORTVERSION}
 PKGNAMEPREFIX=	R-cran-
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index 7f326c3d3ca6..1530529857d4 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inline
 PORTVERSION=	0.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index 7352091a9939..11f9d320608f 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psych
 PORTVERSION=	1.0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_1.0-91
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index f4135068d158..ee2489ed0f8f 100644
--- a/math/R-cran-sm/Makefile
+++ b/math/R-cran-sm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sm
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_2.2-4
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index b86314917103..7eba9affeb93 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sp
 PORTVERSION=	0.9.62
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_0.9-62
diff --git a/math/R/Makefile b/math/R/Makefile
index 9900f4bbfce5..d7f52b378f18 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -11,7 +11,7 @@ PORTNAME=	libRmath
 .else
 PORTNAME=	R
 .endif
-PORTVERSION=	2.12.1
+PORTVERSION=	2.12.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/ \
@@ -210,7 +210,7 @@ post-patch:
 	done)
 .endif
 
-regression-test: build
+check regression-test test: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 		${MAKE_ARGS} check)
 
diff --git a/math/R/distinfo b/math/R/distinfo
index bfc12671661a..e52d0f652cee 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,2 +1,2 @@
-SHA256 (R-2.12.1.tar.gz) = 74475d73f145d25c1e121dac9e4f18eaa077510b9e58d514cc6ae523382dee3f
-SIZE (R-2.12.1.tar.gz) = 20806432
+SHA256 (R-2.12.2.tar.gz) = 869ac219844671e4139aa4ddf5a272c27e26b1250bc427af3877fb237a5a9dbb
+SIZE (R-2.12.2.tar.gz) = 21120720
diff --git a/math/R/files/patch-tests__reg-tests-1b.R b/math/R/files/patch-tests__reg-tests-1b.R
index 74afb814ba9b..b943f0215477 100644
--- a/math/R/files/patch-tests__reg-tests-1b.R
+++ b/math/R/files/patch-tests__reg-tests-1b.R
@@ -1,38 +1,5 @@
 --- tests/reg-tests-1b.R.orig	2010-12-22 03:50:30.000000000 -0500
 +++ tests/reg-tests-1b.R	2010-12-22 04:05:33.000000000 -0500
-@@ -300,8 +300,8 @@
- 
- 
- ## showDefault() problem with "unregistered" S3 classes:
--show(structure(1:3, class = "myClass"))
--## failed in R <= 2.7.0
-+## show(structure(1:3, class = "myClass"))
-+## failed in R <= 2.7.0, 2.12.1
- 
- 
- ## formatC(.., format="fg", flag="#"):
-@@ -862,14 +862,14 @@
- 
- 
- ## methods() gave two wrong warnings in some cases:
--op <- options(warn = 2)# no warning, please!
--m1 <- methods(na.omit) ## should give (no warning):
-+## op <- options(warn = 2)# no warning, please!
-+## m1 <- methods(na.omit) ## should give (no warning):
- ##
--setClass("bla")
--setMethod("na.omit", "bla", function(object, ...) "na.omit(<bla>)")
--(m2 <- methods(na.omit)) ## should give (no warning):
--stopifnot(identical(m1, m2))
--options(op)
-+## setClass("bla")
-+## setMethod("na.omit", "bla", function(object, ...) "na.omit(<bla>)")
-+## (m2 <- methods(na.omit)) ## should give (no warning):
-+## stopifnot(identical(m1, m2))
-+## options(op)
- ## gave two warnings, when an S3 generic had turned into an S4 one
- 
- 
 @@ -1344,11 +1344,11 @@
  
  ## found from fallback test in slam 0.1-15
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index c85597cb544c..6d34711f3a41 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -546,6 +546,8 @@ lib/R/library/grDevices/libs/grDevices.so
 %%NLS%%lib/R/library/grDevices/po/ja/LC_MESSAGES/grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/ko/LC_MESSAGES/R-grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/ko/LC_MESSAGES/grDevices.mo
+%%NLS%%lib/R/library/grDevices/po/pt_BR/LC_MESSAGES/R-grDevices.mo
+%%NLS%%lib/R/library/grDevices/po/pt_BR/LC_MESSAGES/grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/ru/LC_MESSAGES/R-grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/ru/LC_MESSAGES/grDevices.mo
 %%NLS%%lib/R/library/grDevices/po/zh_CN/LC_MESSAGES/R-grDevices.mo
@@ -580,6 +582,7 @@ lib/R/library/graphics/html/00Index.html
 %%NLS%%lib/R/library/graphics/po/it/LC_MESSAGES/R-graphics.mo
 %%NLS%%lib/R/library/graphics/po/ja/LC_MESSAGES/R-graphics.mo
 %%NLS%%lib/R/library/graphics/po/ko/LC_MESSAGES/R-graphics.mo
+%%NLS%%lib/R/library/graphics/po/pt_BR/LC_MESSAGES/R-graphics.mo
 %%NLS%%lib/R/library/graphics/po/ru/LC_MESSAGES/R-graphics.mo
 %%NLS%%lib/R/library/graphics/po/zh_CN/LC_MESSAGES/R-graphics.mo
 lib/R/library/grid/DESCRIPTION
@@ -655,6 +658,7 @@ lib/R/library/grid/libs/grid.so
 %%NLS%%lib/R/library/grid/po/ko/LC_MESSAGES/R-grid.mo
 %%NLS%%lib/R/library/grid/po/ko/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/pt_BR/LC_MESSAGES/grid.mo
+%%NLS%%lib/R/library/grid/po/pt_BR/LC_MESSAGES/R-grid.mo
 %%NLS%%lib/R/library/grid/po/ru/LC_MESSAGES/R-grid.mo
 %%NLS%%lib/R/library/grid/po/ru/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/zh_CN/LC_MESSAGES/R-grid.mo
@@ -1006,32 +1010,13 @@ lib/R/library/survival/Meta/links.rds
 lib/R/library/survival/Meta/nsInfo.rds
 lib/R/library/survival/Meta/package.rds
 lib/R/library/survival/NAMESPACE
+lib/R/library/survival/NEWS.Rd
 lib/R/library/survival/R/survival
 lib/R/library/survival/R/survival.rdb
 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/data/leukemia.dat
-lib/R/library/survival/data/minn2000.dat
-lib/R/library/survival/data/minn2004.dat
-lib/R/library/survival/data/minndecennial.dat
-lib/R/library/survival/data/minnpred.dat
-lib/R/library/survival/data/pbcseq.dat
-lib/R/library/survival/data/us1996.dat
-lib/R/library/survival/data/us1997.dat
-lib/R/library/survival/data/us1998.dat
-lib/R/library/survival/data/us1999.dat
-lib/R/library/survival/data/us2000.dat
-lib/R/library/survival/data/us2001.dat
-lib/R/library/survival/data/us2002.dat
-lib/R/library/survival/data/us2003.dat
-lib/R/library/survival/data/us2004.dat
-lib/R/library/survival/data/usdecennial.dat
-lib/R/library/survival/data/usinfant.dat
-lib/R/library/survival/doc/validate.aux
-lib/R/library/survival/doc/validate.log
-lib/R/library/survival/doc/validate.pdf
 lib/R/library/survival/doc/validate.tex
 lib/R/library/survival/doc/index.html
 lib/R/library/survival/help/AnIndex
@@ -1087,6 +1072,7 @@ lib/R/library/tcltk/html/00Index.html
 %%NLS%%lib/R/library/tcltk/po/ja/LC_MESSAGES/tcltk.mo
 %%NLS%%lib/R/library/tcltk/po/ko/LC_MESSAGES/R-tcltk.mo
 %%NLS%%lib/R/library/tcltk/po/pt_BR/LC_MESSAGES/R-tcltk.mo
+%%NLS%%lib/R/library/tcltk/po/pt_BR/LC_MESSAGES/tcltk.mo
 %%NLS%%lib/R/library/tcltk/po/ru/LC_MESSAGES/R-tcltk.mo
 %%NLS%%lib/R/library/tcltk/po/ru/LC_MESSAGES/tcltk.mo
 %%NLS%%lib/R/library/tcltk/po/zh_CN/LC_MESSAGES/R-tcltk.mo
@@ -1121,6 +1107,7 @@ lib/R/library/tools/libs/tools.so
 %%NLS%%lib/R/library/tools/po/ja/LC_MESSAGES/tools.mo
 %%NLS%%lib/R/library/tools/po/ko/LC_MESSAGES/R-tools.mo
 %%NLS%%lib/R/library/tools/po/ko/LC_MESSAGES/tools.mo
+%%NLS%%lib/R/library/tools/po/pt_BR/LC_MESSAGES/R-tools.mo
 %%NLS%%lib/R/library/tools/po/pt_BR/LC_MESSAGES/tools.mo
 %%NLS%%lib/R/library/tools/po/ru/LC_MESSAGES/R-tools.mo
 %%NLS%%lib/R/library/tools/po/ru/LC_MESSAGES/tools.mo
@@ -1152,6 +1139,7 @@ lib/R/library/utils/misc/exDIF.dif
 %%NLS%%lib/R/library/utils/po/fr/LC_MESSAGES/R-utils.mo
 %%NLS%%lib/R/library/utils/po/ja/LC_MESSAGES/R-utils.mo
 %%NLS%%lib/R/library/utils/po/ko/LC_MESSAGES/R-utils.mo
+%%NLS%%lib/R/library/utils/po/pt_BR/LC_MESSAGES/R-utils.mo
 %%NLS%%lib/R/library/utils/po/ru/LC_MESSAGES/R-utils.mo
 %%NLS%%lib/R/library/utils/po/zh_CN/LC_MESSAGES/R-utils.mo
 %%X11%%lib/R/modules/R_X11.so
@@ -1281,6 +1269,8 @@ libdata/pkgconfig/libR.pc
 %%NLS%%@dirrm lib/R/library/utils/po/zh_CN
 %%NLS%%@dirrm lib/R/library/utils/po/ru/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/utils/po/ru
+%%NLS%%@dirrm lib/R/library/utils/po/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/utils/po/pt_BR
 %%NLS%%@dirrm lib/R/library/utils/po/ko/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/utils/po/ko
 %%NLS%%@dirrm lib/R/library/utils/po/ja/LC_MESSAGES
@@ -1566,6 +1556,8 @@ libdata/pkgconfig/libR.pc
 %%NLS%%@dirrm lib/R/library/graphics/po/zh_CN
 %%NLS%%@dirrm lib/R/library/graphics/po/ru/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/graphics/po/ru
+%%NLS%%@dirrm lib/R/library/graphics/po/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/graphics/po/pt_BR
 %%NLS%%@dirrm lib/R/library/graphics/po/ko/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/graphics/po/ko
 %%NLS%%@dirrm lib/R/library/graphics/po/ja/LC_MESSAGES
@@ -1589,6 +1581,8 @@ libdata/pkgconfig/libR.pc
 %%NLS%%@dirrm lib/R/library/grDevices/po/zh_CN
 %%NLS%%@dirrm lib/R/library/grDevices/po/ru/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/grDevices/po/ru
+%%NLS%%@dirrm lib/R/library/grDevices/po/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/R/library/grDevices/po/pt_BR
 %%NLS%%@dirrm lib/R/library/grDevices/po/ko/LC_MESSAGES
 %%NLS%%@dirrm lib/R/library/grDevices/po/ko
 %%NLS%%@dirrm lib/R/library/grDevices/po/ja/LC_MESSAGES
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 6dc88e261433..733cd405f646 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rkward
 DISTVERSION=	0.4.9a
-PORTREVISION=	8
+PORTREVISION=	9
 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 305c263221a9..de7e2d5b8f1f 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	1.0.3
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	math
 MASTER_SITES=	SF
 
diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist
index 657795791de5..0db2a8caaa68 100644
--- a/math/rpy/pkg-plist
+++ b/math/rpy/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON_SITELIBDIR%%/_rpy2121.so
+%%PYTHON_SITELIBDIR%%/_rpy2122.so
 %%PYTHON_SITELIBDIR%%/rpy.py
 %%PYTHON_SITELIBDIR%%/rpy.pyc
 %%PYTHON_SITELIBDIR%%/rpy.pyo
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index a2d920ab9f25..9b2e38584cdb 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rpy2
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	CHEESESHOP \
 		SF