Update to 2.7.0

SIGNIFICANT USER-VISIBLE CHANGES o The default graphics device in non-interactive use is now pdf() rather than postscript(). [PDF viewers are now more widely available than PostScript viewers.] The default width and height for pdf() and bitmap() have been changed to 7 (inches) to match the screen devices. o Most users of the X11() device will see a new device that has different fonts, anti-aliasing of lines and fonts and supports semi-transparent colours. o Considerable efforts have been made to make the default output from graphics devices as similar as possible (and in particular close to that from postscript/pdf). Many devices were misinterpreting 'pointsize' in some way, for example as being in device units (pixels) rather than in points. o Packages which include graphics devices need to be re-installed for this version of R, with recently updated versions. + New features and bug fixes.
author: markd <markd@pkgsrc.org> 2008-04-26 02:39:27 +0000
committer: markd <markd@pkgsrc.org> 2008-04-26 02:39:27 +0000
commit: 93cb29d520896d5321053c7ccb687992825b20a7 (patch)
tree: 6918a9c3700400ba74aa6fd2b52d9ea0d45d8229 /math/R
parent: d69a62e6477cb0e7dc32cd8bc2aad415c8680a8b (diff)
download: pkgsrc-93cb29d520896d5321053c7ccb687992825b20a7.tar.gz
5 files changed, 165 insertions, 207 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 474efc77f2f..6beeac1d25e 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2008/03/15 22:16:41 markd Exp $
+# $NetBSD: Makefile,v 1.97 2008/04/26 02:39:27 markd Exp $
 
-DISTNAME=		R-2.6.2
+DISTNAME=		R-2.7.0
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
@@ -47,6 +47,9 @@ CONFIGURE_ARGS+=	--without-libmoto
 CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm=yes
 CONFIGURE_ENV+=		ac_cv_lib_blas_dgemm_=yes
 
+# Broken test for bzlib >= 1.0.5 in R 2.7.0
+CONFIGURE_ENV+=		r_cv_have_bzlib=yes
+
 CONFIGURE_ENV+=		GETWD=${TOOLS_PWD_CMD:Q}
 CONFIGURE_ENV+=		lt_cv_path_LD=${LD:Q}
 CONFIGURE_ENV+=		lt_cv_path_SED=${TOOLS_SED:Q}
@@ -76,7 +79,8 @@ CONFIGURE_ENV+=		R_PAPERSIZE=${R_PAPERSIZE:Q}
 INSTALL_DATA=		${INSTALL} ${COPY} -m ${SHAREMODE}
 INSTALL_SCRIPT=		${INSTALL} ${COPY} -m ${BINMODE}
 
-BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
+BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
 CONFIGURE_ARGS+=	--enable-mbcs=no
@@ -90,6 +94,7 @@ CONFIGURE_ARGS+=	--enable-mbcs=no
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
@@ -99,4 +104,5 @@ DEINSTALL_TEMPLATES+=	../../math/R/files/pkg-index.tmpl
 PRINT_PLIST_AWK+=	/^lib\/R\/doc\/html\/packages.html$$/ { next; }
 PRINT_PLIST_AWK+=	/^lib\/R\/doc\/html\/search\/index.txt$$/ { next; }
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R/PLIST b/math/R/PLIST
index e82624da225..c453388bbe2 100644
--- a/math/R/PLIST
+++ b/math/R/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/03/15 22:16:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/26 02:39:27 markd Exp $
 bin/R
 bin/Rscript
 lib/R/COPYING
@@ -84,7 +84,6 @@ lib/R/include/R_ext/Complex.h
 lib/R/include/R_ext/Constants.h
 lib/R/include/R_ext/Error.h
 lib/R/include/R_ext/GetX11Image.h
-lib/R/include/R_ext/GraphicsBase.h
 lib/R/include/R_ext/GraphicsDevice.h
 lib/R/include/R_ext/GraphicsEngine.h
 lib/R/include/R_ext/Lapack.h
@@ -93,6 +92,7 @@ lib/R/include/R_ext/Memory.h
 lib/R/include/R_ext/Parse.h
 lib/R/include/R_ext/Print.h
 lib/R/include/R_ext/PrtUtil.h
+lib/R/include/R_ext/QuartzDevice.h
 lib/R/include/R_ext/R-ftp-http.h
 lib/R/include/R_ext/RConverters.h
 lib/R/include/R_ext/RS.h
@@ -101,6 +101,7 @@ lib/R/include/R_ext/Random.h
 lib/R/include/R_ext/Rdynload.h
 lib/R/include/R_ext/Riconv.h
 lib/R/include/R_ext/Utils.h
+lib/R/include/R_ext/Visibility.h
 lib/R/include/R_ext/eventloop.h
 lib/R/include/R_ext/libextern.h
 lib/R/include/R_ext/rlocale.h
@@ -982,6 +983,7 @@ lib/R/library/base/R-ex/polyroot.R
 lib/R/library/base/R-ex/pos.to.env.R
 lib/R/library/base/R-ex/pretty.R
 lib/R/library/base/R-ex/print.R
+lib/R/library/base/R-ex/print.dataframe.R
 lib/R/library/base/R-ex/print.default.R
 lib/R/library/base/R-ex/prmatrix.R
 lib/R/library/base/R-ex/proc.time.R
@@ -1060,6 +1062,7 @@ lib/R/library/base/R-ex/taskCallbackManager.R
 lib/R/library/base/R-ex/taskCallbackNames.R
 lib/R/library/base/R-ex/tempfile.R
 lib/R/library/base/R-ex/textconnections.R
+lib/R/library/base/R-ex/timezones.R
 lib/R/library/base/R-ex/toString.R
 lib/R/library/base/R-ex/trace.R
 lib/R/library/base/R-ex/traceback.R
@@ -1071,6 +1074,7 @@ lib/R/library/base/R-ex/unique.R
 lib/R/library/base/R-ex/unlist.R
 lib/R/library/base/R-ex/unname.R
 lib/R/library/base/R-ex/userhooks.R
+lib/R/library/base/R-ex/utf8Conversion.R
 lib/R/library/base/R-ex/vector.R
 lib/R/library/base/R-ex/warning.R
 lib/R/library/base/R-ex/warnings.R
@@ -1103,6 +1107,7 @@ lib/R/library/base/help/Dates
 lib/R/library/base/help/Defunct
 lib/R/library/base/help/Deprecated
 lib/R/library/base/help/Encoding
+lib/R/library/base/help/EnvVar
 lib/R/library/base/help/Extract
 lib/R/library/base/help/Extract.data.frame
 lib/R/library/base/help/Extract.factor
@@ -1277,6 +1282,7 @@ lib/R/library/base/help/gzcon
 lib/R/library/base/help/hexmode
 lib/R/library/base/help/iconv
 lib/R/library/base/help/identical
+lib/R/library/base/help/identity
 lib/R/library/base/help/ifelse
 lib/R/library/base/help/integer
 lib/R/library/base/help/interaction
