2 files changed, 54 insertions, 54 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 3f52874f3a56..57e213e87964 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		R
 PORTVERSION=		3.3.2
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -29,7 +29,7 @@ USE_PERL5=		build
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11
 OPTIONS_GROUP=		NEEDGCC NEEDX11
 OPTIONS_GROUP_NEEDGCC=	LTO OPENMP
-OPTIONS_GROUP_NEEDX11=	DOCS GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TIFF
+OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
 
@@ -38,7 +38,6 @@ OPTIONS_SUB=		YES
 ATLAS_DESC=		ATLAS BLAS implementation
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
 CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
-DOCS_DESC=		All documentation (TeX build dependency)
 INFO_DESC=		GNU info manuals
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
@@ -53,17 +52,12 @@ OPENBLAS_DESC=		OpenBLAS BLAS implementation
 PNG_DESC=		PNG graphics device
 RBLAS_DESC=		Use R-bundled BLAS implementation
 RPROF_DESC=		R profiling via Rprof()
+TEXDOCS_DESC=		Build/Install TeX-dependent documentation files
 X11_DESC=		X11 graphics device
 
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE LIBR PNG \
 			RBLAS RPROF TCLTK TIFF X11
 
-DOCS_BUILD_DEPENDS=	texi2any:print/texinfo
-.for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
-DOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
-.endfor
-DOCS_INSTALL_TARGET=	install-pdf
-DOCS_USE=		tex=dvipsk:build,kpathsea:build,pdftex:build
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CONFIGURE_ON=	--disable-BLAS-shlib
 ATLAS_VARS=		MANUAL_PACKAGE_BUILD=\
@@ -109,6 +103,12 @@ RPROF_CONFIGURE_ENABLE=	R-profiling
 TCLTK_IMPLIES=		X11
 TCLTK_USES=		tcl tk:84+
 TCLTK_CONFIGURE_WITH=	tcltk
+TEXDOCS_BUILD_DEPENDS=	texi2any:print/texinfo
+.for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
+TEXDOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
+.endfor
+TEXDOCS_INSTALL_TARGET=	install-pdf
+TEXDOCS_USE=		tex=dvipsk:build,kpathsea:build,pdftex:build
 TIFF_IMPLIES=		X11
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=	libtiff
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index f5b583d137e3..5fac0bae859a 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -629,51 +629,51 @@ 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
-%%PORTDOCS%%lib/R/library/grid/Meta/vignette.rds
+%%TEXDOCS%%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
-%%PORTDOCS%%lib/R/library/grid/doc/displaylist.R
-%%PORTDOCS%%lib/R/library/grid/doc/displaylist.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/displaylist.R
+%%TEXDOCS%%lib/R/library/grid/doc/displaylist.Rnw
 lib/R/library/grid/doc/displaylist.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/frame.R
-%%PORTDOCS%%lib/R/library/grid/doc/frame.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/frame.R
+%%TEXDOCS%%lib/R/library/grid/doc/frame.Rnw
 lib/R/library/grid/doc/frame.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/grid.R
-%%PORTDOCS%%lib/R/library/grid/doc/grid.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/grid.R
+%%TEXDOCS%%lib/R/library/grid/doc/grid.Rnw
 lib/R/library/grid/doc/grid.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/grobs.R
-%%PORTDOCS%%lib/R/library/grid/doc/grobs.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/grobs.R
+%%TEXDOCS%%lib/R/library/grid/doc/grobs.Rnw
 lib/R/library/grid/doc/grobs.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/index.html
-%%PORTDOCS%%lib/R/library/grid/doc/interactive.R
-%%PORTDOCS%%lib/R/library/grid/doc/interactive.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/index.html
+%%TEXDOCS%%lib/R/library/grid/doc/interactive.R
+%%TEXDOCS%%lib/R/library/grid/doc/interactive.Rnw
 lib/R/library/grid/doc/interactive.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/locndimn.R
-%%PORTDOCS%%lib/R/library/grid/doc/locndimn.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/locndimn.R
+%%TEXDOCS%%lib/R/library/grid/doc/locndimn.Rnw
 lib/R/library/grid/doc/locndimn.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/moveline.R
-%%PORTDOCS%%lib/R/library/grid/doc/moveline.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/moveline.R
+%%TEXDOCS%%lib/R/library/grid/doc/moveline.Rnw
 lib/R/library/grid/doc/moveline.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/nonfinite.R
