- Update to 2.2.0

PR:		ports/87276
Submitted by:	maintainer

math/R/Makefile

@@ -1,14 +1,13 @@
-# ex: ts=8 sts=0 noet
-# New ports collection makefile for:	R
-# Date created:			Fri Feb  9 10:50:25 EST 2001
-# Whom:				Maurice Castro <maurice@serc.rmit.edu.au>
+# vim: tabstop=8 softtabstop=0 noexpandtab
+# Ports Makefile for:	R
+# Date created:		Fri Feb  9 10:50:25 EST 2001
+# Whom:			Maurice Castro <maurice@serc.rmit.edu.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	R
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 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/ \
@@ -29,53 +28,123 @@ MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 		http://www.ibiblio.org/pub/languages/R/CRAN/src/base/R-2/ \
 		http://www.bioconductor.org/CRAN/src/base/R-2/
 
-MAINTAINER=	vangyzen@stat.duke.edu
+MAINTAINER=	eric+fbports@vangyzen.net
 COMMENT=	A language for statistical computing and graphics
 
-LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
-		tk84:${PORTSDIR}/x11-toolkits/tk84 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		pcre.0:${PORTSDIR}/devel/pcre
-
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=	f77blas.1:${PORTSDIR}/math/atlas
-CONFIGURE_ARGS=	--with-lapack="-lalapack -lcblas" --with-blas="-lf77blas"
-.else
-LIB_DEPENDS+=	lapack.3:${PORTSDIR}/math/lapack
-CONFIGURE_ARGS=	--with-lapack="-llapack" --with-blas="-lblas"
-.endif
+OPTIONS=	ATLAS        "Use ATLAS instead of BLAS/LAPACK"           off \
+		TCLTK        "Use Tcl/Tk (for the tcltk package)"         on  \
+		JPEG         "Enable the jpeg() graphics device"          on  \
+		PNG          "Enable the png() graphics device"           on  \
+		X11          "Enable the X11() graphics device"           on  \
+		GHOSTSCRIPT  "Enable the [dev2]bitmap() graphics devices" on  \
+		PCRE_PORT    "Use PCRE port instead of bundled source"    on  \
+		DVI_MANUALS  "Install DVI manuals (requires TeX)"         off \
+		PDF_MANUALS  "Install PDF manuals (requires TeX)"         on  \
+		INFO_MANUALS "Install GNU info manuals"                   on  \
+		LETTER_PAPER "Use US Letter paper"                        off
 
 MAN1=		R.1
 
+INSTALLS_SHLIB=	yes
+INSTALL_TARGET=	install install-libR
+ALL_TARGET=	all
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
+
 CONFIGURE_ENV=	FFLAGS="${FFLAGS}" \
 		INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644"
-CONFIGURE_ARGS+=--enable-R-shlib --with-bzlib --with-pcre --with-zlib
+CONFIGURE_ARGS=	--enable-R-shlib --with-system-bzlib --with-system-zlib \
+		rdocdir=${PREFIX}/share/doc/R
 
-pre-fetch:
-.if !defined(PAPERSIZE)
-	@${ECHO}
-	@${ECHO} "    The default paper size for printing from R is A4."
-	@${ECHO} "    You can change it by setting the PAPERSIZE"
-	@${ECHO} "    make variable to one of:"
-	@${ECHO} "        a4 letter legal executive"
-	@${ECHO} "    For example:"
-	@${ECHO} "        # make PAPERSIZE=letter install clean"
-	@${ECHO}
-.else
-CONFIGURE_ENV+=	R_PAPERSIZE=${PAPERSIZE}
-.endif
+.include <bsd.port.pre.mk>
 
 test check: build
 	@(cd ${WRKSRC}; ${MAKE} check)
 check-all: build
 	@(cd ${WRKSRC}; ${MAKE} check-all)
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=	f77blas.1:${PORTSDIR}/math/atlas
+CONFIGURE_ARGS+=--with-lapack="-lalapack -lcblas" --with-blas="-lf77blas"
+.else
+LIB_DEPENDS+=	blas.1:${PORTSDIR}/math/blas
+CONFIGURE_ARGS+=--with-blas="-lblas"
+.endif
+
+.if defined(WITHOUT_TCLTK)
+CONFIGURE_ARGS+=--without-tcltk
+.else
+LIB_DEPENDS+=	tcl84:${PORTSDIR}/lang/tcl84 \
+		tk84:${PORTSDIR}/x11-toolkits/tk84
+CONFIGURE_ARGS+=--with-tcltk
+.endif
+
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=--without-jpeglib
+.else
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+CONFIGURE_ARGS+=--with-jpeglib
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=--without-libpng
+.else
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+CONFIGURE_ARGS+=--with-libpng
+.endif
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--without-x
+.else
+CONFIGURE_ARGS+=--with-x
+USE_XLIB=	yes
+.endif
+
+.if !defined(WITHOUT_GHOSTSCRIPT)
+USE_GHOSTSCRIPT_RUN=yes
+.endif
+
+.if defined(WITHOUT_PCRE_PORT)
+CONFIGURE_ARGS+=--without-system-pcre
+.else
+LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+CONFIGURE_ARGS+=--with-system-pcre
+.endif
+
+.if defined(WITH_DVI_MANUALS)
+BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base
+ALL_TARGET+=	dvi
+INSTALL_TARGET+=install-dvi
+PLIST_SUB+=	DVI_MANUAL=''
+.else
+PLIST_SUB+=	DVI_MANUAL='@comment '
+.endif
+
+.if defined(WITHOUT_PDF_MANUALS)
+PLIST_SUB+=	PDF_MANUAL='@comment '
+.else
+PLIST_SUB+=	PDF_MANUAL=''
+BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base
+ALL_TARGET+=	pdf
+INSTALL_TARGET+=install-pdf
+.endif
+
+.if !defined(WITHOUT_INFO_MANUALS)
+ALL_TARGET+=	info
+INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
+
+post-install:
+	(cd ${WRKSRC}/doc/manual; \
+	for infofile in ${INFO}; do \
+		${INSTALL_DATA} $${infofile}.info* ${PREFIX}/${INFO_PATH}/; \
+	done)
+.endif
+
+.if defined(WITH_LETTER_PAPER)
+CONFIGURE_ENV+=	R_PAPERSIZE=letter
+.endif
 
 .if ${OSVERSION} < 500000
 CONFIGURE_ARGS+=	--disable-mbcs