@@ -1449,6 +1455,7 @@ lib/R/library/base/help/taskCallbackNames
 lib/R/library/base/help/tempfile
 lib/R/library/base/help/textconnections
 lib/R/library/base/help/tilde
+lib/R/library/base/help/timezones
 lib/R/library/base/help/toString
 lib/R/library/base/help/trace
 lib/R/library/base/help/traceback
@@ -1490,6 +1497,7 @@ lib/R/library/base/html/Dates.html
 lib/R/library/base/html/Defunct.html
 lib/R/library/base/html/Deprecated.html
 lib/R/library/base/html/Encoding.html
+lib/R/library/base/html/EnvVar.html
 lib/R/library/base/html/Extract.data.frame.html
 lib/R/library/base/html/Extract.factor.html
 lib/R/library/base/html/Extract.html
@@ -1664,6 +1672,7 @@ lib/R/library/base/html/gzcon.html
 lib/R/library/base/html/hexmode.html
 lib/R/library/base/html/iconv.html
 lib/R/library/base/html/identical.html
+lib/R/library/base/html/identity.html
 lib/R/library/base/html/ifelse.html
 lib/R/library/base/html/integer.html
 lib/R/library/base/html/interaction.html
@@ -1836,6 +1845,7 @@ lib/R/library/base/html/taskCallbackNames.html
 lib/R/library/base/html/tempfile.html
 lib/R/library/base/html/textconnections.html
 lib/R/library/base/html/tilde.html
+lib/R/library/base/html/timezones.html
 lib/R/library/base/html/toString.html
 lib/R/library/base/html/trace.html
 lib/R/library/base/html/traceback.html
@@ -1876,6 +1886,7 @@ lib/R/library/base/latex/Dates.tex
 lib/R/library/base/latex/Defunct.tex
 lib/R/library/base/latex/Deprecated.tex
 lib/R/library/base/latex/Encoding.tex
+lib/R/library/base/latex/EnvVar.tex
 lib/R/library/base/latex/Extract.data.frame.tex
 lib/R/library/base/latex/Extract.factor.tex
 lib/R/library/base/latex/Extract.tex
@@ -2050,6 +2061,7 @@ lib/R/library/base/latex/gzcon.tex
 lib/R/library/base/latex/hexmode.tex
 lib/R/library/base/latex/iconv.tex
 lib/R/library/base/latex/identical.tex
+lib/R/library/base/latex/identity.tex
 lib/R/library/base/latex/ifelse.tex
 lib/R/library/base/latex/integer.tex
 lib/R/library/base/latex/interaction.tex
@@ -2222,6 +2234,7 @@ lib/R/library/base/latex/taskCallbackNames.tex
 lib/R/library/base/latex/tempfile.tex
 lib/R/library/base/latex/textconnections.tex
 lib/R/library/base/latex/tilde.tex
+lib/R/library/base/latex/timezones.tex
 lib/R/library/base/latex/toString.tex
 lib/R/library/base/latex/trace.tex
 lib/R/library/base/latex/traceback.tex
@@ -2259,6 +2272,7 @@ lib/R/library/base/po/ko/LC_MESSAGES/R-base.mo
 lib/R/library/base/po/pt_BR/LC_MESSAGES/R-base.mo
 lib/R/library/base/po/ru/LC_MESSAGES/R-base.mo
 lib/R/library/base/po/zh_CN/LC_MESSAGES/R-base.mo
+lib/R/library/boot/CITATION
 lib/R/library/boot/CONTENTS
 lib/R/library/boot/DESCRIPTION
 lib/R/library/boot/INDEX
@@ -3341,6 +3355,7 @@ lib/R/library/grDevices/R-ex/contourLines.R
 lib/R/library/grDevices/R-ex/convertColor.R
 lib/R/library/grDevices/R-ex/dev.R
 lib/R/library/grDevices/R-ex/dev.interactive.R
+lib/R/library/grDevices/R-ex/dev.size.R
 lib/R/library/grDevices/R-ex/dev2.R
 lib/R/library/grDevices/R-ex/extendrange.R
 lib/R/library/grDevices/R-ex/getGraphicsEvent.R
@@ -3354,6 +3369,7 @@ lib/R/library/grDevices/R-ex/nclass.R
 lib/R/library/grDevices/R-ex/palette.R
 lib/R/library/grDevices/R-ex/palettes.R
 lib/R/library/grDevices/R-ex/pdf.R
+lib/R/library/grDevices/R-ex/pdf.options.R
 lib/R/library/grDevices/R-ex/pictex.R
 lib/R/library/grDevices/R-ex/plotmath.R
 lib/R/library/grDevices/R-ex/png.R
@@ -3486,6 +3502,7 @@ lib/R/library/grDevices/help/Japanese
 lib/R/library/grDevices/help/Type1Font
 lib/R/library/grDevices/help/as.graphicsAnnot
 lib/R/library/grDevices/help/boxplot.stats
+lib/R/library/grDevices/help/cairo
 lib/R/library/grDevices/help/check.options
 lib/R/library/grDevices/help/chull
 lib/R/library/grDevices/help/cm
@@ -3496,8 +3513,10 @@ lib/R/library/grDevices/help/contourLines
 lib/R/library/grDevices/help/convertColor
 lib/R/library/grDevices/help/dev
 lib/R/library/grDevices/help/dev.interactive
+lib/R/library/grDevices/help/dev.size
 lib/R/library/grDevices/help/dev2
 lib/R/library/grDevices/help/dev2bitmap
+lib/R/library/grDevices/help/devAskNewPage
 lib/R/library/grDevices/help/embedFonts
 lib/R/library/grDevices/help/extendrange
 lib/R/library/grDevices/help/getGraphicsEvent
@@ -3513,6 +3532,7 @@ lib/R/library/grDevices/help/nclass
 lib/R/library/grDevices/help/palette
 lib/R/library/grDevices/help/palettes
 lib/R/library/grDevices/help/pdf
+lib/R/library/grDevices/help/pdf.options
 lib/R/library/grDevices/help/pictex
 lib/R/library/grDevices/help/plotmath
 lib/R/library/grDevices/help/png
@@ -3525,6 +3545,7 @@ lib/R/library/grDevices/help/recordGraphics
 lib/R/library/grDevices/help/recordplot
 lib/R/library/grDevices/help/rgb
 lib/R/library/grDevices/help/rgb2hsv
+lib/R/library/grDevices/help/savePlot
 lib/R/library/grDevices/help/trans3d
 lib/R/library/grDevices/help/x11
 lib/R/library/grDevices/help/x11Fonts
@@ -3539,6 +3560,7 @@ lib/R/library/grDevices/html/Japanese.html
 lib/R/library/grDevices/html/Type1Font.html
 lib/R/library/grDevices/html/as.graphicsAnnot.html
 lib/R/library/grDevices/html/boxplot.stats.html