-%%PORTDOCS%%lib/R/library/grid/doc/nonfinite.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/nonfinite.R
+%%TEXDOCS%%lib/R/library/grid/doc/nonfinite.Rnw
 lib/R/library/grid/doc/nonfinite.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/plotexample.R
-%%PORTDOCS%%lib/R/library/grid/doc/plotexample.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/plotexample.R
+%%TEXDOCS%%lib/R/library/grid/doc/plotexample.Rnw
 lib/R/library/grid/doc/plotexample.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/rotated.R
-%%PORTDOCS%%lib/R/library/grid/doc/rotated.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/rotated.R
+%%TEXDOCS%%lib/R/library/grid/doc/rotated.Rnw
 lib/R/library/grid/doc/rotated.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/saveload.R
-%%PORTDOCS%%lib/R/library/grid/doc/saveload.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/saveload.R
+%%TEXDOCS%%lib/R/library/grid/doc/saveload.Rnw
 lib/R/library/grid/doc/saveload.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/sharing.R
-%%PORTDOCS%%lib/R/library/grid/doc/sharing.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/sharing.R
+%%TEXDOCS%%lib/R/library/grid/doc/sharing.Rnw
 lib/R/library/grid/doc/sharing.pdf
-%%PORTDOCS%%lib/R/library/grid/doc/viewports.R
-%%PORTDOCS%%lib/R/library/grid/doc/viewports.Rnw
+%%TEXDOCS%%lib/R/library/grid/doc/viewports.R
+%%TEXDOCS%%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
@@ -850,14 +850,14 @@ 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
-%%PORTDOCS%%lib/R/library/parallel/Meta/vignette.rds
+%%TEXDOCS%%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
-%%PORTDOCS%%lib/R/library/parallel/doc/index.html
-%%PORTDOCS%%lib/R/library/parallel/doc/parallel.R
-%%PORTDOCS%%lib/R/library/parallel/doc/parallel.Rnw
+%%TEXDOCS%%lib/R/library/parallel/doc/index.html
+%%TEXDOCS%%lib/R/library/parallel/doc/parallel.R
+%%TEXDOCS%%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
@@ -876,7 +876,7 @@ lib/R/library/rpart/Meta/hsearch.rds
 lib/R/library/rpart/Meta/links.rds
 lib/R/library/rpart/Meta/nsInfo.rds
 lib/R/library/rpart/Meta/package.rds
-%%PORTDOCS%%lib/R/library/rpart/Meta/vignette.rds
+%%TEXDOCS%%lib/R/library/rpart/Meta/vignette.rds
 lib/R/library/rpart/NAMESPACE
 lib/R/library/rpart/R/rpart
 lib/R/library/rpart/R/rpart.rdb
@@ -1416,7 +1416,7 @@ 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
-%%PORTDOCS%%lib/R/library/utils/Meta/vignette.rds
+%%TEXDOCS%%lib/R/library/utils/Meta/vignette.rds
 lib/R/library/utils/NAMESPACE
 lib/R/library/utils/R/sysdata.rdb
 lib/R/library/utils/R/sysdata.rdx
@@ -1425,10 +1425,10 @@ 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
-%%PORTDOCS%%lib/R/library/utils/doc/Sweave.R
-%%PORTDOCS%%lib/R/library/utils/doc/Sweave.Rnw
+%%TEXDOCS%%lib/R/library/utils/doc/Sweave.R
+%%TEXDOCS%%lib/R/library/utils/doc/Sweave.Rnw
 lib/R/library/utils/doc/Sweave.pdf
-%%PORTDOCS%%lib/R/library/utils/doc/index.html
+%%TEXDOCS%%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
@@ -1492,14 +1492,14 @@ man/man1/R.1.gz
 man/man1/Rscript.1.gz
 %%DOCSDIR%%/html/Rlogo.pdf
 %%DOCSDIR%%/html/Rlogo.svg
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-FAQ.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-admin.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-data.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-exts.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-intro.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-ints.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/R-lang.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/fullrefman.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-FAQ.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-admin.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-data.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-exts.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-intro.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-ints.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/R-lang.pdf
+%%TEXDOCS%%%%DOCSDIR%%/manual/fullrefman.pdf
 %%DOCSDIR%%/BioC_mirrors.csv
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/NEWS.0