2 files changed, 20 insertions, 13 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index c77c89b91c29..cb5b5d50b487 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,5 +1,5 @@
 # vim: tabstop=8 softtabstop=0 noexpandtab
-# Ports Makefile for:	R
+# New ports collection makefile for:	R
 # Date created:		Fri Feb  9 10:50:25 EST 2001
 # Whom:			Maurice Castro <maurice@serc.rmit.edu.au>
 #
@@ -8,6 +8,7 @@
 
 PORTNAME=	R
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 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/ \
@@ -68,17 +69,21 @@ check-all: build
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	f77blas.1:${PORTSDIR}/math/atlas
 CONFIGURE_ARGS+=--with-lapack="-lalapack -lcblas" --with-blas="-lf77blas"
+PLIST_SUB+=	BLAS="@comment "
 .else
 LIB_DEPENDS+=	blas.1:${PORTSDIR}/math/blas
 CONFIGURE_ARGS+=--with-blas="-lblas"
+PLIST_SUB+=	BLAS=""
 .endif
 
 .if defined(WITHOUT_TCLTK)
 CONFIGURE_ARGS+=--without-tcltk
+PLIST_SUB+=	TCLTK="@comment "
 .else
 LIB_DEPENDS+=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
 CONFIGURE_ARGS+=--with-tcltk
+PLIST_SUB+=	TCLTK=""
 .endif
 
 .if defined(WITHOUT_JPEG)
@@ -97,9 +102,11 @@ CONFIGURE_ARGS+=--with-libpng
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--without-x
+PLIST_SUB+=	X11="@comment "
 .else
 CONFIGURE_ARGS+=--with-x
 USE_XLIB=	yes
+PLIST_SUB+=	X11=""
 .endif
 
 .if !defined(WITHOUT_GHOSTSCRIPT)
@@ -117,15 +124,15 @@ CONFIGURE_ARGS+=--with-system-pcre
 BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base
 ALL_TARGET+=	dvi
 INSTALL_TARGET+=install-dvi
-PLIST_SUB+=	DVI_MANUAL=''
+PLIST_SUB+=	DVI_MANUAL=""
 .else
-PLIST_SUB+=	DVI_MANUAL='@comment '
+PLIST_SUB+=	DVI_MANUAL="@comment "
 .endif
 
 .if defined(WITHOUT_PDF_MANUALS)
-PLIST_SUB+=	PDF_MANUAL='@comment '
+PLIST_SUB+=	PDF_MANUAL="@comment "
 .else
-PLIST_SUB+=	PDF_MANUAL=''
+PLIST_SUB+=	PDF_MANUAL=""
 BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base
 ALL_TARGET+=	pdf
 INSTALL_TARGET+=install-pdf
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index b7ccf003333b..d7479730e881 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -73,7 +73,7 @@ lib/R/include/Rmath.h
 lib/R/include/Rversion.h
 lib/R/include/S.h
 lib/R/lib/libR.so
-lib/R/lib/libRlapack.so
+%%BLAS%%lib/R/lib/libRlapack.so
 lib/R/library/KernSmooth/CONTENTS
 lib/R/library/KernSmooth/DESCRIPTION
 lib/R/library/KernSmooth/INDEX
@@ -7714,17 +7714,17 @@ lib/R/library/tcltk/INDEX
 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/nsInfo.rds
+%%TCLTK%%lib/R/library/tcltk/Meta/nsInfo.rds
 lib/R/library/tcltk/Meta/package.rds
-lib/R/library/tcltk/NAMESPACE
+%%TCLTK%%lib/R/library/tcltk/NAMESPACE
 lib/R/library/tcltk/R-ex/TclInterface.R
 lib/R/library/tcltk/R-ex/TkCommands.R
 lib/R/library/tcltk/R-ex/TkWidgetcmds.R
 lib/R/library/tcltk/R-ex/TkWidgets.R
 lib/R/library/tcltk/R-ex/tclServiceMode.R
 lib/R/library/tcltk/R/tcltk
-lib/R/library/tcltk/R/tcltk.rdb
-lib/R/library/tcltk/R/tcltk.rdx
+%%TCLTK%%lib/R/library/tcltk/R/tcltk.rdb
+%%TCLTK%%lib/R/library/tcltk/R/tcltk.rdx
 lib/R/library/tcltk/demo/tkcanvas.R
 lib/R/library/tcltk/demo/tkdensity.R
 lib/R/library/tcltk/demo/tkfaq.R
@@ -7769,7 +7769,7 @@ lib/R/library/tcltk/latex/tcltk-package.tex
 lib/R/library/tcltk/latex/tkStartGUI.tex
 lib/R/library/tcltk/latex/tk_select.list.tex
 lib/R/library/tcltk/latex/tkpager.tex
-lib/R/library/tcltk/libs/tcltk.so
+%%TCLTK%%lib/R/library/tcltk/libs/tcltk.so
 lib/R/library/tcltk/man/tcltk.Rd.gz
 lib/R/library/tcltk/po/en@quot/LC_MESSAGES/R-tcltk.mo
 lib/R/library/tcltk/po/fr/LC_MESSAGES/R-tcltk.mo
@@ -8224,7 +8224,7 @@ lib/R/library/utils/po/en@quot/LC_MESSAGES/R-utils.mo
 lib/R/library/utils/po/fr/LC_MESSAGES/R-utils.mo
 lib/R/library/utils/po/ko/LC_MESSAGES/R-utils.mo
 lib/R/library/utils/po/zh_CN/LC_MESSAGES/R-utils.mo
-lib/R/modules/R_X11.so
+%%X11%%lib/R/modules/R_X11.so
 lib/R/modules/internet.so
 lib/R/modules/lapack.so
 lib/R/modules/vfonts.so
@@ -8433,7 +8433,7 @@ lib/libR.so
 @dirrm lib/R/library/tcltk/po/en@quot
 @dirrm lib/R/library/tcltk/po
 @dirrm lib/R/library/tcltk/man
-@dirrm lib/R/library/tcltk/libs
+%%TCLTK%%@dirrm lib/R/library/tcltk/libs
 @dirrm lib/R/library/tcltk/latex
 @dirrm lib/R/library/tcltk/html
 @dirrm lib/R/library/tcltk/help