+lib/R/library/grDevices/html/cairo.html
 lib/R/library/grDevices/html/check.options.html
 lib/R/library/grDevices/html/chull.html
 lib/R/library/grDevices/html/cm.html
@@ -3549,8 +3571,10 @@ lib/R/library/grDevices/html/contourLines.html
 lib/R/library/grDevices/html/convertColor.html
 lib/R/library/grDevices/html/dev.html
 lib/R/library/grDevices/html/dev.interactive.html
+lib/R/library/grDevices/html/dev.size.html
 lib/R/library/grDevices/html/dev2.html
 lib/R/library/grDevices/html/dev2bitmap.html
+lib/R/library/grDevices/html/devAskNewPage.html
 lib/R/library/grDevices/html/embedFonts.html
 lib/R/library/grDevices/html/extendrange.html
 lib/R/library/grDevices/html/getGraphicsEvent.html
@@ -3566,6 +3590,7 @@ lib/R/library/grDevices/html/nclass.html
 lib/R/library/grDevices/html/palette.html
 lib/R/library/grDevices/html/palettes.html
 lib/R/library/grDevices/html/pdf.html
+lib/R/library/grDevices/html/pdf.options.html
 lib/R/library/grDevices/html/pictex.html
 lib/R/library/grDevices/html/plotmath.html
 lib/R/library/grDevices/html/png.html
@@ -3578,6 +3603,7 @@ lib/R/library/grDevices/html/recordGraphics.html
 lib/R/library/grDevices/html/recordplot.html
 lib/R/library/grDevices/html/rgb.html
 lib/R/library/grDevices/html/rgb2hsv.html
+lib/R/library/grDevices/html/savePlot.html
 lib/R/library/grDevices/html/trans3d.html
 lib/R/library/grDevices/html/x11.html
 lib/R/library/grDevices/html/x11Fonts.html
@@ -3591,6 +3617,7 @@ lib/R/library/grDevices/latex/Japanese.tex
 lib/R/library/grDevices/latex/Type1Font.tex
 lib/R/library/grDevices/latex/as.graphicsAnnot.tex
 lib/R/library/grDevices/latex/boxplot.stats.tex
+lib/R/library/grDevices/latex/cairo.tex
 lib/R/library/grDevices/latex/check.options.tex
 lib/R/library/grDevices/latex/chull.tex
 lib/R/library/grDevices/latex/cm.tex
@@ -3600,9 +3627,11 @@ lib/R/library/grDevices/latex/colors.tex
 lib/R/library/grDevices/latex/contourLines.tex
 lib/R/library/grDevices/latex/convertColor.tex
 lib/R/library/grDevices/latex/dev.interactive.tex
+lib/R/library/grDevices/latex/dev.size.tex
 lib/R/library/grDevices/latex/dev.tex
 lib/R/library/grDevices/latex/dev2.tex
 lib/R/library/grDevices/latex/dev2bitmap.tex
+lib/R/library/grDevices/latex/devAskNewPage.tex
 lib/R/library/grDevices/latex/embedFonts.tex
 lib/R/library/grDevices/latex/extendrange.tex
 lib/R/library/grDevices/latex/getGraphicsEvent.tex
@@ -3617,6 +3646,7 @@ lib/R/library/grDevices/latex/n2mfrow.tex
 lib/R/library/grDevices/latex/nclass.tex
 lib/R/library/grDevices/latex/palette.tex
 lib/R/library/grDevices/latex/palettes.tex
+lib/R/library/grDevices/latex/pdf.options.tex
 lib/R/library/grDevices/latex/pdf.tex
 lib/R/library/grDevices/latex/pictex.tex
 lib/R/library/grDevices/latex/plotmath.tex
@@ -3630,6 +3660,7 @@ lib/R/library/grDevices/latex/recordGraphics.tex
 lib/R/library/grDevices/latex/recordplot.tex
 lib/R/library/grDevices/latex/rgb.tex
 lib/R/library/grDevices/latex/rgb2hsv.tex
+lib/R/library/grDevices/latex/savePlot.tex
 lib/R/library/grDevices/latex/trans3d.tex
 lib/R/library/grDevices/latex/x11.tex
 lib/R/library/grDevices/latex/x11Fonts.tex
@@ -3676,7 +3707,9 @@ lib/R/library/graphics/R-ex/box.R
 lib/R/library/graphics/R-ex/boxplot.R
 lib/R/library/graphics/R-ex/bxp.R
 lib/R/library/graphics/R-ex/cdplot.R
+lib/R/library/graphics/R-ex/clip.R
 lib/R/library/graphics/R-ex/contour.R
+lib/R/library/graphics/R-ex/convertXY.R
 lib/R/library/graphics/R-ex/coplot.R
 lib/R/library/graphics/R-ex/curve.R
 lib/R/library/graphics/R-ex/dotchart.R
@@ -3746,7 +3779,9 @@ lib/R/library/graphics/help/box
 lib/R/library/graphics/help/boxplot
 lib/R/library/graphics/help/bxp
 lib/R/library/graphics/help/cdplot
+lib/R/library/graphics/help/clip
 lib/R/library/graphics/help/contour
+lib/R/library/graphics/help/convertXY
 lib/R/library/graphics/help/coplot
 lib/R/library/graphics/help/curve
 lib/R/library/graphics/help/dotchart
@@ -3812,7 +3847,9 @@ lib/R/library/graphics/html/box.html
 lib/R/library/graphics/html/boxplot.html
 lib/R/library/graphics/html/bxp.html
 lib/R/library/graphics/html/cdplot.html
+lib/R/library/graphics/html/clip.html
 lib/R/library/graphics/html/contour.html
+lib/R/library/graphics/html/convertXY.html
 lib/R/library/graphics/html/coplot.html
 lib/R/library/graphics/html/curve.html
 lib/R/library/graphics/html/dotchart.html
@@ -3877,7 +3914,9 @@ lib/R/library/graphics/latex/box.tex
 lib/R/library/graphics/latex/boxplot.tex
 lib/R/library/graphics/latex/bxp.tex
 lib/R/library/graphics/latex/cdplot.tex
+lib/R/library/graphics/latex/clip.tex
 lib/R/library/graphics/latex/contour.tex
+lib/R/library/graphics/latex/convertXY.tex
 lib/R/library/graphics/latex/coplot.tex
 lib/R/library/graphics/latex/curve.tex
 lib/R/library/graphics/latex/dotchart.tex
@@ -3989,32 +4028,45 @@ 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
+lib/R/library/grid/doc/displaylist.R
 lib/R/library/grid/doc/displaylist.Snw
 lib/R/library/grid/doc/displaylist.pdf
+lib/R/library/grid/doc/frame.R
 lib/R/library/grid/doc/frame.Snw
 lib/R/library/grid/doc/frame.pdf
+lib/R/library/grid/doc/grid.R
 lib/R/library/grid/doc/grid.Snw
 lib/R/library/grid/doc/grid.bib
 lib/R/library/grid/doc/grid.pdf