math/R/distinfo

@@ -1,2 +1,2 @@
-MD5 (R-2.1.1.tar.gz) = e755b0ba5851ec261000af6b5c510335
-SIZE (R-2.1.1.tar.gz) = 12644376
+MD5 (R-2.2.0.tar.gz) = 6bddf439ae417a48bd31892996ea111c
+SIZE (R-2.2.0.tar.gz) = 13307492

math/R/files/patch-d-p-q-r-tests

@@ -1,22 +0,0 @@
---- tests/d-p-q-r-tests.R	2005-06-12 10:47:42.000000000 +0200
-+++ tests/d-p-q-r-tests.R	2005-06-22 17:45:06.000000000 +0200
-@@ -503,7 +503,7 @@
- pf(x, 5, Inf, ncp=0)
- pf(x, 5, 1e6, ncp=1)
- pf(x, 5, 1e7, ncp=1)
--all.equal(pf(x, 5, 1e8, ncp=1), tol = 5e-9,
-+all.equal(pf(x, 5, 1e8, ncp=1), tol = 1e-6,
-           c(0.0659330751, 0.4708802996, 0.9788764591))
- pf(x, 5, Inf, ncp=1)
- 
---- tests/d-p-q-r-tests.Rout.save	2005-06-12 10:47:41.000000000 +0200
-+++ tests/d-p-q-r-tests.Rout.save	2005-06-22 17:45:06.000000000 +0200
-@@ -1013,7 +1013,7 @@
- [1] 0.065933194 0.470879987 0.978875867
- > pf(x, 5, 1e7, ncp=1)
- [1] 0.06593309 0.47088028 0.97887641
--> all.equal(pf(x, 5, 1e8, ncp=1), tol = 5e-9,
-+> all.equal(pf(x, 5, 1e8, ncp=1), tol = 1e-6,
- +           c(0.0659330751, 0.4708802996, 0.9788764591))
- [1] TRUE
- > pf(x, 5, Inf, ncp=1)

math/R/pkg-descr

@@ -1,22 +1,20 @@
-From <http://www.R-project.org/about.html>:
+From <http://cran.R-project.org/doc/FAQ/R-FAQ.html#What-is-R_003f>:
 
-    R is a language and environment for statistical computing and graphics.
-    It is a GNU project which is similar to the S language and environment
-    which was developed at Bell Laboratories (formerly AT&T, now Lucent
-    Technologies) by John Chambers and colleagues. R can be considered as a
-    different implementation of S. There are some important differences,
-    but much code written for S runs unaltered under R. 
+R is a system for statistical computation and graphics. It consists of
+a language plus a run-time environment with graphics, a debugger,
+access to certain system functions, and the ability to run programs
+stored in script files.
 
-    R provides a wide variety of statistical (linear and nonlinear modelling,
-    classical statistical tests, time-series analysis, classification,
-    clustering, ...) and graphical techniques, and is highly extensible.
-    The S language is often the vehicle of choice for research in statistical
-    methodology, and R provides an Open Source route to participation in that
-    activity. 
-
-    One of R's strengths is the ease with which well-designed
-    publication-quality plots can be produced, including mathematical symbols
-    and formulae where needed. Great care has been taken over the defaults for
-    the minor design choices in graphics, but the user retains full control. 
+The core of R is an interpreted computer language which allows branching
+and looping as well as modular programming using functions.  Most of the
+user-visible functions in R are written in R. It is possible for the user
+to interface to procedures written in the C, C++, or FORTRAN languages
+for efficiency. The R distribution contains functionality for a large
+number of statistical procedures. Among these are: linear and generalized
+linear models, nonlinear regression models, time series analysis, classical
+parametric and nonparametric tests, clustering and smoothing. There is also
+a large set of functions which provide a flexible graphical environment for
+creating various kinds of data presentations. Additional modules ("add-on
+packages") are available for a variety of specific purposes.
 
 WWW: http://www.R-project.org/