From 55ba5f46848570b8168d7656001a06713a2d63e0 Mon Sep 17 00:00:00 2001 From: mbalmer Date: Fri, 14 Dec 2007 15:08:18 +0000 Subject: [PATCH] Update R to version 2.6.1 and use zlib, bzlip, pcre from the ports tree instead of building a built-in version. --- math/R/Makefile | 16 +++++++++------- math/R/distinfo | 10 +++++----- math/R/pkg/PLIST | 27 ++++++++++++++++++++++----- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/math/R/Makefile b/math/R/Makefile index 7f3df1f25f5..7bb13d00092 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.22 2007/10/07 17:54:54 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.23 2007/12/14 15:08:18 mbalmer Exp $ SHARED_ONLY= Yes COMMENT= clone of S, a powerful math/statistics/graphics language -DISTNAME= R-2.6.0 -SHARED_LIBS= Rlapack 26.0 \ - Rblas 26.0 +DISTNAME= R-2.6.1 +SHARED_LIBS= Rlapack 26.1 \ + Rblas 26.1 CATEGORIES= math HOMEPAGE= http://www.r-project.org/ @@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xt c g2c m ncurses readline tcl84 Xmu +WANTLIB= ICE SM X11 Xt c g2c m ncurses readline tcl84 Xmu z MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \ http://cran.uk.r-project.org/src/base/R-2/ \ @@ -27,13 +27,15 @@ MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \ USE_X11= Yes MODULES= devel/gettext LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ - tk84.>=1:tk-8.4.*:x11/tk/8.4 + tk84.>=1:tk-8.4.*:x11/tk/8.4 \ + bz2::archivers/bzip2 \ + pcre:pcre->=4:devel/pcre CONFIGURE_STYLE=gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-readline --with-tcltk \ - --with-zlib --with-bzlib --with-pcre + --with-system-zlib --with-system-bzlib --with-system-pcre CONFIGURE_ENV= FFLAGS="${FFLAGS}" MAKE_FLAGS= INSTALL='install -c' \ diff --git a/math/R/distinfo b/math/R/distinfo index ab7afd14820..030269ec285 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,5 +1,5 @@ -MD5 (R-2.6.0.tar.gz) = l+XSVCNJkllit0aUVtRXMQ== -RMD160 (R-2.6.0.tar.gz) = VLPRg9+xWvf4Yee2KQSZiGWtGUw= -SHA1 (R-2.6.0.tar.gz) = /1FXj8Yw5lzg4ruSsOH4MkyUkl0= -SHA256 (R-2.6.0.tar.gz) = ipFuZTr/qDWEEZ3AiosS4w5DDe4Zo5hRNRUAPEPXkdo= -SIZE (R-2.6.0.tar.gz) = 15447985 +MD5 (R-2.6.1.tar.gz) = GcNaaeGvpz9fcPkf+ZOSMw== +RMD160 (R-2.6.1.tar.gz) = DlAjeRbgPJuIq1WMOamlh6q/SZE= +SHA1 (R-2.6.1.tar.gz) = byyGlPGTX9o4J5bSJeRb1vj3dVs= +SHA256 (R-2.6.1.tar.gz) = j+UFy9lWLMhEIkdbxcC44biLFNDJ4R0N5PnoOujOJWM= +SIZE (R-2.6.1.tar.gz) = 15519691 diff --git a/math/R/pkg/PLIST b/math/R/pkg/PLIST index a7f5a46e626..3f94b1efeb7 100644 --- a/math/R/pkg/PLIST +++ b/math/R/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2007/10/07 17:54:54 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.14 2007/12/14 15:08:18 mbalmer Exp $ bin/R bin/Rscript lib/R/ @@ -2649,6 +2649,9 @@ lib/R/library/boot/po/en@quot/LC_MESSAGES/R-boot.mo lib/R/library/boot/po/fr/ lib/R/library/boot/po/fr/LC_MESSAGES/ lib/R/library/boot/po/fr/LC_MESSAGES/R-boot.mo +lib/R/library/boot/po/ru/ +lib/R/library/boot/po/ru/LC_MESSAGES/ +lib/R/library/boot/po/ru/LC_MESSAGES/R-boot.mo lib/R/library/class/ lib/R/library/class/CITATION lib/R/library/class/CONTENTS @@ -2679,6 +2682,8 @@ lib/R/library/class/R-ex/multiedit.R lib/R/library/class/R-ex/olvq1.R lib/R/library/class/R-ex/reduce.nn.R lib/R/library/class/R/class +lib/R/library/class/R/class.rdb +lib/R/library/class/R/class.rdx lib/R/library/class/help/ lib/R/library/class/help/AnIndex lib/R/library/class/help/SOM @@ -2977,7 +2982,6 @@ lib/R/library/codetools/NAMESPACE lib/R/library/codetools/R/ lib/R/library/codetools/R-ex/ lib/R/library/codetools/R-ex/checkUsage.R -lib/R/library/codetools/R-ex/codetools.R lib/R/library/codetools/R-ex/findGlobals.R lib/R/library/codetools/R-ex/showTree.R lib/R/library/codetools/R/codetools @@ -3786,6 +3790,9 @@ lib/R/library/grDevices/libs/grDevices.so lib/R/library/grDevices/man/ lib/R/library/grDevices/man/grDevices.Rd.gz lib/R/library/grDevices/po/ +lib/R/library/grDevices/po/de/ +lib/R/library/grDevices/po/de/LC_MESSAGES/ +lib/R/library/grDevices/po/de/LC_MESSAGES/R-grDevices.mo lib/R/library/grDevices/po/en@quot/ lib/R/library/grDevices/po/en@quot/LC_MESSAGES/ lib/R/library/grDevices/po/en@quot/LC_MESSAGES/R-grDevices.mo @@ -4104,6 +4111,9 @@ lib/R/library/graphics/latex/zAxis.tex lib/R/library/graphics/man/ lib/R/library/graphics/man/graphics.Rd.gz lib/R/library/graphics/po/ +lib/R/library/graphics/po/de/ +lib/R/library/graphics/po/de/LC_MESSAGES/ +lib/R/library/graphics/po/de/LC_MESSAGES/R-graphics.mo lib/R/library/graphics/po/en@quot/ lib/R/library/graphics/po/en@quot/LC_MESSAGES/ lib/R/library/graphics/po/en@quot/LC_MESSAGES/R-graphics.mo @@ -4437,6 +4447,9 @@ lib/R/library/grid/libs/grid.so lib/R/library/grid/man/ lib/R/library/grid/man/grid.Rd.gz lib/R/library/grid/po/ +lib/R/library/grid/po/de/ +lib/R/library/grid/po/de/LC_MESSAGES/ +lib/R/library/grid/po/de/LC_MESSAGES/R-grid.mo lib/R/library/grid/po/en@quot/ lib/R/library/grid/po/en@quot/LC_MESSAGES/ lib/R/library/grid/po/en@quot/LC_MESSAGES/R-grid.mo @@ -4507,6 +4520,7 @@ lib/R/library/lattice/R-ex/qq.R lib/R/library/lattice/R-ex/qqmath.R lib/R/library/lattice/R-ex/rfs.R lib/R/library/lattice/R-ex/shingles.R +lib/R/library/lattice/R-ex/simpleTheme.R lib/R/library/lattice/R-ex/singer.R lib/R/library/lattice/R-ex/splom.R lib/R/library/lattice/R-ex/strip.default.R @@ -4576,6 +4590,7 @@ lib/R/library/lattice/help/qqmath lib/R/library/lattice/help/rfs lib/R/library/lattice/help/shingles lib/R/library/lattice/help/simpleKey +lib/R/library/lattice/help/simpleTheme lib/R/library/lattice/help/singer lib/R/library/lattice/help/splom lib/R/library/lattice/help/strip.default @@ -4637,6 +4652,7 @@ lib/R/library/lattice/html/qqmath.html lib/R/library/lattice/html/rfs.html lib/R/library/lattice/html/shingles.html lib/R/library/lattice/html/simpleKey.html +lib/R/library/lattice/html/simpleTheme.html lib/R/library/lattice/html/singer.html lib/R/library/lattice/html/splom.html lib/R/library/lattice/html/strip.default.html @@ -4697,6 +4713,7 @@ lib/R/library/lattice/latex/qqmath.tex lib/R/library/lattice/latex/rfs.tex lib/R/library/lattice/latex/shingles.tex lib/R/library/lattice/latex/simpleKey.tex +lib/R/library/lattice/latex/simpleTheme.tex lib/R/library/lattice/latex/singer.tex lib/R/library/lattice/latex/splom.tex lib/R/library/lattice/latex/strip.default.tex @@ -5405,7 +5422,6 @@ lib/R/library/nlme/R-ex/pdMatrix.R lib/R/library/nlme/R-ex/pdMatrix.reStruct.R lib/R/library/nlme/R-ex/pdNatural.R lib/R/library/nlme/R-ex/pdSymm.R -lib/R/library/nlme/R-ex/phenoModel.R lib/R/library/nlme/R-ex/plot.ACF.R lib/R/library/nlme/R-ex/plot.Variogram.R lib/R/library/nlme/R-ex/plot.augPred.R @@ -5429,7 +5445,6 @@ lib/R/library/nlme/R-ex/print.summary.pdMat.R lib/R/library/nlme/R-ex/print.varFunc.R lib/R/library/nlme/R-ex/qqnorm.gls.R lib/R/library/nlme/R-ex/qqnorm.lme.R -lib/R/library/nlme/R-ex/quinModel.R lib/R/library/nlme/R-ex/random.effects.R lib/R/library/nlme/R-ex/ranef.lmList.R lib/R/library/nlme/R-ex/ranef.lme.R @@ -6612,6 +6627,8 @@ lib/R/library/spatial/R-ex/trls.influence.R lib/R/library/spatial/R-ex/trmat.R lib/R/library/spatial/R-ex/variogram.R lib/R/library/spatial/R/spatial +lib/R/library/spatial/R/spatial.rdb +lib/R/library/spatial/R/spatial.rdx lib/R/library/spatial/help/ lib/R/library/spatial/help/AnIndex lib/R/library/spatial/help/Kaver @@ -8220,7 +8237,6 @@ lib/R/library/survival/R-ex/survexp.us.R lib/R/library/survival/R-ex/survfit.R lib/R/library/survival/R-ex/survobrien.R lib/R/library/survival/R-ex/survreg.R -lib/R/library/survival/R-ex/survreg.control.R lib/R/library/survival/R-ex/survreg.distributions.R lib/R/library/survival/R-ex/survreg.old.R lib/R/library/survival/R-ex/tcut.R @@ -9141,6 +9157,7 @@ lib/R/share/licenses/GPL-3 lib/R/share/licenses/LGPL-2 lib/R/share/licenses/LGPL-2.1 lib/R/share/licenses/LGPL-3 +lib/R/share/licenses/license.db lib/R/share/locale/ lib/R/share/locale/de/ lib/R/share/locale/de/LC_MESSAGES/