+lib/R/library/grid/doc/grobs.R
 lib/R/library/grid/doc/grobs.Snw
 lib/R/library/grid/doc/grobs.pdf
 lib/R/library/grid/doc/index.html
+lib/R/library/grid/doc/interactive.R
 lib/R/library/grid/doc/interactive.Snw
 lib/R/library/grid/doc/interactive.pdf
+lib/R/library/grid/doc/locndimn.R
 lib/R/library/grid/doc/locndimn.Snw
 lib/R/library/grid/doc/locndimn.pdf
+lib/R/library/grid/doc/moveline.R
 lib/R/library/grid/doc/moveline.Snw
 lib/R/library/grid/doc/moveline.pdf
+lib/R/library/grid/doc/nonfinite.R
 lib/R/library/grid/doc/nonfinite.Snw
 lib/R/library/grid/doc/nonfinite.pdf
+lib/R/library/grid/doc/plotexample.R
 lib/R/library/grid/doc/plotexample.Snw
 lib/R/library/grid/doc/plotexample.pdf
+lib/R/library/grid/doc/rotated.R
 lib/R/library/grid/doc/rotated.Snw
 lib/R/library/grid/doc/rotated.pdf
+lib/R/library/grid/doc/saveload.R
 lib/R/library/grid/doc/saveload.Snw
 lib/R/library/grid/doc/saveload.pdf
+lib/R/library/grid/doc/sharing.R
 lib/R/library/grid/doc/sharing.Snw
 lib/R/library/grid/doc/sharing.pdf
+lib/R/library/grid/doc/viewports.R
 lib/R/library/grid/doc/viewports.Snw
 lib/R/library/grid/doc/viewports.pdf
 lib/R/library/grid/help/AnIndex
@@ -4503,12 +4555,14 @@ lib/R/library/methods/Meta/package.rds
 lib/R/library/methods/NAMESPACE
 lib/R/library/methods/R-ex/GenericFunctions.R
 lib/R/library/methods/R-ex/NextMethod.R
+lib/R/library/methods/R-ex/RClassUtils.R
 lib/R/library/methods/R-ex/RMethodUtils.R
 lib/R/library/methods/R-ex/S4groupGeneric.R
 lib/R/library/methods/R-ex/StructureClasses.R
 lib/R/library/methods/R-ex/as.R
 lib/R/library/methods/R-ex/canCoerce.R
 lib/R/library/methods/R-ex/cbind2.R
+lib/R/library/methods/R-ex/findMethods.R
 lib/R/library/methods/R-ex/getClass.R
 lib/R/library/methods/R-ex/getMethod.R
 lib/R/library/methods/R-ex/getPackageName.R
@@ -4561,6 +4615,7 @@ lib/R/library/methods/help/as
 lib/R/library/methods/help/canCoerce
 lib/R/library/methods/help/cbind2
 lib/R/library/methods/help/classRepresentation-class
+lib/R/library/methods/help/findMethods
 lib/R/library/methods/help/fixPrevious
 lib/R/library/methods/help/genericFunction-class
 lib/R/library/methods/help/getClass
@@ -4574,6 +4629,7 @@ lib/R/library/methods/help/isSealedMethod
 lib/R/library/methods/help/languageEl
 lib/R/library/methods/help/method.skeleton
 lib/R/library/methods/help/methodUtilities
+lib/R/library/methods/help/methods-deprecated
 lib/R/library/methods/help/methods-package
 lib/R/library/methods/help/new
 lib/R/library/methods/help/oldGet
@@ -4622,6 +4678,7 @@ lib/R/library/methods/html/as.html
 lib/R/library/methods/html/canCoerce.html
 lib/R/library/methods/html/cbind2.html
 lib/R/library/methods/html/classRepresentation-class.html
+lib/R/library/methods/html/findMethods.html
 lib/R/library/methods/html/fixPrevious.html
 lib/R/library/methods/html/genericFunction-class.html
 lib/R/library/methods/html/getClass.html
@@ -4635,6 +4692,7 @@ lib/R/library/methods/html/isSealedMethod.html
 lib/R/library/methods/html/languageEl.html
 lib/R/library/methods/html/method.skeleton.html
 lib/R/library/methods/html/methodUtilities.html
+lib/R/library/methods/html/methods-deprecated.html
 lib/R/library/methods/html/methods-package.html
 lib/R/library/methods/html/new.html
 lib/R/library/methods/html/oldGet.html
@@ -4682,6 +4740,7 @@ lib/R/library/methods/latex/as.tex
 lib/R/library/methods/latex/canCoerce.tex
 lib/R/library/methods/latex/cbind2.tex
 lib/R/library/methods/latex/classRepresentation-class.tex
+lib/R/library/methods/latex/findMethods.tex
 lib/R/library/methods/latex/fixPrevious.tex
 lib/R/library/methods/latex/genericFunction-class.tex
 lib/R/library/methods/latex/getClass.tex
@@ -4695,6 +4754,7 @@ lib/R/library/methods/latex/isSealedMethod.tex
 lib/R/library/methods/latex/languageEl.tex
 lib/R/library/methods/latex/method.skeleton.tex
 lib/R/library/methods/latex/methodUtilities.tex
+lib/R/library/methods/latex/methods-deprecated.tex
 lib/R/library/methods/latex/methods-package.tex
 lib/R/library/methods/latex/new.tex
 lib/R/library/methods/latex/oldGet.tex
@@ -4973,6 +5033,7 @@ lib/R/library/mgcv/latex/vcov.gam.tex
 lib/R/library/mgcv/latex/vis.gam.tex
 lib/R/library/mgcv/libs/mgcv.so
 lib/R/library/mgcv/man/mgcv.Rd.gz
+lib/R/library/nlme/CITATION
 lib/R/library/nlme/CONTENTS
 lib/R/library/nlme/COPYING
 lib/R/library/nlme/DESCRIPTION
@@ -6130,25 +6191,6 @@ lib/R/library/nnet/libs/nnet.so
 lib/R/library/nnet/man/nnet.Rd.gz
 lib/R/library/nnet/po/en@quot/LC_MESSAGES/R-nnet.mo
 lib/R/library/nnet/po/fr/LC_MESSAGES/R-nnet.mo
-lib/R/library/rcompgen/CONTENTS
-lib/R/library/rcompgen/COPYING
-lib/R/library/rcompgen/DESCRIPTION
-lib/R/library/rcompgen/INDEX
-lib/R/library/rcompgen/Meta/Rd.rds
-lib/R/library/rcompgen/Meta/hsearch.rds
-lib/R/library/rcompgen/Meta/nsInfo.rds
-lib/R/library/rcompgen/Meta/package.rds
-lib/R/library/rcompgen/NAMESPACE
-lib/R/library/rcompgen/R/rcompgen
-lib/R/library/rcompgen/R/rcompgen.rdb
-lib/R/library/rcompgen/R/rcompgen.rdx
-lib/R/library/rcompgen/examples/altesscomp.el
-lib/R/library/rcompgen/help/AnIndex
-lib/R/library/rcompgen/help/rcompgen
-lib/R/library/rcompgen/html/00Index.html
-lib/R/library/rcompgen/html/rcompgen.html
-lib/R/library/rcompgen/latex/rcompgen.tex
-lib/R/library/rcompgen/man/rcompgen.Rd.gz
 lib/R/library/rpart/CONTENTS
 lib/R/library/rpart/DESCRIPTION
 lib/R/library/rpart/INDEX
@@ -6270,6 +6312,8 @@ lib/R/library/rpart/po/en@quot/LC_MESSAGES/R-rpart.mo
 lib/R/library/rpart/po/en@quot/LC_MESSAGES/rpart.mo
 lib/R/library/rpart/po/fr/LC_MESSAGES/R-rpart.mo
 lib/R/library/rpart/po/fr/LC_MESSAGES/rpart.mo
+lib/R/library/rpart/po/ru/LC_MESSAGES/R-rpart.mo
+lib/R/library/rpart/po/ru/LC_MESSAGES/rpart.mo
 lib/R/library/spatial/CITATION
 lib/R/library/spatial/CONTENTS
 lib/R/library/spatial/DESCRIPTION
@@ -7684,6 +7728,8 @@ lib/R/library/stats/latex/xtabs.tex
 lib/R/library/stats/latex/zC.tex
 lib/R/library/stats/libs/stats.so
 lib/R/library/stats/man/stats.Rd.gz
+lib/R/library/stats/po/de/LC_MESSAGES/R-stats.mo
+lib/R/library/stats/po/de/LC_MESSAGES/stats.mo
 lib/R/library/stats/po/en@quot/LC_MESSAGES/R-stats.mo
 lib/R/library/stats/po/en@quot/LC_MESSAGES/stats.mo
 lib/R/library/stats/po/fr/LC_MESSAGES/R-stats.mo
@@ -7765,6 +7811,7 @@ lib/R/library/stats4/latex/summary.mle-class.tex
 lib/R/library/stats4/latex/update-methods.tex
 lib/R/library/stats4/latex/vcov-methods.tex
 lib/R/library/stats4/man/stats4.Rd.gz
+lib/R/library/stats4/po/de/LC_MESSAGES/R-stats4.mo
 lib/R/library/stats4/po/en@quot/LC_MESSAGES/R-stats4.mo
 lib/R/library/stats4/po/fr/LC_MESSAGES/R-stats4.mo
 lib/R/library/stats4/po/it/LC_MESSAGES/R-stats4.mo
@@ -8039,6 +8086,7 @@ 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-ex/tkProgressBar.R
 lib/R/library/tcltk/R/tcltk
 lib/R/library/tcltk/R/tcltk.rdb
 lib/R/library/tcltk/R/tcltk.rdx
@@ -8050,6 +8098,7 @@ lib/R/library/tcltk/exec/Tk-frontend.R
 lib/R/library/tcltk/exec/console.tcl
 lib/R/library/tcltk/exec/hierarchy.tcl
 lib/R/library/tcltk/exec/pkgIndex.tcl
+lib/R/library/tcltk/exec/progressbar.tcl
 lib/R/library/tcltk/exec/util-dump.tcl
 lib/R/library/tcltk/exec/util-expand.tcl
 lib/R/library/tcltk/exec/util-number.tcl
@@ -8065,6 +8114,7 @@ lib/R/library/tcltk/help/TkWidgets
 lib/R/library/tcltk/help/tclServiceMode
 lib/R/library/tcltk/help/tcltk-defunct
 lib/R/library/tcltk/help/tcltk-package
+lib/R/library/tcltk/help/tkProgressBar
 lib/R/library/tcltk/help/tkStartGUI
 lib/R/library/tcltk/help/tk_select.list
 lib/R/library/tcltk/help/tkpager
@@ -8076,6 +8126,7 @@ lib/R/library/tcltk/html/TkWidgets.html
 lib/R/library/tcltk/html/tclServiceMode.html
 lib/R/library/tcltk/html/tcltk-defunct.html
 lib/R/library/tcltk/html/tcltk-package.html
+lib/R/library/tcltk/html/tkProgressBar.html
 lib/R/library/tcltk/html/tkStartGUI.html
 lib/R/library/tcltk/html/tk_select.list.html
 lib/R/library/tcltk/html/tkpager.html
@@ -8086,11 +8137,14 @@ lib/R/library/tcltk/latex/TkWidgets.tex
 lib/R/library/tcltk/latex/tclServiceMode.tex
 lib/R/library/tcltk/latex/tcltk-defunct.tex
 lib/R/library/tcltk/latex/tcltk-package.tex
+lib/R/library/tcltk/latex/tkProgressBar.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
 lib/R/library/tcltk/man/tcltk.Rd.gz
+lib/R/library/tcltk/po/de/LC_MESSAGES/R-tcltk.mo
+lib/R/library/tcltk/po/de/LC_MESSAGES/tcltk.mo
 lib/R/library/tcltk/po/en@quot/LC_MESSAGES/R-tcltk.mo
 lib/R/library/tcltk/po/en@quot/LC_MESSAGES/tcltk.mo
 lib/R/library/tcltk/po/fr/LC_MESSAGES/R-tcltk.mo
@@ -8122,6 +8176,8 @@ lib/R/library/tools/R-ex/getDepList.R
 lib/R/library/tools/R-ex/installFoundDepends.R
 lib/R/library/tools/R-ex/makeLazyLoading.R
 lib/R/library/tools/R-ex/md5sum.R
+lib/R/library/tools/R-ex/readNEWS.R
+lib/R/library/tools/R-ex/showNonASCII.R
 lib/R/library/tools/R-ex/undoc.R
 lib/R/library/tools/R-ex/vignetteDepends.R
 lib/R/library/tools/R-ex/writePACKAGES.R
@@ -8149,6 +8205,8 @@ lib/R/library/tools/help/makeLazyLoading
 lib/R/library/tools/help/md5sum
 lib/R/library/tools/help/package.dependencies
 lib/R/library/tools/help/read.00Index
+lib/R/library/tools/help/readNEWS
+lib/R/library/tools/help/showNonASCII
 lib/R/library/tools/help/texi2dvi
 lib/R/library/tools/help/tools-defunct
 lib/R/library/tools/help/tools-deprecated
@@ -8177,6 +8235,8 @@ lib/R/library/tools/html/makeLazyLoading.html
 lib/R/library/tools/html/md5sum.html
 lib/R/library/tools/html/package.dependencies.html
 lib/R/library/tools/html/read.00Index.html
+lib/R/library/tools/html/readNEWS.html
+lib/R/library/tools/html/showNonASCII.html
 lib/R/library/tools/html/texi2dvi.html
 lib/R/library/tools/html/tools-defunct.html
 lib/R/library/tools/html/tools-deprecated.html
@@ -8204,6 +8264,8 @@ lib/R/library/tools/latex/makeLazyLoading.tex
 lib/R/library/tools/latex/md5sum.tex
 lib/R/library/tools/latex/package.dependencies.tex
 lib/R/library/tools/latex/read.00Index.tex
+lib/R/library/tools/latex/readNEWS.tex
+lib/R/library/tools/latex/showNonASCII.tex
 lib/R/library/tools/latex/texi2dvi.tex
 lib/R/library/tools/latex/tools-defunct.tex
 lib/R/library/tools/latex/tools-deprecated.tex
@@ -8214,6 +8276,8 @@ lib/R/library/tools/latex/writePACKAGES.tex
 lib/R/library/tools/latex/xgettext.tex
 lib/R/library/tools/libs/tools.so
 lib/R/library/tools/man/tools.Rd.gz
+lib/R/library/tools/po/de/LC_MESSAGES/R-tools.mo
+lib/R/library/tools/po/de/LC_MESSAGES/tools.mo
 lib/R/library/tools/po/en@quot/LC_MESSAGES/R-tools.mo
 lib/R/library/tools/po/en@quot/LC_MESSAGES/tools.mo
 lib/R/library/tools/po/fr/LC_MESSAGES/R-tools.mo
@@ -8250,6 +8314,7 @@ lib/R/library/utils/R-ex/alarm.R
 lib/R/library/utils/R-ex/apropos.R
 lib/R/library/utils/R-ex/browseEnv.R
 lib/R/library/utils/R-ex/browseURL.R
+lib/R/library/utils/R-ex/browseVignettes.R
 lib/R/library/utils/R-ex/capture.output.R
 lib/R/library/utils/R-ex/citEntry.R
 lib/R/library/utils/R-ex/citation.R
@@ -8278,6 +8343,7 @@ lib/R/library/utils/R-ex/help.start.R
 lib/R/library/utils/R-ex/installed.packages.R
 lib/R/library/utils/R-ex/localeToCharset.R
 lib/R/library/utils/R-ex/ls_str.R
+lib/R/library/utils/R-ex/make.packages.html.R
 lib/R/library/utils/R-ex/make.socket.R
 lib/R/library/utils/R-ex/menu.R
 lib/R/library/utils/R-ex/methods.R
@@ -8296,7 +8362,6 @@ lib/R/library/utils/R-ex/promptPackage.R
 lib/R/library/utils/R-ex/read.fortran.R
 lib/R/library/utils/R-ex/read.fwf.R
 lib/R/library/utils/R-ex/read.socket.R
-lib/R/library/utils/R-ex/readNEWS.R
 lib/R/library/utils/R-ex/recover.R
 lib/R/library/utils/R-ex/relist.R
 lib/R/library/utils/R-ex/roman.R
@@ -8306,6 +8371,7 @@ lib/R/library/utils/R-ex/sessionInfo.R
 lib/R/library/utils/R-ex/stack.R
 lib/R/library/utils/R-ex/str.R
 lib/R/library/utils/R-ex/summaryRprof.R
+lib/R/library/utils/R-ex/txtProgressBar.R
 lib/R/library/utils/R-ex/update.packages.R
 lib/R/library/utils/R-ex/url.show.R
 lib/R/library/utils/R-ex/vignette.R
@@ -8340,6 +8406,7 @@ lib/R/library/utils/help/alarm
 lib/R/library/utils/help/apropos
 lib/R/library/utils/help/browseEnv
 lib/R/library/utils/help/browseURL
+lib/R/library/utils/help/browseVignettes
 lib/R/library/utils/help/bug.report
 lib/R/library/utils/help/capture.output
 lib/R/library/utils/help/chooseCRANmirror
@@ -8392,12 +8459,12 @@ lib/R/library/utils/help/person
 lib/R/library/utils/help/prompt
 lib/R/library/utils/help/promptData
 lib/R/library/utils/help/promptPackage
+lib/R/library/utils/help/rcompgen
 lib/R/library/utils/help/read.DIF
 lib/R/library/utils/help/read.fortran
 lib/R/library/utils/help/read.fwf
 lib/R/library/utils/help/read.socket
 lib/R/library/utils/help/read.table
-lib/R/library/utils/help/readNEWS
 lib/R/library/utils/help/recover
 lib/R/library/utils/help/relist
 lib/R/library/utils/help/remove.packages
@@ -8410,6 +8477,7 @@ lib/R/library/utils/help/stack
 lib/R/library/utils/help/str
 lib/R/library/utils/help/summaryRprof
 lib/R/library/utils/help/toLatex
+lib/R/library/utils/help/txtProgressBar
 lib/R/library/utils/help/type.convert
 lib/R/library/utils/help/update.packages
 lib/R/library/utils/help/url.show
@@ -8445,6 +8513,7 @@ lib/R/library/utils/html/alarm.html
 lib/R/library/utils/html/apropos.html
 lib/R/library/utils/html/browseEnv.html
 lib/R/library/utils/html/browseURL.html
+lib/R/library/utils/html/browseVignettes.html
 lib/R/library/utils/html/bug.report.html
 lib/R/library/utils/html/capture.output.html
 lib/R/library/utils/html/chooseCRANmirror.html
@@ -8497,12 +8566,12 @@ lib/R/library/utils/html/person.html
 lib/R/library/utils/html/prompt.html
 lib/R/library/utils/html/promptData.html
 lib/R/library/utils/html/promptPackage.html
+lib/R/library/utils/html/rcompgen.html
 lib/R/library/utils/html/read.DIF.html
 lib/R/library/utils/html/read.fortran.html
 lib/R/library/utils/html/read.fwf.html
 lib/R/library/utils/html/read.socket.html
 lib/R/library/utils/html/read.table.html
-lib/R/library/utils/html/readNEWS.html
 lib/R/library/utils/html/recover.html
 lib/R/library/utils/html/relist.html
 lib/R/library/utils/html/remove.packages.html
@@ -8515,6 +8584,7 @@ lib/R/library/utils/html/stack.html
 lib/R/library/utils/html/str.html
 lib/R/library/utils/html/summaryRprof.html
 lib/R/library/utils/html/toLatex.html
+lib/R/library/utils/html/txtProgressBar.html
 lib/R/library/utils/html/type.convert.html
 lib/R/library/utils/html/update.packages.html
 lib/R/library/utils/html/url.show.html
@@ -8550,6 +8620,7 @@ lib/R/library/utils/latex/alarm.tex
 lib/R/library/utils/latex/apropos.tex
 lib/R/library/utils/latex/browseEnv.tex
 lib/R/library/utils/latex/browseURL.tex
+lib/R/library/utils/latex/browseVignettes.tex
 lib/R/library/utils/latex/bug.report.tex
 lib/R/library/utils/latex/capture.output.tex
 lib/R/library/utils/latex/chooseCRANmirror.tex
@@ -8602,12 +8673,12 @@ lib/R/library/utils/latex/person.tex
 lib/R/library/utils/latex/prompt.tex
 lib/R/library/utils/latex/promptData.tex
 lib/R/library/utils/latex/promptPackage.tex
+lib/R/library/utils/latex/rcompgen.tex
 lib/R/library/utils/latex/read.DIF.tex
 lib/R/library/utils/latex/read.fortran.tex
 lib/R/library/utils/latex/read.fwf.tex
 lib/R/library/utils/latex/read.socket.tex
 lib/R/library/utils/latex/read.table.tex
-lib/R/library/utils/latex/readNEWS.tex
 lib/R/library/utils/latex/recover.tex
 lib/R/library/utils/latex/relist.tex
 lib/R/library/utils/latex/remove.packages.tex
@@ -8620,6 +8691,7 @@ lib/R/library/utils/latex/stack.tex
 lib/R/library/utils/latex/str.tex
 lib/R/library/utils/latex/summaryRprof.tex
 lib/R/library/utils/latex/toLatex.tex
+lib/R/library/utils/latex/txtProgressBar.tex
 lib/R/library/utils/latex/type.convert.tex
 lib/R/library/utils/latex/update.packages.tex
 lib/R/library/utils/latex/url.show.tex
@@ -8631,6 +8703,7 @@ lib/R/library/utils/latex/withVisible.tex
 lib/R/library/utils/latex/write.table.tex
 lib/R/library/utils/latex/zip.file.extract.tex
 lib/R/library/utils/man/utils.Rd.gz
+lib/R/library/utils/po/de/LC_MESSAGES/R-utils.mo
 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/ja/LC_MESSAGES/R-utils.mo
@@ -8641,13 +8714,12 @@ lib/R/modules/R_X11.so
 lib/R/modules/internet.so
 lib/R/modules/lapack.so
 lib/R/modules/vfonts.so
-lib/R/share/R/firstlib.R
 lib/R/share/R/nspackloader.R
-lib/R/share/R/nsrdaload.R
 lib/R/share/R/packloader.R
 lib/R/share/encodings/Adobe-glyphlist
 lib/R/share/encodings/character-sets
 lib/R/share/java/getsp.class
+lib/R/share/licenses/AGPL-3
 lib/R/share/licenses/Artistic-1.0
 lib/R/share/licenses/Artistic-2.0
 lib/R/share/licenses/GPL-2
@@ -8755,6 +8827,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/utils/po/fr
 @dirrm lib/R/library/utils/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/utils/po/en@quot
+@dirrm lib/R/library/utils/po/de/LC_MESSAGES
+@dirrm lib/R/library/utils/po/de
 @dirrm lib/R/library/utils/po
 @dirrm lib/R/library/utils/man
 @dirrm lib/R/library/utils/latex
@@ -8781,6 +8855,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/tools/po/fr
 @dirrm lib/R/library/tools/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/tools/po/en@quot
+@dirrm lib/R/library/tools/po/de/LC_MESSAGES
+@dirrm lib/R/library/tools/po/de
 @dirrm lib/R/library/tools/po
 @dirrm lib/R/library/tools/man
 @dirrm lib/R/library/tools/libs
@@ -8807,6 +8883,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/tcltk/po/fr
 @dirrm lib/R/library/tcltk/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/tcltk/po/en@quot
+@dirrm lib/R/library/tcltk/po/de/LC_MESSAGES
+@dirrm lib/R/library/tcltk/po/de
 @dirrm lib/R/library/tcltk/po
 @dirrm lib/R/library/tcltk/man
 @dirrm lib/R/library/tcltk/libs
@@ -8845,6 +8923,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/stats4/po/fr
 @dirrm lib/R/library/stats4/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/stats4/po/en@quot
+@dirrm lib/R/library/stats4/po/de/LC_MESSAGES
+@dirrm lib/R/library/stats4/po/de
 @dirrm lib/R/library/stats4/po
 @dirrm lib/R/library/stats4/man
 @dirrm lib/R/library/stats4/latex
@@ -8870,6 +8950,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/stats/po/fr
 @dirrm lib/R/library/stats/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/stats/po/en@quot
+@dirrm lib/R/library/stats/po/de/LC_MESSAGES
+@dirrm lib/R/library/stats/po/de
 @dirrm lib/R/library/stats/po
 @dirrm lib/R/library/stats/man
 @dirrm lib/R/library/stats/libs
@@ -8922,6 +9004,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/spatial/R
 @dirrm lib/R/library/spatial/Meta
 @dirrm lib/R/library/spatial
+@dirrm lib/R/library/rpart/po/ru/LC_MESSAGES
+@dirrm lib/R/library/rpart/po/ru
 @dirrm lib/R/library/rpart/po/fr/LC_MESSAGES
 @dirrm lib/R/library/rpart/po/fr
 @dirrm lib/R/library/rpart/po/en@quot/LC_MESSAGES
@@ -8937,16 +9021,6 @@ man/man1/Rscript.1
 @dirrm lib/R/library/rpart/R
 @dirrm lib/R/library/rpart/Meta
 @dirrm lib/R/library/rpart
-@dirrm lib/R/library/rcompgen/man
-@dirrm lib/R/library/rcompgen/latex
-@dirrm lib/R/library/rcompgen/html
-@dirrm lib/R/library/rcompgen/help
-@dirrm lib/R/library/rcompgen/examples
-@exec ${MKDIR} %D/lib/R/library/rcompgen/R-ex
-@dirrm lib/R/library/rcompgen/R-ex
-@dirrm lib/R/library/rcompgen/R
-@dirrm lib/R/library/rcompgen/Meta
-@dirrm lib/R/library/rcompgen
 @dirrm lib/R/library/nnet/po/fr/LC_MESSAGES
 @dirrm lib/R/library/nnet/po/fr
 @dirrm lib/R/library/nnet/po/en@quot/LC_MESSAGES
diff --git a/math/R/distinfo b/math/R/distinfo
index d9ffa99fa01..bc17836138d 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.37 2008/03/15 22:16:41 markd Exp $
+$NetBSD: distinfo,v 1.38 2008/04/26 02:39:27 markd Exp $
 
-SHA1 (R-2.6.2.tar.gz) = 3d06b12cbf1dab25ddd759522157e6cc6a8eae19
-RMD160 (R-2.6.2.tar.gz) = 7956c284aad3c2d4fc85d566b45e2ba308dffefb
-Size (R-2.6.2.tar.gz) = 15569391 bytes
+SHA1 (R-2.7.0.tar.gz) = d0a3193e474696ad767845ef6b8ee1555a26b898
+RMD160 (R-2.7.0.tar.gz) = c3c9cf0c0a1eb6191492f1be19e277e8223a42c9
+Size (R-2.7.0.tar.gz) = 16396250 bytes
 SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06
-SHA1 (patch-ac) = fb35ac7a2d22a4cc60704ce06a0471fab2e64ac0
-SHA1 (patch-ad) = 666dccbc9741b90bc7af11e51ccf25240906da8b
+SHA1 (patch-ac) = 64c47fc44c437ad79de53fc313f280700590704f
+SHA1 (patch-ad) = e8f6b6989957a6872806716263eabb9feb636638
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 334f8016579..51bc6abc4e6 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
+$NetBSD: patch-ac,v 1.23 2008/04/26 02:39:27 markd Exp $
 
---- configure.orig	2008-01-30 23:43:09.000000000 +1300
+--- configure.orig	2008-04-15 14:06:13.000000000 +1200
 +++ configure
-@@ -2672,7 +2672,7 @@ fi
+@@ -2712,7 +2712,7 @@ fi
  
  
  if test "${want_R_shlib}" = yes; then
@@ -11,97 +11,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
  else
    LIBR=
  fi
-@@ -8445,7 +8445,7 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -11117,7 +11117,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -11695,7 +11695,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -14183,7 +14183,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -14894,7 +14894,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -15505,7 +15505,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -18183,7 +18183,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -18761,7 +18761,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -20561,7 +20561,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -21139,7 +21139,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -32411,6 +32411,7 @@ cat > conftest.c <<EOF
+@@ -28129,6 +28129,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -109,7 +19,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
  int main () {
    exit(0);
  }
-@@ -32488,6 +32489,9 @@ cat > conftest.c <<EOF
+@@ -28206,6 +28207,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -119,7 +29,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -32585,6 +32589,9 @@ typedef struct {
+@@ -28303,6 +28307,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -129,7 +39,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -33752,183 +33759,6 @@ echo "${ECHO_T}no" >&6; }
+@@ -29385,151 +29392,6 @@ echo "${ECHO_T}no" >&6; }
  fi
  
      fi
@@ -165,27 +75,11 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); } && {
+-	 test -z "$ac_f77_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
 -  eval "r_cv_prog_f77_flag_${ac_safe}=yes"
 -else
 -  echo "$as_me: failed program was:" >&5
@@ -194,7 +88,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
 -	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
 -
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -FFLAGS="${r_save_FFLAGS}"
 -ac_ext=c
@@ -253,27 +147,11 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); } && {
+-	 test -z "$ac_f77_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
 -  eval "r_cv_prog_f77_flag_${ac_safe}=yes"
 -else
 -  echo "$as_me: failed program was:" >&5
@@ -282,7 +160,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
 -	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
 -
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -FFLAGS="${r_save_FFLAGS}"
 -ac_ext=c
@@ -313,16 +191,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
      if test "${GXX}" = yes; then
        ac_safe=_mieee
  { echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -34393,7 +34223,7 @@ _ACEOF
-     if test "${GCC}" = yes; then
-       ## only Apple build of gcc supports (and needs?) -no-cpp-precomp
-       ${CC} --version|grep Apple >/dev/null 2>/dev/null
--      if test $? == 0; then
-+      if test $? = 0; then
-         separator=""
- test -z "${separator}" && separator=" "
- if test -z "${R_XTRA_CPPFLAGS}"; then
-@@ -35564,7 +35394,7 @@ echo "$as_me: WARNING: Use of flat names
+@@ -31027,7 +30889,7 @@ echo "$as_me: WARNING: Use of flat names
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
@@ -331,7 +200,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
      ## Only sure for FreeBSD 3 and above.
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
-@@ -35653,6 +35483,12 @@ echo "$as_me: WARNING: Use of flat names
+@@ -31116,6 +30978,12 @@ echo "$as_me: WARNING: Use of flat names
      fcpicflags=
      ;;
    netbsd*)
@@ -344,7 +213,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
      if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
        main_ldflags="-export-dynamic"
        shlib_ldflags="-shared"
-@@ -35752,7 +35588,7 @@ fi
+@@ -31215,7 +31083,7 @@ fi
  : ${FPICFLAGS="${fpicflags}"}
  if test -z "${FPICFLAGS}"; then
    case "${host_os}" in
@@ -353,7 +222,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
        ;;
      *)
        { echo "$as_me:$LINENO: WARNING: I could not determine FPICFLAGS." >&5
-@@ -42907,6 +42743,15 @@ cat > conftest.c <<EOF
+@@ -37567,6 +37435,15 @@ cat > conftest.c <<EOF
  #endif
  extern void F77_SYMBOL(test1)(int *iflag);
  
@@ -369,7 +238,7 @@ $NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
  int main () {
    int iflag;
    F77_SYMBOL(test1)(&iflag);
-@@ -42971,6 +42816,14 @@ else
+@@ -37631,6 +37508,14 @@ else
  #else
  # define F77_SYMBOL(x)   x
  #endif
diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad
index 97f100bfed5..7a57f4c1aa9 100644
--- a/math/R/patches/patch-ad
+++ b/math/R/patches/patch-ad
@@ -1,13 +1,22 @@
-$NetBSD: patch-ad,v 1.11 2007/03/14 11:50:35 markd Exp $
+$NetBSD: patch-ad,v 1.12 2008/04/26 02:39:27 markd Exp $
 
---- src/main/Makefile.in.orig	2006-09-05 02:41:33.000000000 +1200
+Add LIBMULTITHREAD to EXTRA_LIBS to pick up -lpthread on NetBSD, otherwise
+R segfaults on loading tcltk extension.
+
+--- src/main/Makefile.in.orig	2008-04-10 14:05:02.000000000 +1200
 +++ src/main/Makefile.in
-@@ -104,7 +104,7 @@ COMMON_DEPENDENCIES = \
+@@ -91,12 +91,12 @@ MAIN_LIBS = ../unix/libunix.a ../appl/li
+ EXTRA_STATIC_LIBS = $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_XDR)$(R_LIBINTL)
+ STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
+ 
+-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
++EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS) @LIBMULTITHREAD@
+ 
  R_binary = R.bin
- R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS)
- @WANT_R_SHLIB_FALSE@R_bin_LDADD = $(RLIBS) $(EXTRA_LIBS)
+ R_bin_OBJECTS = Rmain.o
+ @WANT_R_SHLIB_FALSE@R_bin_LDADD = libR.a $(EXTRA_LIBS)
 -@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ -lR @BLAS_SHLIB_TRUE@-lRblas
 +@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR @BLAS_SHLIB_TRUE@-lRblas
- R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ $(RLIBS) $(COMMON_DEPENDENCIES)
+ R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a
  
  libR_la = libR$(DYLIB_EXT)
author	markd <markd@pkgsrc.org>	2008-04-26 02:39:27 +0000
committer	markd <markd@pkgsrc.org>	2008-04-26 02:39:27 +0000
commit	93cb29d520896d5321053c7ccb687992825b20a7 (patch)
tree	6918a9c3700400ba74aa6fd2b52d9ea0d45d8229 /math/R
parent	d69a62e6477cb0e7dc32cd8bc2aad415c8680a8b (diff)
download	pkgsrc-93cb29d520896d5321053c7ccb687992825b20a7.tar.gz